From f83c1d62bd42c7ba51e715610e9ca2410724d9e0 Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Thu, 17 Aug 2023 21:06:45 -0400 Subject: [PATCH] [ruby/yarp] Update to latest seattlerb https://github.com/ruby/yarp/commit/d5365f08d0 --- .../seattlerb/TestRubyParserShared.txt | 92 +++ test/yarp/fixtures/seattlerb/case_in.txt | 2 +- .../defn_forward_args__no_parens.txt | 3 + test/yarp/fixtures/seattlerb/difficult0_.txt | 4 + .../seattlerb/difficult1_line_numbers.txt | 13 + .../seattlerb/difficult1_line_numbers2.txt | 8 + test/yarp/fixtures/seattlerb/difficult2_.txt | 2 + test/yarp/fixtures/seattlerb/difficult3_.txt | 1 + test/yarp/fixtures/seattlerb/difficult3_2.txt | 1 + test/yarp/fixtures/seattlerb/difficult3_3.txt | 1 + test/yarp/fixtures/seattlerb/difficult3_4.txt | 1 + test/yarp/fixtures/seattlerb/difficult3_5.txt | 1 + .../fixtures/seattlerb/difficult3__10.txt | 1 + .../fixtures/seattlerb/difficult3__11.txt | 1 + .../fixtures/seattlerb/difficult3__12.txt | 1 + .../yarp/fixtures/seattlerb/difficult3__6.txt | 1 + .../yarp/fixtures/seattlerb/difficult3__7.txt | 1 + .../yarp/fixtures/seattlerb/difficult3__8.txt | 1 + .../yarp/fixtures/seattlerb/difficult3__9.txt | 1 + .../seattlerb/difficult4__leading_dots.txt | 2 + .../seattlerb/difficult4__leading_dots2.txt | 2 + test/yarp/fixtures/seattlerb/difficult6_.txt | 1 + .../yarp/fixtures/seattlerb/difficult6__7.txt | 1 + .../yarp/fixtures/seattlerb/difficult6__8.txt | 1 + test/yarp/fixtures/seattlerb/difficult7_.txt | 5 + .../heredoc_squiggly_visually_blank_lines.txt | 2 +- .../i_fucking_hate_line_numbers2.txt | 2 +- .../fixtures/seattlerb/module_comments.txt | 2 +- .../parse_line_trailing_newlines.txt | 2 +- .../fixtures/seattlerb/pct_Q_backslash_nl.txt | 2 +- .../slashy_newlines_within_string.txt | 2 +- .../seattlerb/TestRubyParserShared.txt | 216 ++++++ test/yarp/snapshots/seattlerb/case_in.txt | 644 +++++++++--------- .../defn_forward_args__no_parens.txt | 38 ++ test/yarp/snapshots/seattlerb/difficult0_.txt | 51 ++ .../seattlerb/difficult1_line_numbers.txt | 131 ++++ .../seattlerb/difficult1_line_numbers2.txt | 52 ++ test/yarp/snapshots/seattlerb/difficult2_.txt | 49 ++ test/yarp/snapshots/seattlerb/difficult3_.txt | 44 ++ .../yarp/snapshots/seattlerb/difficult3_2.txt | 35 + .../yarp/snapshots/seattlerb/difficult3_3.txt | 35 + .../yarp/snapshots/seattlerb/difficult3_4.txt | 22 + .../yarp/snapshots/seattlerb/difficult3_5.txt | 35 + .../snapshots/seattlerb/difficult3__10.txt | 44 ++ .../snapshots/seattlerb/difficult3__11.txt | 40 ++ .../snapshots/seattlerb/difficult3__12.txt | 41 ++ .../snapshots/seattlerb/difficult3__6.txt | 45 ++ .../snapshots/seattlerb/difficult3__7.txt | 41 ++ .../snapshots/seattlerb/difficult3__8.txt | 42 ++ .../snapshots/seattlerb/difficult3__9.txt | 43 ++ .../seattlerb/difficult4__leading_dots.txt | 16 + .../seattlerb/difficult4__leading_dots2.txt | 7 + test/yarp/snapshots/seattlerb/difficult6_.txt | 48 ++ .../snapshots/seattlerb/difficult6__7.txt | 30 + .../snapshots/seattlerb/difficult6__8.txt | 30 + test/yarp/snapshots/seattlerb/difficult7_.txt | 81 +++ .../heredoc_squiggly_visually_blank_lines.txt | 4 +- .../snapshots/seattlerb/module_comments.txt | 22 +- .../parse_line_trailing_newlines.txt | 6 +- .../seattlerb/pct_Q_backslash_nl.txt | 4 +- 60 files changed, 1710 insertions(+), 346 deletions(-) create mode 100644 test/yarp/fixtures/seattlerb/TestRubyParserShared.txt create mode 100644 test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult0_.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult2_.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3_.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3_2.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3_3.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3_4.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3_5.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__10.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__11.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__12.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__6.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__7.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__8.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult3__9.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult6_.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult6__7.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult6__8.txt create mode 100644 test/yarp/fixtures/seattlerb/difficult7_.txt create mode 100644 test/yarp/snapshots/seattlerb/TestRubyParserShared.txt create mode 100644 test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult0_.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult2_.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3_.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3_2.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3_3.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3_4.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3_5.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__10.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__11.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__12.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__6.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__7.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__8.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult3__9.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult6_.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult6__7.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult6__8.txt create mode 100644 test/yarp/snapshots/seattlerb/difficult7_.txt diff --git a/test/yarp/fixtures/seattlerb/TestRubyParserShared.txt b/test/yarp/fixtures/seattlerb/TestRubyParserShared.txt new file mode 100644 index 0000000000..c55b3e1f70 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/TestRubyParserShared.txt @@ -0,0 +1,92 @@ +%I[ + + +] + +%I[ +line2 +line3 +] + +%W[ + + +] + +%W[ +line2 +line3 +] + +%i[ + + +] + +%i[ +line2 +line3 +] + +%r[ + + +] + +%w[ + + +] + +%w[ +line2 +line3 +] + +[ +:line2, +:line3 +] + +class X # line 1 + def self.y(a, # line 2 + b) # line 3 + a + b # line 4 + end # line 5 +end # line 6 + + +class X # line 1 + class Y # line 2 + Z = 42 # line 3 + end # line 4 +end # line 5 + + +class X # line 1 + def y(a, # line 2 + b) # line 3 + a + b # line 4 + end # line 5 +end # line 6 + + +module X + X = [ + :line3, + :line4, + ] +end + + +module X # line 1 + module Y # line 2 + Z = 42 # line 3 + end # line 4 +end # line 5 + + +x( +:line2, +:line3 +) diff --git a/test/yarp/fixtures/seattlerb/case_in.txt b/test/yarp/fixtures/seattlerb/case_in.txt index f28c286348..0835da0956 100644 --- a/test/yarp/fixtures/seattlerb/case_in.txt +++ b/test/yarp/fixtures/seattlerb/case_in.txt @@ -1,5 +1,5 @@ case :a -in "b": +in "b": end case :a diff --git a/test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt b/test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt new file mode 100644 index 0000000000..2d34077c93 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/defn_forward_args__no_parens.txt @@ -0,0 +1,3 @@ +def f ... + m(...) +end diff --git a/test/yarp/fixtures/seattlerb/difficult0_.txt b/test/yarp/fixtures/seattlerb/difficult0_.txt new file mode 100644 index 0000000000..5c73907cae --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult0_.txt @@ -0,0 +1,4 @@ +p <<-END+'b + a + END + c'+'d' diff --git a/test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt b/test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt new file mode 100644 index 0000000000..8008127dc9 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult1_line_numbers.txt @@ -0,0 +1,13 @@ +if true + p 1 + a.b 2 + c.d 3, 4 + e.f 5 + g.h 6, 7 + p(1) + a.b(2) + c.d(3, 4) + e.f(5) + g.h(6, 7) +end + diff --git a/test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt b/test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt new file mode 100644 index 0000000000..1964562416 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult1_line_numbers2.txt @@ -0,0 +1,8 @@ +if true then + p("a") + b = 1 + p b + c =1 +end +a + diff --git a/test/yarp/fixtures/seattlerb/difficult2_.txt b/test/yarp/fixtures/seattlerb/difficult2_.txt new file mode 100644 index 0000000000..3259097492 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult2_.txt @@ -0,0 +1,2 @@ +1 ? b('') : 2 +a d: 3 diff --git a/test/yarp/fixtures/seattlerb/difficult3_.txt b/test/yarp/fixtures/seattlerb/difficult3_.txt new file mode 100644 index 0000000000..9f95860b82 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3_.txt @@ -0,0 +1 @@ +f { |a, (b, *c)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3_2.txt b/test/yarp/fixtures/seattlerb/difficult3_2.txt new file mode 100644 index 0000000000..8abfe3f634 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3_2.txt @@ -0,0 +1 @@ +f { |*a, b| } diff --git a/test/yarp/fixtures/seattlerb/difficult3_3.txt b/test/yarp/fixtures/seattlerb/difficult3_3.txt new file mode 100644 index 0000000000..6f43ab7b1d --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3_3.txt @@ -0,0 +1 @@ +f { |*a, b, &c| } diff --git a/test/yarp/fixtures/seattlerb/difficult3_4.txt b/test/yarp/fixtures/seattlerb/difficult3_4.txt new file mode 100644 index 0000000000..7070e1e964 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3_4.txt @@ -0,0 +1 @@ +a=b ? true: false diff --git a/test/yarp/fixtures/seattlerb/difficult3_5.txt b/test/yarp/fixtures/seattlerb/difficult3_5.txt new file mode 100644 index 0000000000..6d52692481 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3_5.txt @@ -0,0 +1 @@ +f ->() { g do end } diff --git a/test/yarp/fixtures/seattlerb/difficult3__10.txt b/test/yarp/fixtures/seattlerb/difficult3__10.txt new file mode 100644 index 0000000000..89974f5114 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__10.txt @@ -0,0 +1 @@ +f { |a, (*b, c)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__11.txt b/test/yarp/fixtures/seattlerb/difficult3__11.txt new file mode 100644 index 0000000000..911d037961 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__11.txt @@ -0,0 +1 @@ +f { |a, (*)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__12.txt b/test/yarp/fixtures/seattlerb/difficult3__12.txt new file mode 100644 index 0000000000..2405a80ec1 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__12.txt @@ -0,0 +1 @@ +f { |a, (*, b)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__6.txt b/test/yarp/fixtures/seattlerb/difficult3__6.txt new file mode 100644 index 0000000000..3a45ae86fb --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__6.txt @@ -0,0 +1 @@ +f { |a, (b, *c, d)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__7.txt b/test/yarp/fixtures/seattlerb/difficult3__7.txt new file mode 100644 index 0000000000..55272a1fc4 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__7.txt @@ -0,0 +1 @@ +f { |a, (b, *)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__8.txt b/test/yarp/fixtures/seattlerb/difficult3__8.txt new file mode 100644 index 0000000000..76740db4ff --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__8.txt @@ -0,0 +1 @@ +f { |a, (b, *, c)| } diff --git a/test/yarp/fixtures/seattlerb/difficult3__9.txt b/test/yarp/fixtures/seattlerb/difficult3__9.txt new file mode 100644 index 0000000000..b65f7fd052 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult3__9.txt @@ -0,0 +1 @@ +f { |a, (*b)| } diff --git a/test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt b/test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt new file mode 100644 index 0000000000..332dc8225c --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult4__leading_dots.txt @@ -0,0 +1,2 @@ +a +.b diff --git a/test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt b/test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt new file mode 100644 index 0000000000..fe73f641fe --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult4__leading_dots2.txt @@ -0,0 +1,2 @@ +1 +..3 diff --git a/test/yarp/fixtures/seattlerb/difficult6_.txt b/test/yarp/fixtures/seattlerb/difficult6_.txt new file mode 100644 index 0000000000..7396a9a76f --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult6_.txt @@ -0,0 +1 @@ +->(a, b=nil) { p [a, b] } diff --git a/test/yarp/fixtures/seattlerb/difficult6__7.txt b/test/yarp/fixtures/seattlerb/difficult6__7.txt new file mode 100644 index 0000000000..048358bbdc --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult6__7.txt @@ -0,0 +1 @@ +a.b (1) {c} diff --git a/test/yarp/fixtures/seattlerb/difficult6__8.txt b/test/yarp/fixtures/seattlerb/difficult6__8.txt new file mode 100644 index 0000000000..ba1cbc235d --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult6__8.txt @@ -0,0 +1 @@ +a::b (1) {c} diff --git a/test/yarp/fixtures/seattlerb/difficult7_.txt b/test/yarp/fixtures/seattlerb/difficult7_.txt new file mode 100644 index 0000000000..112b75c5f2 --- /dev/null +++ b/test/yarp/fixtures/seattlerb/difficult7_.txt @@ -0,0 +1,5 @@ + { + a: lambda { b ? c() : d }, + e: nil, + } + diff --git a/test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt index 0d89134c87..3f9198296d 100644 --- a/test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt +++ b/test/yarp/fixtures/seattlerb/heredoc_squiggly_visually_blank_lines.txt @@ -1,6 +1,6 @@ a = <<~EOF x - + z EOF diff --git a/test/yarp/fixtures/seattlerb/i_fucking_hate_line_numbers2.txt b/test/yarp/fixtures/seattlerb/i_fucking_hate_line_numbers2.txt index 898a70fb75..1964562416 100644 --- a/test/yarp/fixtures/seattlerb/i_fucking_hate_line_numbers2.txt +++ b/test/yarp/fixtures/seattlerb/i_fucking_hate_line_numbers2.txt @@ -1,5 +1,5 @@ if true then - p('a') + p("a") b = 1 p b c =1 diff --git a/test/yarp/fixtures/seattlerb/module_comments.txt b/test/yarp/fixtures/seattlerb/module_comments.txt index f8d5aae571..cecb717c5b 100644 --- a/test/yarp/fixtures/seattlerb/module_comments.txt +++ b/test/yarp/fixtures/seattlerb/module_comments.txt @@ -1,5 +1,5 @@ # blah 1 - + # blah 2 module X diff --git a/test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt b/test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt index 422c2b7ab3..afa826fb50 100644 --- a/test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt +++ b/test/yarp/fixtures/seattlerb/parse_line_trailing_newlines.txt @@ -1,2 +1,2 @@ -a +a b diff --git a/test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt b/test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt index d88e1fd21c..4420560d2b 100644 --- a/test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt +++ b/test/yarp/fixtures/seattlerb/pct_Q_backslash_nl.txt @@ -1,2 +1,2 @@ -%Q{ \ +%q{ \ } diff --git a/test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt b/test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt index cdf7a70cb7..421989c76f 100644 --- a/test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt +++ b/test/yarp/fixtures/seattlerb/slashy_newlines_within_string.txt @@ -4,4 +4,4 @@ puts "hello\ friend" a + b - + diff --git a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt new file mode 100644 index 0000000000..cfad7e8a35 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt @@ -0,0 +1,216 @@ +ProgramNode(0...689)( + [], + StatementsNode(0...689)( + [ArrayNode(0...7)([], (0...3), (6...7)), + ArrayNode(9...26)( + [SymbolNode(13...18)(nil, (13...18), nil, "line2"), + SymbolNode(19...24)(nil, (19...24), nil, "line3")], + (9...12), + (25...26) + ), + ArrayNode(28...35)([], (28...31), (34...35)), + ArrayNode(37...54)( + [StringNode(41...46)(nil, (41...46), nil, "line2"), + StringNode(47...52)(nil, (47...52), nil, "line3")], + (37...40), + (53...54) + ), + ArrayNode(56...63)([], (56...59), (62...63)), + ArrayNode(65...82)( + [SymbolNode(69...74)(nil, (69...74), nil, "line2"), + SymbolNode(75...80)(nil, (75...80), nil, "line3")], + (65...68), + (81...82) + ), + RegularExpressionNode(84...91)( + (84...87), + (87...90), + (90...91), + "\n" + "\n" + "\n", + 0 + ), + ArrayNode(93...100)([], (93...96), (99...100)), + ArrayNode(102...119)( + [StringNode(106...111)(nil, (106...111), nil, "line2"), + StringNode(112...117)(nil, (112...117), nil, "line3")], + (102...105), + (118...119) + ), + ArrayNode(121...139)( + [SymbolNode(123...129)((123...124), (124...129), nil, "line2"), + SymbolNode(131...137)((131...132), (132...137), nil, "line3")], + (121...122), + (138...139) + ), + ClassNode(141...269)( + [], + (141...146), + ConstantReadNode(147...148)(), + nil, + nil, + StatementsNode(168...246)( + [DefNode(168...246)( + (177...178), + SelfNode(172...176)(), + ParametersNode(179...200)( + [RequiredParameterNode(179...180)(:a), + RequiredParameterNode(199...200)(:b)], + [], + [], + nil, + [], + nil, + nil + ), + StatementsNode(220...225)( + [CallNode(220...225)( + LocalVariableReadNode(220...221)(:a, 0), + nil, + (222...223), + nil, + ArgumentsNode(224...225)( + [LocalVariableReadNode(224...225)(:b, 0)] + ), + nil, + nil, + 0, + "+" + )] + ), + [:a, :b], + (168...171), + (176...177), + (178...179), + (200...201), + nil, + (243...246) + )] + ), + (266...269) + ), + ClassNode(293...376)( + [], + (293...298), + ConstantReadNode(299...300)(), + nil, + nil, + StatementsNode(315...358)( + [ClassNode(315...358)( + [], + (315...320), + ConstantReadNode(321...322)(), + nil, + nil, + StatementsNode(337...343)( + [ConstantWriteNode(337...343)( + (337...338), + IntegerNode(341...343)(), + (339...340) + )] + ), + (355...358) + )] + ), + (373...376) + ), + ClassNode(395...498)( + [], + (395...400), + ConstantReadNode(401...402)(), + nil, + nil, + StatementsNode(417...480)( + [DefNode(417...480)( + (421...422), + nil, + ParametersNode(423...444)( + [RequiredParameterNode(423...424)(:a), + RequiredParameterNode(443...444)(:b)], + [], + [], + nil, + [], + nil, + nil + ), + StatementsNode(459...464)( + [CallNode(459...464)( + LocalVariableReadNode(459...460)(:a, 0), + nil, + (461...462), + nil, + ArgumentsNode(463...464)( + [LocalVariableReadNode(463...464)(:b, 0)] + ), + nil, + nil, + 0, + "+" + )] + ), + [:a, :b], + (417...420), + nil, + (422...423), + (444...445), + nil, + (477...480) + )] + ), + (495...498) + ), + ModuleNode(517...565)( + [], + (517...523), + ConstantReadNode(524...525)(), + StatementsNode(528...561)( + [ConstantWriteNode(528...561)( + (528...529), + ArrayNode(532...561)( + [SymbolNode(538...544)((538...539), (539...544), nil, "line3"), + SymbolNode(550...556)((550...551), (551...556), nil, "line4")], + (532...533), + (560...561) + ), + (530...531) + )] + ), + (562...565) + ), + ModuleNode(568...651)( + [], + (568...574), + ConstantReadNode(575...576)(), + StatementsNode(590...633)( + [ModuleNode(590...633)( + [], + (590...596), + ConstantReadNode(597...598)(), + StatementsNode(612...618)( + [ConstantWriteNode(612...618)( + (612...613), + IntegerNode(616...618)(), + (614...615) + )] + ), + (630...633) + )] + ), + (648...651) + ), + CallNode(670...689)( + nil, + nil, + (670...671), + (671...672), + ArgumentsNode(673...687)( + [SymbolNode(673...679)((673...674), (674...679), nil, "line2"), + SymbolNode(681...687)((681...682), (682...687), nil, "line3")] + ), + (688...689), + nil, + 0, + "x" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/case_in.txt b/test/yarp/snapshots/seattlerb/case_in.txt index e339f35c8c..8277b654c1 100644 --- a/test/yarp/snapshots/seattlerb/case_in.txt +++ b/test/yarp/snapshots/seattlerb/case_in.txt @@ -1,7 +1,7 @@ -ProgramNode(0...746)( +ProgramNode(0...747)( [:b, :_, :lhs, :x, :rhs, :c, :e], - StatementsNode(0...746)( - [CaseNode(0...20)( + StatementsNode(0...747)( + [CaseNode(0...21)( SymbolNode(5...7)((5...6), (6...7), nil, "a"), [InNode(8...16)( HashPatternNode(12...16)( @@ -21,207 +21,207 @@ ProgramNode(0...746)( )], nil, (0...4), - (17...20) + (18...21) ), - CaseNode(22...44)( - SymbolNode(27...29)((27...28), (28...29), nil, "a"), - [InNode(30...40)( - ArrayNode(33...40)( - [SymbolNode(36...37)(nil, (36...37), nil, "a"), - SymbolNode(38...39)(nil, (38...39), nil, "b")], - (33...36), - (39...40) + CaseNode(23...45)( + SymbolNode(28...30)((28...29), (29...30), nil, "a"), + [InNode(31...41)( + ArrayNode(34...41)( + [SymbolNode(37...38)(nil, (37...38), nil, "a"), + SymbolNode(39...40)(nil, (39...40), nil, "b")], + (34...37), + (40...41) ), nil, - (30...32), + (31...33), nil )], nil, - (22...26), - (41...44) + (23...27), + (42...45) ), - CaseNode(46...68)( - SymbolNode(51...53)((51...52), (52...53), nil, "a"), - [InNode(54...64)( - ArrayNode(57...64)( - [StringNode(60...61)(nil, (60...61), nil, "a"), - StringNode(62...63)(nil, (62...63), nil, "b")], - (57...60), - (63...64) + CaseNode(47...69)( + SymbolNode(52...54)((52...53), (53...54), nil, "a"), + [InNode(55...65)( + ArrayNode(58...65)( + [StringNode(61...62)(nil, (61...62), nil, "a"), + StringNode(63...64)(nil, (63...64), nil, "b")], + (58...61), + (64...65) ), nil, - (54...56), + (55...57), nil )], nil, - (46...50), - (65...68) + (47...51), + (66...69) ), - CaseNode(70...92)( - SymbolNode(75...77)((75...76), (76...77), nil, "a"), - [InNode(78...88)( - ArrayNode(81...88)( - [SymbolNode(84...85)(nil, (84...85), nil, "a"), - SymbolNode(86...87)(nil, (86...87), nil, "b")], - (81...84), - (87...88) + CaseNode(71...93)( + SymbolNode(76...78)((76...77), (77...78), nil, "a"), + [InNode(79...89)( + ArrayNode(82...89)( + [SymbolNode(85...86)(nil, (85...86), nil, "a"), + SymbolNode(87...88)(nil, (87...88), nil, "b")], + (82...85), + (88...89) ), nil, - (78...80), + (79...81), nil )], nil, - (70...74), - (89...92) + (71...75), + (90...93) ), - CaseNode(94...116)( - SymbolNode(99...101)((99...100), (100...101), nil, "a"), - [InNode(102...112)( - ArrayNode(105...112)( - [StringNode(108...109)(nil, (108...109), nil, "a"), - StringNode(110...111)(nil, (110...111), nil, "b")], - (105...108), - (111...112) + CaseNode(95...117)( + SymbolNode(100...102)((100...101), (101...102), nil, "a"), + [InNode(103...113)( + ArrayNode(106...113)( + [StringNode(109...110)(nil, (109...110), nil, "a"), + StringNode(111...112)(nil, (111...112), nil, "b")], + (106...109), + (112...113) ), nil, - (102...104), + (103...105), nil )], nil, - (94...98), - (113...116) + (95...99), + (114...117) ), - CaseNode(118...140)( - SymbolNode(123...125)((123...124), (124...125), nil, "a"), - [InNode(126...135)( - RangeNode(130...135)(nil, IntegerNode(133...135)(), (130...133), 1), + CaseNode(119...141)( + SymbolNode(124...126)((124...125), (125...126), nil, "a"), + [InNode(127...136)( + RangeNode(131...136)(nil, IntegerNode(134...136)(), (131...134), 1), nil, - (126...128), + (127...129), nil )], nil, - (118...122), - (137...140) + (119...123), + (138...141) ), - CaseNode(142...163)( - SymbolNode(147...149)((147...148), (148...149), nil, "a"), - [InNode(150...158)( - RangeNode(154...158)(nil, IntegerNode(156...158)(), (154...156), 0), + CaseNode(143...164)( + SymbolNode(148...150)((148...149), (149...150), nil, "a"), + [InNode(151...159)( + RangeNode(155...159)(nil, IntegerNode(157...159)(), (155...157), 0), nil, - (150...152), + (151...153), nil )], nil, - (142...146), - (160...163) + (143...147), + (161...164) ), - CaseNode(165...186)( - SymbolNode(170...172)((170...171), (171...172), nil, "a"), - [InNode(173...181)( - RangeNode(177...181)(IntegerNode(177...178)(), nil, (178...181), 1), + CaseNode(166...187)( + SymbolNode(171...173)((171...172), (172...173), nil, "a"), + [InNode(174...182)( + RangeNode(178...182)(IntegerNode(178...179)(), nil, (179...182), 1), nil, - (173...175), + (174...176), nil )], nil, - (165...169), - (183...186) + (166...170), + (184...187) ), - CaseNode(188...210)( - SymbolNode(193...195)((193...194), (194...195), nil, "a"), - [InNode(196...205)( - RangeNode(200...205)( - IntegerNode(200...201)(), - IntegerNode(204...205)(), - (201...204), + CaseNode(189...211)( + SymbolNode(194...196)((194...195), (195...196), nil, "a"), + [InNode(197...206)( + RangeNode(201...206)( + IntegerNode(201...202)(), + IntegerNode(205...206)(), + (202...205), 1 ), nil, - (196...198), + (197...199), nil )], nil, - (188...192), - (207...210) + (189...193), + (208...211) ), - CaseNode(212...231)( - SymbolNode(217...219)((217...218), (218...219), nil, "a"), - [InNode(220...226)(IntegerNode(224...226)(), nil, (220...222), nil)], + CaseNode(213...232)( + SymbolNode(218...220)((218...219), (219...220), nil, "a"), + [InNode(221...227)(IntegerNode(225...227)(), nil, (221...223), nil)], nil, - (212...216), - (228...231) + (213...217), + (229...232) ), - CaseNode(233...253)( - SymbolNode(238...240)((238...239), (239...240), nil, "a"), - [InNode(241...249)( - HashPatternNode(244...249)( + CaseNode(234...254)( + SymbolNode(239...241)((239...240), (240...241), nil, "a"), + [InNode(242...250)( + HashPatternNode(245...250)( nil, - [NoKeywordsParameterNode(244...249)((244...246), (246...249))], + [NoKeywordsParameterNode(245...250)((245...247), (247...250))], nil, nil, nil ), nil, - (241...243), + (242...244), nil )], nil, - (233...237), - (250...253) + (234...238), + (251...254) ), - CaseNode(255...278)( - SymbolNode(260...262)((260...261), (261...262), nil, "a"), - [InNode(263...274)( - RegularExpressionNode(266...274)( - (266...267), - (267...273), - (273...274), + CaseNode(256...279)( + SymbolNode(261...263)((261...262), (262...263), nil, "a"), + [InNode(264...275)( + RegularExpressionNode(267...275)( + (267...268), + (268...274), + (274...275), "regexp", 0 ), nil, - (263...265), + (264...266), nil )], nil, - (255...259), - (275...278) + (256...260), + (276...279) ), - CaseNode(280...305)( - SymbolNode(285...287)((285...286), (286...287), nil, "a"), - [InNode(288...301)( - ArrayPatternNode(291...301)( + CaseNode(281...306)( + SymbolNode(286...288)((286...287), (287...288), nil, "a"), + [InNode(289...302)( + ArrayPatternNode(292...302)( nil, - [SymbolNode(291...293)((291...292), (292...293), nil, "b")], - SplatNode(295...297)( - (295...296), - LocalVariableWriteNode(296...297)(:_, 0, nil, (296...297), nil) + [SymbolNode(292...294)((292...293), (293...294), nil, "b")], + SplatNode(296...298)( + (296...297), + LocalVariableWriteNode(297...298)(:_, 0, nil, (297...298), nil) ), - [SymbolNode(299...301)((299...300), (300...301), nil, "c")], + [SymbolNode(300...302)((300...301), (301...302), nil, "c")], nil, nil ), nil, - (288...290), + (289...291), nil )], nil, - (280...284), - (302...305) + (281...285), + (303...306) ), - CaseNode(307...330)( - SymbolNode(312...314)((312...313), (313...314), nil, "a"), - [InNode(315...326)( - ArrayPatternNode(318...326)( + CaseNode(308...331)( + SymbolNode(313...315)((313...314), (314...315), nil, "a"), + [InNode(316...327)( + ArrayPatternNode(319...327)( nil, - [SymbolNode(318...320)((318...319), (319...320), nil, "b"), - ArrayPatternNode(322...326)( + [SymbolNode(319...321)((319...320), (320...321), nil, "b"), + ArrayPatternNode(323...327)( nil, - [SymbolNode(323...325)((323...324), (324...325), nil, "c")], + [SymbolNode(324...326)((324...325), (325...326), nil, "c")], nil, [], - (322...323), - (325...326) + (323...324), + (326...327) )], nil, [], @@ -229,93 +229,93 @@ ProgramNode(0...746)( nil ), nil, - (315...317), + (316...318), nil )], nil, - (307...311), - (327...330) + (308...312), + (328...331) ), - CaseNode(332...355)( - SymbolNode(337...339)((337...338), (338...339), nil, "a"), - [InNode(340...351)( - ArrayPatternNode(343...351)( - ConstantReadNode(343...349)(), + CaseNode(333...356)( + SymbolNode(338...340)((338...339), (339...340), nil, "a"), + [InNode(341...352)( + ArrayPatternNode(344...352)( + ConstantReadNode(344...350)(), [], nil, [], - (349...350), - (350...351) + (350...351), + (351...352) ), nil, - (340...342), + (341...343), nil )], nil, - (332...336), - (352...355) + (333...337), + (353...356) ), - CaseNode(357...393)( - SymbolNode(362...364)((362...363), (363...364), nil, "a"), - [InNode(365...389)( - FindPatternNode(368...389)( - ConstantReadNode(368...374)(), - SplatNode(375...379)( - (375...376), - LocalVariableWriteNode(376...379)(:lhs, 0, nil, (376...379), nil) + CaseNode(358...394)( + SymbolNode(363...365)((363...364), (364...365), nil, "a"), + [InNode(366...390)( + FindPatternNode(369...390)( + ConstantReadNode(369...375)(), + SplatNode(376...380)( + (376...377), + LocalVariableWriteNode(377...380)(:lhs, 0, nil, (377...380), nil) ), - [LocalVariableWriteNode(381...382)(:x, 0, nil, (381...382), nil)], - SplatNode(384...388)( - (384...385), - LocalVariableWriteNode(385...388)(:rhs, 0, nil, (385...388), nil) + [LocalVariableWriteNode(382...383)(:x, 0, nil, (382...383), nil)], + SplatNode(385...389)( + (385...386), + LocalVariableWriteNode(386...389)(:rhs, 0, nil, (386...389), nil) ), - (374...375), - (388...389) + (375...376), + (389...390) ), nil, - (365...367), + (366...368), nil )], nil, - (357...361), - (390...393) + (358...362), + (391...394) ), - CaseNode(395...431)( - SymbolNode(400...402)((400...401), (401...402), nil, "a"), - [InNode(403...427)( - FindPatternNode(406...427)( - ConstantReadNode(406...412)(), - SplatNode(413...417)( - (413...414), - LocalVariableWriteNode(414...417)(:lhs, 0, nil, (414...417), nil) + CaseNode(396...432)( + SymbolNode(401...403)((401...402), (402...403), nil, "a"), + [InNode(404...428)( + FindPatternNode(407...428)( + ConstantReadNode(407...413)(), + SplatNode(414...418)( + (414...415), + LocalVariableWriteNode(415...418)(:lhs, 0, nil, (415...418), nil) ), - [LocalVariableWriteNode(419...420)(:x, 0, nil, (419...420), nil)], - SplatNode(422...426)( - (422...423), - LocalVariableWriteNode(423...426)(:rhs, 0, nil, (423...426), nil) + [LocalVariableWriteNode(420...421)(:x, 0, nil, (420...421), nil)], + SplatNode(423...427)( + (423...424), + LocalVariableWriteNode(424...427)(:rhs, 0, nil, (424...427), nil) ), - (412...413), - (426...427) + (413...414), + (427...428) ), nil, - (403...405), + (404...406), nil )], nil, - (395...399), - (428...431) + (396...400), + (429...432) ), - CaseNode(433...467)( - SymbolNode(438...440)((438...439), (439...440), nil, "a"), - [InNode(441...463)( - ArrayPatternNode(444...463)( + CaseNode(434...468)( + SymbolNode(439...441)((439...440), (440...441), nil, "a"), + [InNode(442...464)( + ArrayPatternNode(445...464)( nil, - [LambdaNode(445...459)( + [LambdaNode(446...460)( [:b], - (445...447), - BlockParametersNode(447...450)( - ParametersNode(448...449)( - [RequiredParameterNode(448...449)(:b)], + (446...448), + BlockParametersNode(448...451)( + ParametersNode(449...450)( + [RequiredParameterNode(449...450)(:b)], [], [], nil, @@ -324,156 +324,156 @@ ProgramNode(0...746)( nil ), [], - (447...448), - (449...450) + (448...449), + (450...451) ), - StatementsNode(453...457)([TrueNode(453...457)()]) + StatementsNode(454...458)([TrueNode(454...458)()]) ), - LocalVariableWriteNode(461...462)(:c, 0, nil, (461...462), nil)], + LocalVariableWriteNode(462...463)(:c, 0, nil, (462...463), nil)], nil, [], - (444...445), - (462...463) + (445...446), + (463...464) ), nil, - (441...443), + (442...444), nil )], nil, - (433...437), - (464...467) + (434...438), + (465...468) ), - CaseNode(469...509)( - SymbolNode(474...476)((474...475), (475...476), nil, "a"), - [InNode(477...505)( - ArrayPatternNode(480...505)( + CaseNode(470...510)( + SymbolNode(475...477)((475...476), (476...477), nil, "a"), + [InNode(478...506)( + ArrayPatternNode(481...506)( nil, - [SymbolNode(481...483)((481...482), (482...483), nil, "a"), - LocalVariableWriteNode(485...486)(:b, 0, nil, (485...486), nil), - LocalVariableWriteNode(488...489)(:c, 0, nil, (488...489), nil), - ArrayPatternNode(491...504)( + [SymbolNode(482...484)((482...483), (483...484), nil, "a"), + LocalVariableWriteNode(486...487)(:b, 0, nil, (486...487), nil), + LocalVariableWriteNode(489...490)(:c, 0, nil, (489...490), nil), + ArrayPatternNode(492...505)( nil, - [SymbolNode(492...494)((492...493), (493...494), nil, "d")], - SplatNode(496...498)( - (496...497), - LocalVariableWriteNode(497...498)( + [SymbolNode(493...495)((493...494), (494...495), nil, "d")], + SplatNode(497...499)( + (497...498), + LocalVariableWriteNode(498...499)( :e, 0, nil, - (497...498), + (498...499), nil ) ), - [NilNode(500...503)()], - (491...492), - (503...504) + [NilNode(501...504)()], + (492...493), + (504...505) )], nil, [], - (480...481), - (504...505) + (481...482), + (505...506) ), nil, - (477...479), + (478...480), nil )], nil, - (469...473), - (506...509) + (470...474), + (507...510) ), - CaseNode(511...535)( - SymbolNode(516...518)((516...517), (517...518), nil, "a"), - [InNode(519...531)( - ArrayPatternNode(522...531)( + CaseNode(512...536)( + SymbolNode(517...519)((517...518), (518...519), nil, "a"), + [InNode(520...532)( + ArrayPatternNode(523...532)( nil, - [ConstantReadNode(523...524)()], - SplatNode(526...527)((526...527), nil), - [ConstantReadNode(529...530)()], - (522...523), - (530...531) + [ConstantReadNode(524...525)()], + SplatNode(527...528)((527...528), nil), + [ConstantReadNode(530...531)()], + (523...524), + (531...532) ), nil, - (519...521), + (520...522), nil )], nil, - (511...515), - (532...535) + (512...516), + (533...536) ), - CaseNode(537...571)( - SymbolNode(542...544)((542...543), (543...544), nil, "a"), - [InNode(545...567)( - ArrayPatternNode(548...567)( + CaseNode(538...572)( + SymbolNode(543...545)((543...544), (544...545), nil, "a"), + [InNode(546...568)( + ArrayPatternNode(549...568)( nil, - [ArrayPatternNode(549...556)( + [ArrayPatternNode(550...557)( nil, - [SymbolNode(550...552)((550...551), (551...552), nil, "b"), - LocalVariableWriteNode(554...555)( + [SymbolNode(551...553)((551...552), (552...553), nil, "b"), + LocalVariableWriteNode(555...556)( :c, 0, nil, - (554...555), + (555...556), nil )], nil, [], - (549...550), - (555...556) + (550...551), + (556...557) ), - ArrayPatternNode(558...566)( + ArrayPatternNode(559...567)( nil, - [SymbolNode(559...561)((559...560), (560...561), nil, "d"), - PinnedVariableNode(563...565)( - LocalVariableReadNode(564...565)(:e, 0), - (563...564) + [SymbolNode(560...562)((560...561), (561...562), nil, "d"), + PinnedVariableNode(564...566)( + LocalVariableReadNode(565...566)(:e, 0), + (564...565) )], nil, [], - (558...559), - (565...566) + (559...560), + (566...567) )], nil, [], - (548...549), - (566...567) + (549...550), + (567...568) ), nil, - (545...547), + (546...548), nil )], nil, - (537...541), - (568...571) + (538...542), + (569...572) ), - CaseNode(573...590)( - SymbolNode(578...580)((578...579), (579...580), nil, "a"), - [InNode(581...586)( - ArrayPatternNode(584...586)( + CaseNode(574...591)( + SymbolNode(579...581)((579...580), (580...581), nil, "a"), + [InNode(582...587)( + ArrayPatternNode(585...587)( nil, [], nil, [], - (584...585), - (585...586) + (585...586), + (586...587) ), nil, - (581...583), + (582...584), nil )], nil, - (573...577), - (587...590) + (574...578), + (588...591) ), - CaseNode(592...613)( - SymbolNode(597...599)((597...598), (598...599), nil, "a"), - [InNode(600...609)( - ArrayPatternNode(603...609)( + CaseNode(593...614)( + SymbolNode(598...600)((598...599), (599...600), nil, "a"), + [InNode(601...610)( + ArrayPatternNode(604...610)( nil, - [PinnedExpressionNode(604...608)( - CallNode(606...607)( + [PinnedExpressionNode(605...609)( + CallNode(607...608)( nil, nil, - (606...607), + (607...608), nil, nil, nil, @@ -481,127 +481,127 @@ ProgramNode(0...746)( 2, "a" ), - (604...605), (605...606), - (607...608) + (606...607), + (608...609) )], nil, [], - (603...604), - (608...609) + (604...605), + (609...610) ), nil, - (600...602), + (601...603), nil )], nil, - (592...596), - (610...613) + (593...597), + (611...614) ), - CaseNode(615...646)( - SymbolNode(620...622)((620...621), (621...622), nil, "a"), - [InNode(623...642)( - ArrayPatternNode(626...642)( + CaseNode(616...647)( + SymbolNode(621...623)((621...622), (622...623), nil, "a"), + [InNode(624...643)( + ArrayPatternNode(627...643)( nil, - [PinnedVariableNode(627...630)( - InstanceVariableReadNode(628...630)(), - (627...628) + [PinnedVariableNode(628...631)( + InstanceVariableReadNode(629...631)(), + (628...629) ), - PinnedVariableNode(632...635)( - GlobalVariableReadNode(633...635)(), - (632...633) + PinnedVariableNode(633...636)( + GlobalVariableReadNode(634...636)(), + (633...634) ), - PinnedVariableNode(637...641)( - ClassVariableReadNode(638...641)(), - (637...638) + PinnedVariableNode(638...642)( + ClassVariableReadNode(639...642)(), + (638...639) )], nil, [], - (626...627), - (641...642) + (627...628), + (642...643) ), nil, - (623...625), + (624...626), nil )], nil, - (615...619), - (643...646) + (616...620), + (644...647) ), - CaseNode(648...672)( - SymbolNode(653...655)((653...654), (654...655), nil, "a"), - [InNode(656...668)( - XStringNode(659...668)( - (659...660), - (660...667), - (667...668), + CaseNode(649...673)( + SymbolNode(654...656)((654...655), (655...656), nil, "a"), + [InNode(657...669)( + XStringNode(660...669)( + (660...661), + (661...668), + (668...669), "echo hi" ), nil, - (656...658), + (657...659), nil )], nil, - (648...652), - (669...672) + (649...653), + (670...673) ), - CaseNode(674...702)( - SymbolNode(679...681)((679...680), (680...681), nil, "a"), - [InNode(682...698)( - ArrayPatternNode(685...698)( + CaseNode(675...703)( + SymbolNode(680...682)((680...681), (681...682), nil, "a"), + [InNode(683...699)( + ArrayPatternNode(686...699)( nil, - [NilNode(685...688)(), NilNode(690...693)(), NilNode(695...698)()], + [NilNode(686...689)(), NilNode(691...694)(), NilNode(696...699)()], nil, [], nil, nil ), nil, - (682...684), + (683...685), nil )], nil, - (674...678), - (699...702) + (675...679), + (700...703) ), - CaseNode(704...727)( - SymbolNode(709...711)((709...710), (710...711), nil, "a"), - [InNode(712...723)( - HashPatternNode(715...723)( + CaseNode(705...728)( + SymbolNode(710...712)((710...711), (711...712), nil, "a"), + [InNode(713...724)( + HashPatternNode(716...724)( nil, - [AssocNode(717...721)( - SymbolNode(717...721)( - (717...718), + [AssocNode(718...722)( + SymbolNode(718...722)( (718...719), - (719...721), + (719...720), + (720...722), "b" ), nil, nil )], nil, - (715...716), - (722...723) + (716...717), + (723...724) ), nil, - (712...714), + (713...715), nil )], nil, - (704...708), - (724...727) + (705...709), + (725...728) ), - CaseNode(729...746)( - SymbolNode(734...736)((734...735), (735...736), nil, "a"), - [InNode(737...742)( - HashPatternNode(740...742)(nil, [], nil, (740...741), (741...742)), + CaseNode(730...747)( + SymbolNode(735...737)((735...736), (736...737), nil, "a"), + [InNode(738...743)( + HashPatternNode(741...743)(nil, [], nil, (741...742), (742...743)), nil, - (737...739), + (738...740), nil )], nil, - (729...733), - (743...746) + (730...734), + (744...747) )] ) ) diff --git a/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt b/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt new file mode 100644 index 0000000000..14d94bc244 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt @@ -0,0 +1,38 @@ +ProgramNode(0...22)( + [], + StatementsNode(0...22)( + [DefNode(0...22)( + (4...5), + nil, + ParametersNode(6...9)( + [], + [], + [], + nil, + [], + ForwardingParameterNode(6...9)(), + nil + ), + StatementsNode(12...18)( + [CallNode(12...18)( + nil, + nil, + (12...13), + (13...14), + ArgumentsNode(14...17)([ForwardingArgumentsNode(14...17)()]), + (17...18), + nil, + 0, + "m" + )] + ), + [:"..."], + (0...3), + nil, + nil, + nil, + nil, + (19...22) + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult0_.txt b/test/yarp/snapshots/seattlerb/difficult0_.txt new file mode 100644 index 0000000000..c68a126eb0 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult0_.txt @@ -0,0 +1,51 @@ +ProgramNode(0...30)( + [], + StatementsNode(0...30)( + [CallNode(0...30)( + nil, + nil, + (0...1), + nil, + ArgumentsNode(2...30)( + [CallNode(2...30)( + CallNode(2...26)( + InterpolatedStringNode(2...8)( + (2...8), + [StringNode(12...16)(nil, (12...16), nil, " a\n")], + (16...22) + ), + nil, + (8...9), + nil, + ArgumentsNode(9...26)( + [InterpolatedStringNode(9...26)( + (9...10), + [StringNode(10...12)(nil, (10...12), nil, "b\n"), + StringNode(22...25)(nil, (22...25), nil, " c")], + (25...26) + )] + ), + nil, + nil, + 0, + "+" + ), + nil, + (26...27), + nil, + ArgumentsNode(27...30)( + [StringNode(27...30)((27...28), (28...29), (29...30), "d")] + ), + nil, + nil, + 0, + "+" + )] + ), + nil, + nil, + 0, + "p" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt b/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt new file mode 100644 index 0000000000..6973697641 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult1_line_numbers.txt @@ -0,0 +1,131 @@ +ProgramNode(0...104)( + [], + StatementsNode(0...104)( + [IfNode(0...104)( + (0...2), + TrueNode(3...7)(), + StatementsNode(10...100)( + [CallNode(10...13)( + nil, + nil, + (10...11), + nil, + ArgumentsNode(12...13)([IntegerNode(12...13)()]), + nil, + nil, + 0, + "p" + ), + CallNode(16...21)( + CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"), + (17...18), + (18...19), + nil, + ArgumentsNode(20...21)([IntegerNode(20...21)()]), + nil, + nil, + 0, + "b" + ), + CallNode(24...32)( + CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "c"), + (25...26), + (26...27), + nil, + ArgumentsNode(28...32)( + [IntegerNode(28...29)(), IntegerNode(31...32)()] + ), + nil, + nil, + 0, + "d" + ), + CallNode(35...40)( + CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "e"), + (36...37), + (37...38), + nil, + ArgumentsNode(39...40)([IntegerNode(39...40)()]), + nil, + nil, + 0, + "f" + ), + CallNode(43...51)( + CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 2, "g"), + (44...45), + (45...46), + nil, + ArgumentsNode(47...51)( + [IntegerNode(47...48)(), IntegerNode(50...51)()] + ), + nil, + nil, + 0, + "h" + ), + CallNode(54...58)( + nil, + nil, + (54...55), + (55...56), + ArgumentsNode(56...57)([IntegerNode(56...57)()]), + (57...58), + nil, + 0, + "p" + ), + CallNode(61...67)( + CallNode(61...62)(nil, nil, (61...62), nil, nil, nil, nil, 2, "a"), + (62...63), + (63...64), + (64...65), + ArgumentsNode(65...66)([IntegerNode(65...66)()]), + (66...67), + nil, + 0, + "b" + ), + CallNode(70...79)( + CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 2, "c"), + (71...72), + (72...73), + (73...74), + ArgumentsNode(74...78)( + [IntegerNode(74...75)(), IntegerNode(77...78)()] + ), + (78...79), + nil, + 0, + "d" + ), + CallNode(82...88)( + CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "e"), + (83...84), + (84...85), + (85...86), + ArgumentsNode(86...87)([IntegerNode(86...87)()]), + (87...88), + nil, + 0, + "f" + ), + CallNode(91...100)( + CallNode(91...92)(nil, nil, (91...92), nil, nil, nil, nil, 2, "g"), + (92...93), + (93...94), + (94...95), + ArgumentsNode(95...99)( + [IntegerNode(95...96)(), IntegerNode(98...99)()] + ), + (99...100), + nil, + 0, + "h" + )] + ), + nil, + (101...104) + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt b/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt new file mode 100644 index 0000000000..86433437ce --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult1_line_numbers2.txt @@ -0,0 +1,52 @@ +ProgramNode(0...48)( + [:b, :c], + StatementsNode(0...48)( + [IfNode(0...46)( + (0...2), + TrueNode(3...7)(), + StatementsNode(15...42)( + [CallNode(15...21)( + nil, + nil, + (15...16), + (16...17), + ArgumentsNode(17...20)( + [StringNode(17...20)((17...18), (18...19), (19...20), "a")] + ), + (20...21), + nil, + 0, + "p" + ), + LocalVariableWriteNode(24...29)( + :b, + 0, + IntegerNode(28...29)(), + (24...25), + (26...27) + ), + CallNode(32...35)( + nil, + nil, + (32...33), + nil, + ArgumentsNode(34...35)([LocalVariableReadNode(34...35)(:b, 0)]), + nil, + nil, + 0, + "p" + ), + LocalVariableWriteNode(38...42)( + :c, + 0, + IntegerNode(41...42)(), + (38...39), + (40...41) + )] + ), + nil, + (43...46) + ), + CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 2, "a")] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult2_.txt b/test/yarp/snapshots/seattlerb/difficult2_.txt new file mode 100644 index 0000000000..78772ca20d --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult2_.txt @@ -0,0 +1,49 @@ +ProgramNode(0...20)( + [], + StatementsNode(0...20)( + [IfNode(0...13)( + nil, + IntegerNode(0...1)(), + StatementsNode(4...9)( + [CallNode(4...9)( + nil, + nil, + (4...5), + (5...6), + ArgumentsNode(6...8)( + [StringNode(6...8)((6...7), (7...7), (7...8), "")] + ), + (8...9), + nil, + 0, + "b" + )] + ), + ElseNode(10...13)( + (10...11), + StatementsNode(12...13)([IntegerNode(12...13)()]), + nil + ), + nil + ), + CallNode(14...20)( + nil, + nil, + (14...15), + nil, + ArgumentsNode(16...20)( + [KeywordHashNode(16...20)( + [AssocNode(16...20)( + SymbolNode(16...18)(nil, (16...17), (17...18), "d"), + IntegerNode(19...20)(), + nil + )] + )] + ), + nil, + nil, + 0, + "a" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3_.txt b/test/yarp/snapshots/seattlerb/difficult3_.txt new file mode 100644 index 0000000000..ba5d6c3aed --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3_.txt @@ -0,0 +1,44 @@ +ProgramNode(0...18)( + [], + StatementsNode(0...18)( + [CallNode(0...18)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...18)( + [:a, :b, :c], + BlockParametersNode(4...16)( + ParametersNode(5...15)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...15)( + [RequiredParameterNode(9...10)(:b), + SplatNode(12...14)( + (12...13), + RequiredParameterNode(13...14)(:c) + )], + (8...9), + (14...15) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (15...16) + ), + nil, + (2...3), + (17...18) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3_2.txt b/test/yarp/snapshots/seattlerb/difficult3_2.txt new file mode 100644 index 0000000000..3981937066 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3_2.txt @@ -0,0 +1,35 @@ +ProgramNode(0...13)( + [], + StatementsNode(0...13)( + [CallNode(0...13)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...13)( + [:a, :b], + BlockParametersNode(4...11)( + ParametersNode(5...10)( + [], + [], + [RequiredParameterNode(9...10)(:b)], + RestParameterNode(5...7)((5...6), (6...7)), + [], + nil, + nil + ), + [], + (4...5), + (10...11) + ), + nil, + (2...3), + (12...13) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3_3.txt b/test/yarp/snapshots/seattlerb/difficult3_3.txt new file mode 100644 index 0000000000..7a25bc9c8b --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3_3.txt @@ -0,0 +1,35 @@ +ProgramNode(0...17)( + [], + StatementsNode(0...17)( + [CallNode(0...17)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...17)( + [:a, :b, :c], + BlockParametersNode(4...15)( + ParametersNode(5...14)( + [], + [], + [RequiredParameterNode(9...10)(:b)], + RestParameterNode(5...7)((5...6), (6...7)), + [], + nil, + BlockParameterNode(12...14)((13...14), (12...13)) + ), + [], + (4...5), + (14...15) + ), + nil, + (2...3), + (16...17) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3_4.txt b/test/yarp/snapshots/seattlerb/difficult3_4.txt new file mode 100644 index 0000000000..afca77c5fa --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3_4.txt @@ -0,0 +1,22 @@ +ProgramNode(0...17)( + [:a], + StatementsNode(0...17)( + [LocalVariableWriteNode(0...17)( + :a, + 0, + IfNode(2...17)( + nil, + CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"), + StatementsNode(6...10)([TrueNode(6...10)()]), + ElseNode(10...17)( + (10...11), + StatementsNode(12...17)([FalseNode(12...17)()]), + nil + ), + nil + ), + (0...1), + (1...2) + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3_5.txt b/test/yarp/snapshots/seattlerb/difficult3_5.txt new file mode 100644 index 0000000000..e7aaafc87a --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3_5.txt @@ -0,0 +1,35 @@ +ProgramNode(0...19)( + [], + StatementsNode(0...19)( + [CallNode(0...19)( + nil, + nil, + (0...1), + nil, + ArgumentsNode(2...19)( + [LambdaNode(2...19)( + [], + (2...4), + BlockParametersNode(4...6)(nil, [], (4...5), (5...6)), + StatementsNode(9...17)( + [CallNode(9...17)( + nil, + nil, + (9...10), + nil, + nil, + nil, + BlockNode(11...17)([], nil, nil, (11...13), (14...17)), + 0, + "g" + )] + ) + )] + ), + nil, + nil, + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__10.txt b/test/yarp/snapshots/seattlerb/difficult3__10.txt new file mode 100644 index 0000000000..7b7dc6f41b --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__10.txt @@ -0,0 +1,44 @@ +ProgramNode(0...18)( + [], + StatementsNode(0...18)( + [CallNode(0...18)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...18)( + [:a, :b, :c], + BlockParametersNode(4...16)( + ParametersNode(5...15)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...15)( + [SplatNode(9...11)( + (9...10), + RequiredParameterNode(10...11)(:b) + ), + RequiredParameterNode(13...14)(:c)], + (8...9), + (14...15) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (15...16) + ), + nil, + (2...3), + (17...18) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__11.txt b/test/yarp/snapshots/seattlerb/difficult3__11.txt new file mode 100644 index 0000000000..c5b8b81b18 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__11.txt @@ -0,0 +1,40 @@ +ProgramNode(0...14)( + [], + StatementsNode(0...14)( + [CallNode(0...14)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...14)( + [:a], + BlockParametersNode(4...12)( + ParametersNode(5...11)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...11)( + [SplatNode(9...10)((9...10), nil)], + (8...9), + (10...11) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (11...12) + ), + nil, + (2...3), + (13...14) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__12.txt b/test/yarp/snapshots/seattlerb/difficult3__12.txt new file mode 100644 index 0000000000..87dd280a9e --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__12.txt @@ -0,0 +1,41 @@ +ProgramNode(0...17)( + [], + StatementsNode(0...17)( + [CallNode(0...17)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...17)( + [:a, :b], + BlockParametersNode(4...15)( + ParametersNode(5...14)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...14)( + [SplatNode(9...10)((9...10), nil), + RequiredParameterNode(12...13)(:b)], + (8...9), + (13...14) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (14...15) + ), + nil, + (2...3), + (16...17) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__6.txt b/test/yarp/snapshots/seattlerb/difficult3__6.txt new file mode 100644 index 0000000000..578a22e843 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__6.txt @@ -0,0 +1,45 @@ +ProgramNode(0...21)( + [], + StatementsNode(0...21)( + [CallNode(0...21)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...21)( + [:a, :b, :c, :d], + BlockParametersNode(4...19)( + ParametersNode(5...18)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...18)( + [RequiredParameterNode(9...10)(:b), + SplatNode(12...14)( + (12...13), + RequiredParameterNode(13...14)(:c) + ), + RequiredParameterNode(16...17)(:d)], + (8...9), + (17...18) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (18...19) + ), + nil, + (2...3), + (20...21) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__7.txt b/test/yarp/snapshots/seattlerb/difficult3__7.txt new file mode 100644 index 0000000000..a306b1f895 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__7.txt @@ -0,0 +1,41 @@ +ProgramNode(0...17)( + [], + StatementsNode(0...17)( + [CallNode(0...17)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...17)( + [:a, :b], + BlockParametersNode(4...15)( + ParametersNode(5...14)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...14)( + [RequiredParameterNode(9...10)(:b), + SplatNode(12...13)((12...13), nil)], + (8...9), + (13...14) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (14...15) + ), + nil, + (2...3), + (16...17) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__8.txt b/test/yarp/snapshots/seattlerb/difficult3__8.txt new file mode 100644 index 0000000000..9d0eb81357 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__8.txt @@ -0,0 +1,42 @@ +ProgramNode(0...20)( + [], + StatementsNode(0...20)( + [CallNode(0...20)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...20)( + [:a, :b, :c], + BlockParametersNode(4...18)( + ParametersNode(5...17)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...17)( + [RequiredParameterNode(9...10)(:b), + SplatNode(12...13)((12...13), nil), + RequiredParameterNode(15...16)(:c)], + (8...9), + (16...17) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (17...18) + ), + nil, + (2...3), + (19...20) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult3__9.txt b/test/yarp/snapshots/seattlerb/difficult3__9.txt new file mode 100644 index 0000000000..a3a5ccd89d --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult3__9.txt @@ -0,0 +1,43 @@ +ProgramNode(0...15)( + [], + StatementsNode(0...15)( + [CallNode(0...15)( + nil, + nil, + (0...1), + nil, + nil, + nil, + BlockNode(2...15)( + [:a, :b], + BlockParametersNode(4...13)( + ParametersNode(5...12)( + [RequiredParameterNode(5...6)(:a), + RequiredDestructuredParameterNode(8...12)( + [SplatNode(9...11)( + (9...10), + RequiredParameterNode(10...11)(:b) + )], + (8...9), + (11...12) + )], + [], + [], + nil, + [], + nil, + nil + ), + [], + (4...5), + (12...13) + ), + nil, + (2...3), + (14...15) + ), + 0, + "f" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt b/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt new file mode 100644 index 0000000000..881cc6d5a8 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult4__leading_dots.txt @@ -0,0 +1,16 @@ +ProgramNode(0...4)( + [], + StatementsNode(0...4)( + [CallNode(0...4)( + CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"), + (2...3), + (3...4), + nil, + nil, + nil, + nil, + 0, + "b" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt b/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt new file mode 100644 index 0000000000..8a246f5827 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult4__leading_dots2.txt @@ -0,0 +1,7 @@ +ProgramNode(0...5)( + [], + StatementsNode(0...5)( + [IntegerNode(0...1)(), + RangeNode(2...5)(nil, IntegerNode(4...5)(), (2...4), 0)] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult6_.txt b/test/yarp/snapshots/seattlerb/difficult6_.txt new file mode 100644 index 0000000000..20e419bbc4 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult6_.txt @@ -0,0 +1,48 @@ +ProgramNode(0...25)( + [], + StatementsNode(0...25)( + [LambdaNode(0...25)( + [:a, :b], + (0...2), + BlockParametersNode(2...12)( + ParametersNode(3...11)( + [RequiredParameterNode(3...4)(:a)], + [OptionalParameterNode(6...11)( + :b, + (6...7), + (7...8), + NilNode(8...11)() + )], + [], + nil, + [], + nil, + nil + ), + [], + (2...3), + (11...12) + ), + StatementsNode(15...23)( + [CallNode(15...23)( + nil, + nil, + (15...16), + nil, + ArgumentsNode(17...23)( + [ArrayNode(17...23)( + [LocalVariableReadNode(18...19)(:a, 0), + LocalVariableReadNode(21...22)(:b, 0)], + (17...18), + (22...23) + )] + ), + nil, + nil, + 0, + "p" + )] + ) + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult6__7.txt b/test/yarp/snapshots/seattlerb/difficult6__7.txt new file mode 100644 index 0000000000..60b902f4d2 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult6__7.txt @@ -0,0 +1,30 @@ +ProgramNode(0...11)( + [], + StatementsNode(0...11)( + [CallNode(0...11)( + CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"), + (1...2), + (2...3), + nil, + ArgumentsNode(4...7)( + [ParenthesesNode(4...7)( + StatementsNode(5...6)([IntegerNode(5...6)()]), + (4...5), + (6...7) + )] + ), + nil, + BlockNode(8...11)( + [], + nil, + StatementsNode(9...10)( + [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c")] + ), + (8...9), + (10...11) + ), + 0, + "b" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult6__8.txt b/test/yarp/snapshots/seattlerb/difficult6__8.txt new file mode 100644 index 0000000000..ed7a53a89a --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult6__8.txt @@ -0,0 +1,30 @@ +ProgramNode(0...12)( + [], + StatementsNode(0...12)( + [CallNode(0...12)( + CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"), + (1...3), + (3...4), + nil, + ArgumentsNode(5...8)( + [ParenthesesNode(5...8)( + StatementsNode(6...7)([IntegerNode(6...7)()]), + (5...6), + (7...8) + )] + ), + nil, + BlockNode(9...12)( + [], + nil, + StatementsNode(10...11)( + [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "c")] + ), + (9...10), + (11...12) + ), + 0, + "b" + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/difficult7_.txt b/test/yarp/snapshots/seattlerb/difficult7_.txt new file mode 100644 index 0000000000..44a67b3377 --- /dev/null +++ b/test/yarp/snapshots/seattlerb/difficult7_.txt @@ -0,0 +1,81 @@ +ProgramNode(6...66)( + [], + StatementsNode(6...66)( + [HashNode(6...66)( + (6...7), + [AssocNode(16...41)( + SymbolNode(16...18)(nil, (16...17), (17...18), "a"), + CallNode(19...41)( + nil, + nil, + (19...25), + nil, + nil, + nil, + BlockNode(26...41)( + [], + nil, + StatementsNode(28...39)( + [IfNode(28...39)( + nil, + CallNode(28...29)( + nil, + nil, + (28...29), + nil, + nil, + nil, + nil, + 2, + "b" + ), + StatementsNode(32...35)( + [CallNode(32...35)( + nil, + nil, + (32...33), + (33...34), + nil, + (34...35), + nil, + 0, + "c" + )] + ), + ElseNode(36...39)( + (36...37), + StatementsNode(38...39)( + [CallNode(38...39)( + nil, + nil, + (38...39), + nil, + nil, + nil, + nil, + 2, + "d" + )] + ), + nil + ), + nil + )] + ), + (26...27), + (40...41) + ), + 0, + "lambda" + ), + nil + ), + AssocNode(51...57)( + SymbolNode(51...53)(nil, (51...52), (52...53), "e"), + NilNode(54...57)(), + nil + )], + (65...66) + )] + ) +) diff --git a/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt b/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt index 3bb7807c5c..680ffbe0a6 100644 --- a/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt +++ b/test/yarp/snapshots/seattlerb/heredoc_squiggly_visually_blank_lines.txt @@ -6,8 +6,8 @@ ProgramNode(0...10)( 0, InterpolatedStringNode(4...10)( (4...10), - [StringNode(11...20)(nil, (11...20), nil, "x\n" + "\n" + "z\n")], - (20...24) + [StringNode(11...21)(nil, (11...21), nil, "x\n" + "\n" + "z\n")], + (21...25) ), (0...1), (2...3) diff --git a/test/yarp/snapshots/seattlerb/module_comments.txt b/test/yarp/snapshots/seattlerb/module_comments.txt index 5d11f23a4d..808f4799e6 100644 --- a/test/yarp/snapshots/seattlerb/module_comments.txt +++ b/test/yarp/snapshots/seattlerb/module_comments.txt @@ -1,26 +1,26 @@ -ProgramNode(22...75)( +ProgramNode(24...77)( [], - StatementsNode(22...75)( - [ModuleNode(22...75)( + StatementsNode(24...77)( + [ModuleNode(24...77)( [], - (22...28), - ConstantReadNode(29...30)(), - StatementsNode(44...71)( - [DefNode(44...71)( - (48...52), + (24...30), + ConstantReadNode(31...32)(), + StatementsNode(46...73)( + [DefNode(46...73)( + (50...54), nil, nil, nil, [], - (44...47), + (46...49), nil, nil, nil, nil, - (68...71) + (70...73) )] ), - (72...75) + (74...77) )] ) ) diff --git a/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt b/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt index e48c600649..7617e15479 100644 --- a/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt +++ b/test/yarp/snapshots/seattlerb/parse_line_trailing_newlines.txt @@ -1,7 +1,7 @@ -ProgramNode(0...3)( +ProgramNode(0...4)( [], - StatementsNode(0...3)( + StatementsNode(0...4)( [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"), - CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b")] + CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b")] ) ) diff --git a/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt b/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt index 69721af372..0725aaee49 100644 --- a/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt +++ b/test/yarp/snapshots/seattlerb/pct_Q_backslash_nl.txt @@ -1,4 +1,6 @@ ProgramNode(0...7)( [], - StatementsNode(0...7)([StringNode(0...7)((0...3), (3...6), (6...7), " ")]) + StatementsNode(0...7)( + [StringNode(0...7)((0...3), (3...6), (6...7), " \\\n")] + ) )