diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 22:45:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-21 22:45:26 +0000 |
commit | 3c93545a16ff9fef5ddb269a3bf50ce0f781d6a6 (patch) | |
tree | 48c684acd32119172612b38f139f9debf4e877cd | |
parent | 8e3838707642a8209ec8deed32ac52f11007040b (diff) |
Revert r56856
* parse.y: tCHAR can be concatenated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | test/ruby/test_literal.rb | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -3869,10 +3869,10 @@ strings : string $$ = $1; %*/ } - | tCHAR ; -string : string1 +string : tCHAR + | string1 | string string1 { /*%%%*/ diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb index 05b81f944d..28290fb19d 100644 --- a/test/ruby/test_literal.rb +++ b/test/ruby/test_literal.rb @@ -90,6 +90,9 @@ class TestRubyLiteral < Test::Unit::TestCase assert_equal "\u201c", eval(%[?\\\u{201c}]), bug6069 assert_equal "\u201c".encode("euc-jp"), eval(%[?\\\u{201c}].encode("euc-jp")), bug6069 assert_equal "\u201c".encode("iso-8859-13"), eval(%[?\\\u{201c}].encode("iso-8859-13")), bug6069 + + assert_equal "ab", eval("?a 'b'") + assert_equal "a\nb", eval("<<A 'b'\na\nA") end def test_dstring |