diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:18 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:18 +0000 |
commit | 35d36573c359d2f3ac8a28e41e8945e4289f7c2f (patch) | |
tree | 932de41da66d182358a082fc9639cdf66a044a8d /test | |
parent | baa94e0239cfd0115b4a7de54c0aeab65375f743 (diff) |
merges r25402 from trunk into ruby_1_9_1. fixes the backport task #1921.
--
* parse.y (parser_here_document): dispatch delayed heredoc
contents. based on a patch from Andy Keep in [ruby-core:24855].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ripper/dummyparser.rb | 2 | ||||
-rw-r--r-- | test/ripper/test_parser_events.rb | 14 | ||||
-rw-r--r-- | test/ripper/test_scanner_events.rb | 10 |
3 files changed, 20 insertions, 6 deletions
diff --git a/test/ripper/dummyparser.rb b/test/ripper/dummyparser.rb index 2c107b37c2..b19a492811 100644 --- a/test/ripper/dummyparser.rb +++ b/test/ripper/dummyparser.rb @@ -58,7 +58,7 @@ class DummyParser < Ripper class << self; self; end.class_eval do define_method(name) do |*a, &b| result = super(*a, &b) - yield + yield(*a) result end end diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb index 80199ecce5..2494434d86 100644 --- a/test/ripper/test_parser_events.rb +++ b/test/ripper/test_parser_events.rb @@ -202,6 +202,20 @@ class TestRipper_ParserEvents < Test::Unit::TestCase assert_equal true, thru_bodystmt end + def test_heredoc + bug1921 = '[ruby-core:24855]' + thru_heredoc_beg = false + tree = parse("<<EOS\nheredoc\nEOS\n", :on_heredoc_beg) {thru_heredoc_beg = true} + assert_equal true, thru_heredoc_beg + assert_match(/string_content\(\),heredoc\n/, tree, bug1921) + heredoc = nil + parse("<<EOS\nheredoc1\nheredoc2\nEOS\n", :on_string_add) {|n, s| heredoc = s} + assert_equal("heredoc1\nheredoc2\n", heredoc, bug1921) + heredoc = nil + parse("<<-EOS\nheredoc1\nheredoc2\n\tEOS\n", :on_string_add) {|n, s| heredoc = s} + assert_equal("heredoc1\nheredoc2\n", heredoc, bug1921) + end + =begin def test_brace_block assert_equal true, $thru__brace_block diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb index 6599165700..10f185e79b 100644 --- a/test/ripper/test_scanner_events.rb +++ b/test/ripper/test_scanner_events.rb @@ -628,9 +628,9 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase scan('tstring_content', "<<EOS\nheredoc\nEOS") assert_equal ["heredoc\n"], scan('tstring_content', "<<EOS\nheredoc\nEOS\n") - assert_equal ["heredoc \n"], - scan('tstring_content', "<<EOS\nheredoc \nEOS \n") - assert_equal ["heredoc\n"], + assert_equal ["here\ndoc \nEOS \n"], + scan('tstring_content', "<<EOS\nhere\ndoc \nEOS \n") + assert_equal ["heredoc\n\tEOS \n"], scan('tstring_content', "<<-EOS\nheredoc\n\tEOS \n") end @@ -641,9 +641,9 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase scan('heredoc_end', "<<EOS\nheredoc\nEOS") assert_equal ["EOS\n"], scan('heredoc_end', "<<EOS\nheredoc\nEOS\n") - assert_equal ["EOS \n"], + assert_equal [], scan('heredoc_end', "<<EOS\nheredoc\nEOS \n") - assert_equal ["\tEOS \n"], + assert_equal [], scan('heredoc_end', "<<-EOS\nheredoc\n\tEOS \n") end |