diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:28:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:28:03 +0000 |
commit | a97190548f3602e52d50cba3a97a9c926d4d8789 (patch) | |
tree | b31e8740a6bac58ec5c396792b2fa2c6bd7b800f /bootstraptest | |
parent | ff17ee0d310751f5f5c90226c36caffe484843fd (diff) |
merges r24332 and r24333 from trunk into ruby_1_9_1.
--
* parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
NODE_STR. [ruby-dev:38968]
* bootstraptest/test_syntax.rb: add a test for above.
--
* parse.y (literal_concat_gen): reduced unnecessary node at string
literal concatenation with empty head dstr. [ruby-dev:38968]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
-rw-r--r-- | bootstraptest/test_syntax.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index a9005a4292..131625ea6b 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -828,3 +828,6 @@ assert_normal_exit %q{ p a.compact! } +assert_equal 'ok', %q{ + "#{}""#{}ok" +}, '[ruby-dev:38968]' |