diff options
| author | Mike Dalessio <mike.dalessio@gmail.com> | 2023-08-27 16:32:19 -0400 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-08-28 12:37:29 +0000 |
| commit | 77e971b6ec93810842a8ef320e412174267dab6d (patch) | |
| tree | f6b15e750955831df659896bd95697b1517fb05e /test | |
| parent | 8926fd20f612aa6bae77844b8b6f5d14bf659cb1 (diff) | |
[ruby/yarp] fix: %w list spanning a heredoc
Two fixes were necessary:
- ensure we are handling newlines correctly
- accept two consecutive string tokens without a separator
https://github.com/ruby/yarp/commit/4e707937cb
Co-authored-by: Kevin Newton <kddnewton@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/yarp/fixtures/spanning_heredoc.txt | 6 | ||||
| -rw-r--r-- | test/yarp/parse_test.rb | 2 | ||||
| -rw-r--r-- | test/yarp/snapshots/spanning_heredoc.txt | 27 |
3 files changed, 32 insertions, 3 deletions
diff --git a/test/yarp/fixtures/spanning_heredoc.txt b/test/yarp/fixtures/spanning_heredoc.txt index 5040840e76..1b17edac5d 100644 --- a/test/yarp/fixtures/spanning_heredoc.txt +++ b/test/yarp/fixtures/spanning_heredoc.txt @@ -23,3 +23,9 @@ pp <<-A, %Q[h\ g A h] + +# ripper can't parse this successfully, though ruby runs it correctly +pp <<-A, %w[j\ +i +A +j] diff --git a/test/yarp/parse_test.rb b/test/yarp/parse_test.rb index 1eb0033208..b288d597b2 100644 --- a/test/yarp/parse_test.rb +++ b/test/yarp/parse_test.rb @@ -77,7 +77,7 @@ class ParseTest < Test::Unit::TestCase # into a single token. See https://bugs.ruby-lang.org/issues/19838. # # Additionally, Ripper cannot parse the %w[] fixture in this file, so set ripper_should_parse to false. - ripper_should_match = false if relative == "spanning_heredoc.txt" + ripper_should_parse = false if relative == "spanning_heredoc.txt" define_method "test_filepath_#{relative}" do # First, read the source from the filepath. Use binmode to avoid converting CRLF on Windows, diff --git a/test/yarp/snapshots/spanning_heredoc.txt b/test/yarp/snapshots/spanning_heredoc.txt index 244ced125b..f948e1e9d3 100644 --- a/test/yarp/snapshots/spanning_heredoc.txt +++ b/test/yarp/snapshots/spanning_heredoc.txt @@ -1,6 +1,6 @@ -ProgramNode(164...448)( +ProgramNode(164...541)( [], - StatementsNode(164...448)( + StatementsNode(164...541)( [CallNode(164...192)( nil, nil, @@ -110,6 +110,29 @@ ProgramNode(164...448)( nil, 0, "pp" + ), + CallNode(520...541)( + nil, + nil, + (520...522), + nil, + ArgumentsNode(523...541)( + [InterpolatedStringNode(523...527)( + (523...527), + [StringNode(535...537)(nil, (535...537), nil, "i\n")], + (537...539) + ), + ArrayNode(529...541)( + [StringNode(532...535)(nil, (532...535), nil, "j\\\n"), + StringNode(539...540)(nil, (539...540), nil, "j")], + (529...532), + (540...541) + )] + ), + nil, + nil, + 0, + "pp" )] ) ) |