diff options
author | Kevin Newton <kddnewton@gmail.com> | 2023-09-06 11:27:00 -0400 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2023-09-07 12:42:02 +0000 |
commit | 14970cfc8d4ae68d173a2df45abecc4c41220270 (patch) | |
tree | a9d4fb450bec28604a7d2ae12abde7a4aa030b2f /test | |
parent | 9343ef250452c17b2842701805a4a0417165dd15 (diff) | |
download | ruby-14970cfc8d4ae68d173a2df45abecc4c41220270.tar.gz |
[ruby/yarp] Constants and def nodes
https://github.com/ruby/yarp/commit/6b2421ce1b
Diffstat (limited to 'test')
114 files changed, 363 insertions, 0 deletions
diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb index adaac44b35..608af07795 100644 --- a/test/yarp/errors_test.rb +++ b/test/yarp/errors_test.rb @@ -390,6 +390,7 @@ module YARP def test_module_definition_in_method_body expected = DefNode( + :foo, Location(), nil, nil, @@ -410,6 +411,7 @@ module YARP def test_module_definition_in_method_body_within_block expected = DefNode( + :foo, Location(), nil, nil, @@ -452,6 +454,7 @@ module YARP def test_class_definition_in_method_body expected = DefNode( + :foo, Location(), nil, nil, @@ -483,6 +486,7 @@ module YARP def test_bad_arguments expected = DefNode( + :foo, Location(), nil, ParametersNode([ @@ -550,6 +554,7 @@ module YARP def test_do_not_allow_trailing_commas_in_method_parameters expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -633,6 +638,7 @@ module YARP def test_method_parameters_after_block expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -660,6 +666,7 @@ module YARP def test_method_with_arguments_after_anonymous_block expected = DefNode( + :foo, Location(), nil, ParametersNode([], [], [RequiredParameterNode(:a)], nil, [], nil, BlockParameterNode(nil, nil, Location())), @@ -680,6 +687,7 @@ module YARP def test_method_parameters_after_arguments_forwarding expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -707,6 +715,7 @@ module YARP def test_keywords_parameters_before_required_parameters expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -734,6 +743,7 @@ module YARP def test_rest_keywords_parameters_before_required_parameters expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -754,6 +764,7 @@ module YARP nil, Location() ) + assert_errors expected, "def foo(**rest, b:)\nend", [ ["Unexpected parameter order", 16..18] ] @@ -761,6 +772,7 @@ module YARP def test_double_arguments_forwarding expected = DefNode( + :foo, Location(), nil, ParametersNode([], [], [], nil, [], ForwardingParameterNode(), nil), @@ -781,6 +793,7 @@ module YARP def test_multiple_error_in_parameters_order expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -810,6 +823,7 @@ module YARP def test_switching_to_optional_arguments_twice expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -839,6 +853,7 @@ module YARP def test_switching_to_named_arguments_twice expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -868,6 +883,7 @@ module YARP def test_returning_to_optional_parameters_multiple_times expected = DefNode( + :foo, Location(), nil, ParametersNode( @@ -913,6 +929,7 @@ module YARP def test_setter_method_cannot_be_defined_in_an_endless_method_definition expected = DefNode( + :a=, Location(), nil, nil, @@ -1026,6 +1043,7 @@ module YARP # duplicated parameter names for positional parameters. unless RUBY_VERSION < "3.1.0" expected = DefNode( + :foo, Location(), nil, ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b), RequiredParameterNode(:a)], [], [], nil, [], nil, nil), @@ -1045,6 +1063,7 @@ module YARP end expected = DefNode( + :foo, Location(), nil, ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], RestParameterNode(:a, Location(), Location()), [], nil, nil), @@ -1063,6 +1082,7 @@ module YARP ] expected = DefNode( + :foo, Location(), nil, ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], KeywordRestParameterNode(:a, Location(), Location()), nil), @@ -1081,6 +1101,7 @@ module YARP ] expected = DefNode( + :foo, Location(), nil, ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], nil, BlockParameterNode(:a, Location(), Location())), @@ -1099,6 +1120,7 @@ module YARP ] expected = DefNode( + :foo, Location(), nil, ParametersNode([], [OptionalParameterNode(:a, Location(), Location(), IntegerNode())], [RequiredParameterNode(:b)], RestParameterNode(:c, Location(), Location()), [], nil, nil), diff --git a/test/yarp/snapshots/endless_methods.txt b/test/yarp/snapshots/endless_methods.txt index 2e67d9d76f..61b7493847 100644 --- a/test/yarp/snapshots/endless_methods.txt +++ b/test/yarp/snapshots/endless_methods.txt @@ -2,6 +2,7 @@ ProgramNode(0...51)( [], StatementsNode(0...51)( [DefNode(0...11)( + :foo, (4...7), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...51)( nil ), DefNode(13...27)( + :bar, (17...20), nil, nil, @@ -42,6 +44,7 @@ ProgramNode(0...51)( nil ), DefNode(29...51)( + :method, (33...39), nil, nil, diff --git a/test/yarp/snapshots/indented_file_end.txt b/test/yarp/snapshots/indented_file_end.txt index 513a7ab0f5..bcdfba7302 100644 --- a/test/yarp/snapshots/indented_file_end.txt +++ b/test/yarp/snapshots/indented_file_end.txt @@ -2,6 +2,7 @@ ProgramNode(4...23)( [], StatementsNode(4...23)( [DefNode(4...23)( + :hi, (8...10), nil, nil, diff --git a/test/yarp/snapshots/keyword_method_names.txt b/test/yarp/snapshots/keyword_method_names.txt index 37fc09d0af..293164bb1e 100644 --- a/test/yarp/snapshots/keyword_method_names.txt +++ b/test/yarp/snapshots/keyword_method_names.txt @@ -2,6 +2,7 @@ ProgramNode(0...185)( [], StatementsNode(0...185)( [DefNode(0...11)( + :def, (4...7), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...185)( (8...11) ), DefNode(13...32)( + :ensure, (22...28), SelfNode(17...21)(), nil, @@ -34,6 +36,7 @@ ProgramNode(0...185)( nil, ArgumentsNode(42...68)( [DefNode(42...68)( + :foo, (46...49), nil, nil, @@ -65,6 +68,7 @@ ProgramNode(0...185)( "private" ), DefNode(70...89)( + :m, (74...75), nil, ParametersNode(76...84)( @@ -86,6 +90,7 @@ ProgramNode(0...185)( (86...89) ), DefNode(91...113)( + :a, (108...109), SourceEncodingNode(95...107)(), nil, @@ -101,6 +106,7 @@ ProgramNode(0...185)( StringNode(115...121)((115...117), (117...120), (120...121), "abc"), StringNode(123...129)((123...125), (125...128), (128...129), "abc"), DefNode(131...149)( + :a, (144...145), SourceFileNode(135...143)("keyword_method_names.txt"), nil, @@ -114,6 +120,7 @@ ProgramNode(0...185)( (146...149) ), DefNode(151...169)( + :a, (164...165), SourceLineNode(155...163)(), nil, @@ -127,6 +134,7 @@ ProgramNode(0...185)( (166...169) ), DefNode(171...185)( + :a, (180...181), NilNode(175...178)(), nil, diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt index 72fb1a704a..3b0b5ca299 100644 --- a/test/yarp/snapshots/methods.txt +++ b/test/yarp/snapshots/methods.txt @@ -2,6 +2,7 @@ ProgramNode(0...1194)( [:a, :c], StatementsNode(0...1194)( [DefNode(0...23)( + :foo, (4...7), nil, ParametersNode(8...18)( @@ -28,6 +29,7 @@ ProgramNode(0...1194)( (20...23) ), DefNode(25...74)( + :foo, (29...32), nil, ParametersNode(33...69)( @@ -64,6 +66,7 @@ ProgramNode(0...1194)( (71...74) ), DefNode(77...95)( + :a, (81...82), nil, nil, @@ -84,6 +87,7 @@ ProgramNode(0...1194)( (92...95) ), DefNode(97...110)( + :a, (105...106), ParenthesesNode(101...104)( CallNode(102...103)( @@ -111,6 +115,7 @@ ProgramNode(0...1194)( (107...110) ), DefNode(112...126)( + :b, (121...122), ParenthesesNode(116...119)( CallNode(117...118)( @@ -138,6 +143,7 @@ ProgramNode(0...1194)( (123...126) ), DefNode(128...143)( + :a, (138...139), FalseNode(132...137)(), nil, @@ -151,6 +157,7 @@ ProgramNode(0...1194)( (140...143) ), DefNode(145...159)( + :a, (149...150), nil, ParametersNode(151...154)( @@ -172,6 +179,7 @@ ProgramNode(0...1194)( (156...159) ), DefNode(161...175)( + :a, (170...171), GlobalVariableReadNode(165...169)(:$var), nil, @@ -185,6 +193,7 @@ ProgramNode(0...1194)( (172...175) ), DefNode(177...188)( + :b, (183...184), CallNode(181...182)(nil, nil, (181...182), nil, nil, nil, nil, 2, "a"), nil, @@ -198,6 +207,7 @@ ProgramNode(0...1194)( (185...188) ), DefNode(190...204)( + :a, (199...200), InstanceVariableReadNode(194...198)(:@var), nil, @@ -211,6 +221,7 @@ ProgramNode(0...1194)( (201...204) ), DefNode(206...219)( + :a, (210...211), nil, ParametersNode(212...214)( @@ -233,6 +244,7 @@ ProgramNode(0...1194)( ), StringNode(221...227)((221...223), (223...226), (226...227), "abc"), DefNode(229...242)( + :a, (233...234), nil, ParametersNode(235...237)( @@ -254,6 +266,7 @@ ProgramNode(0...1194)( (239...242) ), DefNode(244...258)( + :a, (248...249), nil, ParametersNode(250...253)( @@ -275,6 +288,7 @@ ProgramNode(0...1194)( (255...258) ), DefNode(260...273)( + :a, (264...265), nil, ParametersNode(266...268)( @@ -303,6 +317,7 @@ ProgramNode(0...1194)( (277...278) ), DefNode(282...291)( + :a, (286...287), nil, nil, @@ -316,6 +331,7 @@ ProgramNode(0...1194)( (288...291) ), DefNode(293...310)( + :a, (297...298), nil, ParametersNode(299...306)( @@ -339,6 +355,7 @@ ProgramNode(0...1194)( (307...310) ), DefNode(312...325)( + :a, (320...321), NilNode(316...319)(), nil, @@ -352,6 +369,7 @@ ProgramNode(0...1194)( (322...325) ), DefNode(327...345)( + :a, (331...332), nil, ParametersNode(333...341)( @@ -378,6 +396,7 @@ ProgramNode(0...1194)( (342...345) ), DefNode(347...366)( + :a, (351...352), nil, ParametersNode(353...361)( @@ -404,6 +423,7 @@ ProgramNode(0...1194)( (363...366) ), DefNode(368...389)( + :a, (372...373), nil, ParametersNode(374...384)( @@ -431,6 +451,7 @@ ProgramNode(0...1194)( ), StringNode(391...397)((391...393), (393...396), (396...397), "abc"), DefNode(399...421)( + :a, (403...404), nil, ParametersNode(405...417)( @@ -463,6 +484,7 @@ ProgramNode(0...1194)( (418...421) ), DefNode(423...434)( + :a, (427...428), nil, nil, @@ -476,6 +498,7 @@ ProgramNode(0...1194)( (431...434) ), DefNode(436...454)( + :a, (440...441), nil, ParametersNode(442...450)( @@ -502,6 +525,7 @@ ProgramNode(0...1194)( (451...454) ), DefNode(456...467)( + :a, (460...461), nil, ParametersNode(462...463)( @@ -523,6 +547,7 @@ ProgramNode(0...1194)( (464...467) ), DefNode(469...501)( + :a, (473...474), nil, nil, @@ -543,6 +568,7 @@ ProgramNode(0...1194)( (498...501) ), DefNode(503...515)( + :a, (507...508), nil, ParametersNode(509...511)( @@ -564,6 +590,7 @@ ProgramNode(0...1194)( (512...515) ), DefNode(517...529)( + :a, (521...522), nil, ParametersNode(523...524)( @@ -585,6 +612,7 @@ ProgramNode(0...1194)( (526...529) ), DefNode(531...546)( + :a, (535...536), nil, nil, @@ -606,6 +634,7 @@ ProgramNode(0...1194)( (543...546) ), DefNode(548...562)( + :a, (557...558), SelfNode(552...556)(), nil, @@ -619,6 +648,7 @@ ProgramNode(0...1194)( (559...562) ), DefNode(564...578)( + :a, (573...574), TrueNode(568...572)(), nil, @@ -632,6 +662,7 @@ ProgramNode(0...1194)( (575...578) ), DefNode(580...589)( + :a, (584...585), nil, nil, @@ -645,6 +676,7 @@ ProgramNode(0...1194)( (586...589) ), DefNode(591...625)( + :hi, (595...597), nil, nil, @@ -674,6 +706,7 @@ ProgramNode(0...1194)( (622...625) ), DefNode(627...638)( + :foo, (631...634), nil, nil, @@ -687,6 +720,7 @@ ProgramNode(0...1194)( nil ), DefNode(639...650)( + :bar, (643...646), nil, nil, @@ -700,6 +734,7 @@ ProgramNode(0...1194)( nil ), DefNode(652...670)( + :foo, (656...659), nil, ParametersNode(660...663)( @@ -721,6 +756,7 @@ ProgramNode(0...1194)( nil ), DefNode(672...685)( + :foo, (676...679), nil, nil, @@ -734,6 +770,7 @@ ProgramNode(0...1194)( nil ), DefNode(687...706)( + :a, (691...692), nil, ParametersNode(693...694)( @@ -767,6 +804,7 @@ ProgramNode(0...1194)( (703...706) ), DefNode(708...731)( + :a, (712...713), nil, ParametersNode(714...717)( @@ -800,6 +838,7 @@ ProgramNode(0...1194)( (728...731) ), DefNode(733...762)( + :a, (737...738), nil, ParametersNode(739...742)( @@ -837,6 +876,7 @@ ProgramNode(0...1194)( (759...762) ), DefNode(764...781)( + :a, (776...777), ParenthesesNode(768...775)( LocalVariableWriteNode(769...774)( @@ -870,6 +910,7 @@ ProgramNode(0...1194)( (778...781) ), DefNode(783...795)( + :a, (787...788), nil, ParametersNode(789...791)( @@ -891,6 +932,7 @@ ProgramNode(0...1194)( (792...795) ), DefNode(797...809)( + :a, (801...802), nil, ParametersNode(803...804)( @@ -912,6 +954,7 @@ ProgramNode(0...1194)( (806...809) ), DefNode(811...826)( + :a, (821...822), ClassVariableReadNode(815...820)(:@@var), nil, @@ -925,6 +968,7 @@ ProgramNode(0...1194)( (823...826) ), DefNode(828...845)( + :C, (840...841), ParenthesesNode(832...839)( LocalVariableWriteNode(833...838)( @@ -958,6 +1002,7 @@ ProgramNode(0...1194)( (842...845) ), DefNode(847...875)( + :Array_function, (856...870), SelfNode(851...855)(), nil, @@ -977,6 +1022,7 @@ ProgramNode(0...1194)( (883...884) ), DefNode(888...903)( + :a, (898...899), ConstantReadNode(892...897)(:Const), nil, @@ -990,6 +1036,7 @@ ProgramNode(0...1194)( (900...903) ), DefNode(905...936)( + :a, (909...910), nil, ParametersNode(911...914)( @@ -1036,6 +1083,7 @@ ProgramNode(0...1194)( (933...936) ), DefNode(938...980)( + :foo, (942...945), nil, nil, @@ -1106,6 +1154,7 @@ ProgramNode(0...1194)( (977...980) ), DefNode(982...1006)( + :bar, (986...989), nil, ParametersNode(990...1001)( @@ -1142,6 +1191,7 @@ ProgramNode(0...1194)( (1003...1006) ), DefNode(1008...1031)( + :bar, (1012...1015), nil, ParametersNode(1016...1026)( @@ -1178,6 +1228,7 @@ ProgramNode(0...1194)( (1028...1031) ), DefNode(1033...1055)( + :bar, (1037...1040), nil, ParametersNode(1041...1050)( @@ -1214,6 +1265,7 @@ ProgramNode(0...1194)( (1052...1055) ), DefNode(1057...1082)( + :bar, (1061...1064), nil, ParametersNode(1065...1077)( @@ -1251,6 +1303,7 @@ ProgramNode(0...1194)( (1079...1082) ), DefNode(1084...1108)( + :bar, (1088...1091), nil, ParametersNode(1092...1103)( @@ -1288,6 +1341,7 @@ ProgramNode(0...1194)( (1105...1108) ), DefNode(1110...1133)( + :bar, (1114...1117), nil, ParametersNode(1118...1128)( @@ -1325,6 +1379,7 @@ ProgramNode(0...1194)( (1130...1133) ), DefNode(1135...1167)( + :method, (1139...1145), nil, ParametersNode(1146...1147)( @@ -1386,6 +1441,7 @@ ProgramNode(0...1194)( (1164...1167) ), DefNode(1169...1194)( + :foo, (1173...1176), nil, ParametersNode(1177...1189)( diff --git a/test/yarp/snapshots/non_alphanumeric_methods.txt b/test/yarp/snapshots/non_alphanumeric_methods.txt index cf87adc48c..a4cc39b6d3 100644 --- a/test/yarp/snapshots/non_alphanumeric_methods.txt +++ b/test/yarp/snapshots/non_alphanumeric_methods.txt @@ -2,6 +2,7 @@ ProgramNode(0...434)( [], StatementsNode(0...434)( [DefNode(0...9)( + :!, (4...5), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...434)( (6...9) ), DefNode(11...21)( + :!=, (15...17), nil, nil, @@ -28,6 +30,7 @@ ProgramNode(0...434)( (18...21) ), DefNode(23...33)( + :!~, (27...29), nil, nil, @@ -41,6 +44,7 @@ ProgramNode(0...434)( (30...33) ), DefNode(35...44)( + :%, (39...40), nil, nil, @@ -54,6 +58,7 @@ ProgramNode(0...434)( (41...44) ), DefNode(46...60)( + :+, (55...56), SelfNode(50...54)(), nil, @@ -67,6 +72,7 @@ ProgramNode(0...434)( (57...60) ), DefNode(62...71)( + :&, (66...67), nil, nil, @@ -80,6 +86,7 @@ ProgramNode(0...434)( (68...71) ), DefNode(73...82)( + :*, (77...78), nil, nil, @@ -93,6 +100,7 @@ ProgramNode(0...434)( (79...82) ), DefNode(84...94)( + :**, (88...90), nil, nil, @@ -107,6 +115,7 @@ ProgramNode(0...434)( ), StringNode(96...102)((96...98), (98...101), (101...102), "abc"), DefNode(104...117)( + :+, (108...109), nil, ParametersNode(110...113)( @@ -128,6 +137,7 @@ ProgramNode(0...434)( (114...117) ), DefNode(119...130)( + :+, (123...124), nil, nil, @@ -141,6 +151,7 @@ ProgramNode(0...434)( (127...130) ), DefNode(132...143)( + :+, (136...137), nil, ParametersNode(138...139)( @@ -162,6 +173,7 @@ ProgramNode(0...434)( (140...143) ), DefNode(145...159)( + :+, (154...155), SelfNode(149...153)(), nil, @@ -175,6 +187,7 @@ ProgramNode(0...434)( (156...159) ), DefNode(161...170)( + :+, (165...166), nil, nil, @@ -188,6 +201,7 @@ ProgramNode(0...434)( (167...170) ), DefNode(172...182)( + :+@, (176...178), nil, nil, @@ -201,6 +215,7 @@ ProgramNode(0...434)( (179...182) ), DefNode(184...193)( + :-, (188...189), nil, nil, @@ -214,6 +229,7 @@ ProgramNode(0...434)( (190...193) ), DefNode(195...206)( + :-, (201...202), CallNode(199...200)(nil, nil, (199...200), nil, nil, nil, nil, 2, "a"), nil, @@ -227,6 +243,7 @@ ProgramNode(0...434)( (203...206) ), DefNode(208...218)( + :-@, (212...214), nil, nil, @@ -240,6 +257,7 @@ ProgramNode(0...434)( (215...218) ), DefNode(220...229)( + :/, (224...225), nil, nil, @@ -253,6 +271,7 @@ ProgramNode(0...434)( (226...229) ), DefNode(231...240)( + :<, (235...236), nil, nil, @@ -266,6 +285,7 @@ ProgramNode(0...434)( (237...240) ), DefNode(242...252)( + :<<, (246...248), nil, nil, @@ -279,6 +299,7 @@ ProgramNode(0...434)( (249...252) ), DefNode(254...264)( + :<=, (258...260), nil, nil, @@ -292,6 +313,7 @@ ProgramNode(0...434)( (261...264) ), DefNode(266...277)( + :<=>, (270...273), nil, nil, @@ -305,6 +327,7 @@ ProgramNode(0...434)( (274...277) ), DefNode(279...289)( + :==, (283...285), nil, nil, @@ -318,6 +341,7 @@ ProgramNode(0...434)( (286...289) ), DefNode(291...302)( + :===, (295...298), nil, nil, @@ -331,6 +355,7 @@ ProgramNode(0...434)( (299...302) ), DefNode(304...314)( + :=~, (308...310), nil, nil, @@ -344,6 +369,7 @@ ProgramNode(0...434)( (311...314) ), DefNode(316...325)( + :>, (320...321), nil, nil, @@ -357,6 +383,7 @@ ProgramNode(0...434)( (322...325) ), DefNode(327...337)( + :>=, (331...333), nil, nil, @@ -370,6 +397,7 @@ ProgramNode(0...434)( (334...337) ), DefNode(339...349)( + :>>, (343...345), nil, nil, @@ -383,6 +411,7 @@ ProgramNode(0...434)( (346...349) ), DefNode(351...361)( + :[], (355...357), nil, nil, @@ -396,6 +425,7 @@ ProgramNode(0...434)( (358...361) ), DefNode(363...374)( + :[]=, (367...370), nil, nil, @@ -409,6 +439,7 @@ ProgramNode(0...434)( (371...374) ), DefNode(376...385)( + :^, (380...381), nil, nil, @@ -422,6 +453,7 @@ ProgramNode(0...434)( (382...385) ), DefNode(387...396)( + :`, (391...392), nil, nil, @@ -435,6 +467,7 @@ ProgramNode(0...434)( (393...396) ), DefNode(398...412)( + :`, (407...408), SelfNode(402...406)(), nil, @@ -448,6 +481,7 @@ ProgramNode(0...434)( (409...412) ), DefNode(414...423)( + :|, (418...419), nil, nil, @@ -461,6 +495,7 @@ ProgramNode(0...434)( (420...423) ), DefNode(425...434)( + :~, (429...430), nil, nil, diff --git a/test/yarp/snapshots/rescue.txt b/test/yarp/snapshots/rescue.txt index c52a261fce..9decb56292 100644 --- a/test/yarp/snapshots/rescue.txt +++ b/test/yarp/snapshots/rescue.txt @@ -227,6 +227,7 @@ ProgramNode(0...316)( (242...245) ), DefNode(247...291)( + :some_method, (251...262), nil, nil, @@ -258,6 +259,7 @@ ProgramNode(0...316)( nil ), DefNode(293...316)( + :a, (297...298), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt index d839450b2c..8c4c0ecc50 100644 --- a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt +++ b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt @@ -50,6 +50,7 @@ ProgramNode(0...689)( nil, StatementsNode(168...246)( [DefNode(168...246)( + :y, (177...178), SelfNode(172...176)(), ParametersNode(179...200)( @@ -125,6 +126,7 @@ ProgramNode(0...689)( nil, StatementsNode(417...480)( [DefNode(417...480)( + :y, (421...422), nil, ParametersNode(423...444)( diff --git a/test/yarp/snapshots/seattlerb/args_kw_block.txt b/test/yarp/snapshots/seattlerb/args_kw_block.txt index 3ccb747278..6aef28d170 100644 --- a/test/yarp/snapshots/seattlerb/args_kw_block.txt +++ b/test/yarp/snapshots/seattlerb/args_kw_block.txt @@ -2,6 +2,7 @@ ProgramNode(0...20)( [], StatementsNode(0...20)( [DefNode(0...20)( + :f, (4...5), nil, ParametersNode(6...14)( diff --git a/test/yarp/snapshots/seattlerb/block_arg__bare.txt b/test/yarp/snapshots/seattlerb/block_arg__bare.txt index c660aeb54e..2634a94099 100644 --- a/test/yarp/snapshots/seattlerb/block_arg__bare.txt +++ b/test/yarp/snapshots/seattlerb/block_arg__bare.txt @@ -2,6 +2,7 @@ ProgramNode(0...13)( [], StatementsNode(0...13)( [DefNode(0...13)( + :x, (4...5), nil, ParametersNode(6...7)( diff --git a/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt index 46b55171fa..79c6b347e5 100644 --- a/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt +++ b/test/yarp/snapshots/seattlerb/block_call_defn_call_block_call.txt @@ -8,6 +8,7 @@ ProgramNode(0...30)( nil, ArgumentsNode(2...18)( [DefNode(2...18)( + :b, (6...7), nil, ParametersNode(8...9)( diff --git a/test/yarp/snapshots/seattlerb/bug_187.txt b/test/yarp/snapshots/seattlerb/bug_187.txt index f4ca89ff6d..a62a9f30be 100644 --- a/test/yarp/snapshots/seattlerb/bug_187.txt +++ b/test/yarp/snapshots/seattlerb/bug_187.txt @@ -8,6 +8,7 @@ ProgramNode(0...28)( nil, ArgumentsNode(8...28)( [DefNode(8...28)( + :f, (12...13), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/bug_249.txt b/test/yarp/snapshots/seattlerb/bug_249.txt index 26e918c4f7..776132c6d2 100644 --- a/test/yarp/snapshots/seattlerb/bug_249.txt +++ b/test/yarp/snapshots/seattlerb/bug_249.txt @@ -22,6 +22,7 @@ ProgramNode(0...67)( nil, StatementsNode(20...38)( [DefNode(20...38)( + :initialize, (24...34), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt b/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt index 61193bb0a6..67934a28dc 100644 --- a/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt +++ b/test/yarp/snapshots/seattlerb/bug_call_arglist_parens.txt @@ -2,6 +2,7 @@ ProgramNode(6...94)( [], StatementsNode(6...94)( [DefNode(6...39)( + :f, (10...11), nil, nil, @@ -34,6 +35,7 @@ ProgramNode(6...94)( (36...39) ), DefNode(48...82)( + :f, (52...53), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/class_comments.txt b/test/yarp/snapshots/seattlerb/class_comments.txt index 85d9d91067..5314c70cc4 100644 --- a/test/yarp/snapshots/seattlerb/class_comments.txt +++ b/test/yarp/snapshots/seattlerb/class_comments.txt @@ -9,6 +9,7 @@ ProgramNode(19...71)( nil, StatementsNode(40...67)( [DefNode(40...67)( + :blah, (44...48), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt b/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt index 9f1f7980e8..207e45aab9 100644 --- a/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...29)( [], StatementsNode(0...29)( [DefNode(0...29)( + :call, (4...8), nil, ParametersNode(9...24)( diff --git a/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt index c3e8e7d010..908be09337 100644 --- a/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt +++ b/test/yarp/snapshots/seattlerb/defn_arg_forward_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...29)( [], StatementsNode(0...29)( [DefNode(0...29)( + :a, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt index c14a1868ed..bdb721f2d2 100644 --- a/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt +++ b/test/yarp/snapshots/seattlerb/defn_args_forward_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...41)( [], StatementsNode(0...41)( [DefNode(0...41)( + :a, (4...5), nil, ParametersNode(6...18)( diff --git a/test/yarp/snapshots/seattlerb/defn_comments.txt b/test/yarp/snapshots/seattlerb/defn_comments.txt index 1ff1c127bd..a9b5501204 100644 --- a/test/yarp/snapshots/seattlerb/defn_comments.txt +++ b/test/yarp/snapshots/seattlerb/defn_comments.txt @@ -2,6 +2,7 @@ ProgramNode(19...31)( [], StatementsNode(19...31)( [DefNode(19...31)( + :blah, (23...27), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_endless_command.txt b/test/yarp/snapshots/seattlerb/defn_endless_command.txt index 7e1989cf6f..4e88338080 100644 --- a/test/yarp/snapshots/seattlerb/defn_endless_command.txt +++ b/test/yarp/snapshots/seattlerb/defn_endless_command.txt @@ -2,6 +2,7 @@ ProgramNode(0...33)( [], StatementsNode(0...33)( [DefNode(0...33)( + :some_method, (4...15), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt b/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt index bed7b31b5a..30e99d44fe 100644 --- a/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt +++ b/test/yarp/snapshots/seattlerb/defn_endless_command_rescue.txt @@ -2,6 +2,7 @@ ProgramNode(0...43)( [], StatementsNode(0...43)( [DefNode(0...43)( + :some_method, (4...15), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_forward_args.txt b/test/yarp/snapshots/seattlerb/defn_forward_args.txt index 0fbe6f0d70..6b06726352 100644 --- a/test/yarp/snapshots/seattlerb/defn_forward_args.txt +++ b/test/yarp/snapshots/seattlerb/defn_forward_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :a, (4...5), nil, ParametersNode(6...9)( diff --git a/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt b/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt index 14d94bc244..b0a199c7bd 100644 --- a/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt +++ b/test/yarp/snapshots/seattlerb/defn_forward_args__no_parens.txt @@ -2,6 +2,7 @@ ProgramNode(0...22)( [], StatementsNode(0...22)( [DefNode(0...22)( + :f, (4...5), nil, ParametersNode(6...9)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt index 4364d66188..ec45e1790b 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt @@ -2,6 +2,7 @@ ProgramNode(0...45)( [], StatementsNode(0...45)( [DefNode(0...45)( + :test, (4...8), nil, ParametersNode(9...18)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt index 6a1abc0d20..aa90849328 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...24)( [], StatementsNode(0...24)( [DefNode(0...24)( + :f, (4...5), nil, ParametersNode(6...19)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt index 040bca4c5d..83e1bc2f23 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt @@ -2,6 +2,7 @@ ProgramNode(0...20)( [], StatementsNode(0...20)( [DefNode(0...20)( + :a, (4...5), nil, ParametersNode(6...15)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt index 080b3ed2ab..58930bb847 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt @@ -2,6 +2,7 @@ ProgramNode(0...19)( [], StatementsNode(0...19)( [DefNode(0...19)( + :a, (4...5), nil, ParametersNode(6...14)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt index e118d362a4..2e1afdea71 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt @@ -2,6 +2,7 @@ ProgramNode(0...26)( [], StatementsNode(0...26)( [DefNode(0...26)( + :fun, (4...7), nil, ParametersNode(8...16)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt index 27982d5cb8..c98e8317b6 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt @@ -2,6 +2,7 @@ ProgramNode(0...14)( [], StatementsNode(0...14)( [DefNode(0...14)( + :f, (4...5), nil, ParametersNode(6...10)( diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt index 2ae853d3f4..8a0be77d22 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :f, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt b/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt index a5046e04e4..a810609fbc 100644 --- a/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt +++ b/test/yarp/snapshots/seattlerb/defn_no_kwargs.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :x, (4...5), nil, ParametersNode(6...11)( diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner.txt b/test/yarp/snapshots/seattlerb/defn_oneliner.txt index 053400c564..1b1600dfed 100644 --- a/test/yarp/snapshots/seattlerb/defn_oneliner.txt +++ b/test/yarp/snapshots/seattlerb/defn_oneliner.txt @@ -2,6 +2,7 @@ ProgramNode(0...27)( [], StatementsNode(0...27)( [DefNode(0...27)( + :exec, (4...8), nil, ParametersNode(9...12)( diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt index b2d5981859..db923d773e 100644 --- a/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt +++ b/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt @@ -9,6 +9,7 @@ ProgramNode(0...28)( nil, StatementsNode(10...24)( [DefNode(10...24)( + :==, (14...16), nil, ParametersNode(17...18)( diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt index 683c405b18..2da92bf559 100644 --- a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt +++ b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :exec, (4...8), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt index bbf7fd2dca..b416121718 100644 --- a/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt +++ b/test/yarp/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt @@ -2,6 +2,7 @@ ProgramNode(0...19)( [], StatementsNode(0...19)( [DefNode(0...19)( + :exec, (4...8), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt index 5032c52203..0a1f6cbd93 100644 --- a/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt +++ b/test/yarp/snapshots/seattlerb/defn_oneliner_rescue.txt @@ -2,6 +2,7 @@ ProgramNode(0...130)( [], StatementsNode(0...130)( [DefNode(0...44)( + :exec, (4...8), nil, ParametersNode(9...12)( @@ -51,6 +52,7 @@ ProgramNode(0...130)( (41...44) ), DefNode(47...89)( + :exec, (51...55), nil, ParametersNode(56...59)( @@ -90,6 +92,7 @@ ProgramNode(0...130)( (86...89) ), DefNode(92...130)( + :exec, (96...100), nil, ParametersNode(101...104)( diff --git a/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt b/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt index d4064d0f34..b9fe1dcf52 100644 --- a/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_opt_last_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...21)( [], StatementsNode(0...21)( [DefNode(0...21)( + :m, (4...5), nil, ParametersNode(6...17)( diff --git a/test/yarp/snapshots/seattlerb/defn_opt_reg.txt b/test/yarp/snapshots/seattlerb/defn_opt_reg.txt index 5796adf1e9..0ae5037d59 100644 --- a/test/yarp/snapshots/seattlerb/defn_opt_reg.txt +++ b/test/yarp/snapshots/seattlerb/defn_opt_reg.txt @@ -2,6 +2,7 @@ ProgramNode(0...19)( [], StatementsNode(0...19)( [DefNode(0...19)( + :f, (4...5), nil, ParametersNode(6...14)( diff --git a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt index 5ce355141d..2148a93df5 100644 --- a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...24)( [], StatementsNode(0...24)( [DefNode(0...24)( + :f, (4...5), nil, ParametersNode(7...19)( diff --git a/test/yarp/snapshots/seattlerb/defn_powarg.txt b/test/yarp/snapshots/seattlerb/defn_powarg.txt index 6965fca97e..b57aa3c9c7 100644 --- a/test/yarp/snapshots/seattlerb/defn_powarg.txt +++ b/test/yarp/snapshots/seattlerb/defn_powarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :f, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt b/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt index c7e9c64087..ee789ca0ae 100644 --- a/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt +++ b/test/yarp/snapshots/seattlerb/defn_reg_opt_reg.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :f, (4...5), nil, ParametersNode(6...18)( diff --git a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_splat_arg.txt index 63e8839a6c..95a16a11b5 100644 --- a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_splat_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...15)( [], StatementsNode(0...15)( [DefNode(0...15)( + :f, (4...5), nil, ParametersNode(6...10)( diff --git a/test/yarp/snapshots/seattlerb/defn_unary_not.txt b/test/yarp/snapshots/seattlerb/defn_unary_not.txt index 9fbee1764f..e167c2aee9 100644 --- a/test/yarp/snapshots/seattlerb/defn_unary_not.txt +++ b/test/yarp/snapshots/seattlerb/defn_unary_not.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :"!@", (4...6), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/defns_reserved.txt b/test/yarp/snapshots/seattlerb/defns_reserved.txt index 07b165898e..7d12edeb9b 100644 --- a/test/yarp/snapshots/seattlerb/defns_reserved.txt +++ b/test/yarp/snapshots/seattlerb/defns_reserved.txt @@ -2,6 +2,7 @@ ProgramNode(0...20)( [], StatementsNode(0...20)( [DefNode(0...20)( + :return, (9...15), SelfNode(4...8)(), nil, diff --git a/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt index d223e06913..5474d1e825 100644 --- a/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt +++ b/test/yarp/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt @@ -8,6 +8,7 @@ ProgramNode(0...30)( nil, ArgumentsNode(2...30)( [DefNode(2...30)( + :b, (11...12), SelfNode(6...10)(), nil, diff --git a/test/yarp/snapshots/seattlerb/defs_comments.txt b/test/yarp/snapshots/seattlerb/defs_comments.txt index 55a3054373..640576684b 100644 --- a/test/yarp/snapshots/seattlerb/defs_comments.txt +++ b/test/yarp/snapshots/seattlerb/defs_comments.txt @@ -2,6 +2,7 @@ ProgramNode(19...36)( [], StatementsNode(19...36)( [DefNode(19...36)( + :blah, (28...32), SelfNode(23...27)(), nil, diff --git a/test/yarp/snapshots/seattlerb/defs_endless_command.txt b/test/yarp/snapshots/seattlerb/defs_endless_command.txt index 3675f26ddf..068e7de9b3 100644 --- a/test/yarp/snapshots/seattlerb/defs_endless_command.txt +++ b/test/yarp/snapshots/seattlerb/defs_endless_command.txt @@ -2,6 +2,7 @@ ProgramNode(0...35)( [], StatementsNode(0...35)( [DefNode(0...35)( + :some_method, (6...17), CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"), nil, diff --git a/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt b/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt index e032fff9a6..00b4472689 100644 --- a/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt +++ b/test/yarp/snapshots/seattlerb/defs_endless_command_rescue.txt @@ -2,6 +2,7 @@ ProgramNode(0...45)( [], StatementsNode(0...45)( [DefNode(0...45)( + :some_method, (6...17), CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"), nil, diff --git a/test/yarp/snapshots/seattlerb/defs_kwarg.txt b/test/yarp/snapshots/seattlerb/defs_kwarg.txt index d7288bc1e0..6b1e60d602 100644 --- a/test/yarp/snapshots/seattlerb/defs_kwarg.txt +++ b/test/yarp/snapshots/seattlerb/defs_kwarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...19)( [], StatementsNode(0...19)( [DefNode(0...19)( + :a, (9...10), SelfNode(4...8)(), ParametersNode(11...15)( diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner.txt b/test/yarp/snapshots/seattlerb/defs_oneliner.txt index 60ea01092f..f8214ef3f6 100644 --- a/test/yarp/snapshots/seattlerb/defs_oneliner.txt +++ b/test/yarp/snapshots/seattlerb/defs_oneliner.txt @@ -2,6 +2,7 @@ ProgramNode(0...32)( [], StatementsNode(0...32)( [DefNode(0...32)( + :exec, (9...13), SelfNode(4...8)(), ParametersNode(14...17)( diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt index cebb94c32f..ee69fa0752 100644 --- a/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt +++ b/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt @@ -9,6 +9,7 @@ ProgramNode(0...33)( nil, StatementsNode(10...29)( [DefNode(10...29)( + :==, (19...21), SelfNode(14...18)(), ParametersNode(22...23)( diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt b/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt index 90269cc14a..9f510cdb72 100644 --- a/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt +++ b/test/yarp/snapshots/seattlerb/defs_oneliner_rescue.txt @@ -2,6 +2,7 @@ ProgramNode(0...145)( [], StatementsNode(0...145)( [DefNode(0...49)( + :exec, (9...13), SelfNode(4...8)(), ParametersNode(14...17)( @@ -51,6 +52,7 @@ ProgramNode(0...145)( (46...49) ), DefNode(52...99)( + :exec, (61...65), SelfNode(56...60)(), ParametersNode(66...69)( @@ -90,6 +92,7 @@ ProgramNode(0...145)( (96...99) ), DefNode(102...145)( + :exec, (111...115), SelfNode(106...110)(), ParametersNode(116...119)( diff --git a/test/yarp/snapshots/seattlerb/f_kw.txt b/test/yarp/snapshots/seattlerb/f_kw.txt index 420dab984d..053e093303 100644 --- a/test/yarp/snapshots/seattlerb/f_kw.txt +++ b/test/yarp/snapshots/seattlerb/f_kw.txt @@ -2,6 +2,7 @@ ProgramNode(0...15)( [], StatementsNode(0...15)( [DefNode(0...15)( + :x, (4...5), nil, ParametersNode(6...10)( diff --git a/test/yarp/snapshots/seattlerb/f_kw__required.txt b/test/yarp/snapshots/seattlerb/f_kw__required.txt index 30cd82d52c..8f29a7a9c9 100644 --- a/test/yarp/snapshots/seattlerb/f_kw__required.txt +++ b/test/yarp/snapshots/seattlerb/f_kw__required.txt @@ -2,6 +2,7 @@ ProgramNode(0...13)( [], StatementsNode(0...13)( [DefNode(0...13)( + :x, (4...5), nil, ParametersNode(6...8)( diff --git a/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt b/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt index 2baa7bab0b..010fe79394 100644 --- a/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt +++ b/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt @@ -9,6 +9,7 @@ ProgramNode(18...90)( nil, StatementsNode(54...86)( [DefNode(54...86)( + :è, (63...65), SelfNode(58...62)(), nil, diff --git a/test/yarp/snapshots/seattlerb/module_comments.txt b/test/yarp/snapshots/seattlerb/module_comments.txt index 0a818d3116..a049665ce0 100644 --- a/test/yarp/snapshots/seattlerb/module_comments.txt +++ b/test/yarp/snapshots/seattlerb/module_comments.txt @@ -7,6 +7,7 @@ ProgramNode(24...77)( ConstantReadNode(31...32)(:X), StatementsNode(46...73)( [DefNode(46...73)( + :blah, (50...54), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/parse_def_special_name.txt b/test/yarp/snapshots/seattlerb/parse_def_special_name.txt index a266ddf094..0b6b0eae7f 100644 --- a/test/yarp/snapshots/seattlerb/parse_def_special_name.txt +++ b/test/yarp/snapshots/seattlerb/parse_def_special_name.txt @@ -2,6 +2,7 @@ ProgramNode(0...13)( [], StatementsNode(0...13)( [DefNode(0...13)( + :next, (4...8), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt index 170b9bc81e..7e1ea50f46 100644 --- a/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt +++ b/test/yarp/snapshots/seattlerb/parse_line_defn_complex.txt @@ -2,6 +2,7 @@ ProgramNode(0...40)( [], StatementsNode(0...40)( [DefNode(0...40)( + :x, (4...5), nil, ParametersNode(6...7)( diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt index ff61047cbb..3bbc2bf9cd 100644 --- a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt +++ b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens.txt @@ -2,6 +2,7 @@ ProgramNode(0...21)( [], StatementsNode(0...21)( [DefNode(0...10)( + :f, (4...5), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...21)( (7...10) ), DefNode(12...21)( + :f, (16...17), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt index eec5acfcd7..2040cdca68 100644 --- a/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt +++ b/test/yarp/snapshots/seattlerb/parse_line_defn_no_parens_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...11)( [], StatementsNode(0...11)( [DefNode(0...11)( + :f, (4...5), nil, ParametersNode(6...7)( diff --git a/test/yarp/snapshots/seattlerb/parse_line_return.txt b/test/yarp/snapshots/seattlerb/parse_line_return.txt index 17ba7af0a5..8701647435 100644 --- a/test/yarp/snapshots/seattlerb/parse_line_return.txt +++ b/test/yarp/snapshots/seattlerb/parse_line_return.txt @@ -2,6 +2,7 @@ ProgramNode(6...77)( [], StatementsNode(6...77)( [DefNode(6...77)( + :blah, (10...14), nil, nil, diff --git a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt index 3f95094fef..942400bfa1 100644 --- a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt +++ b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt @@ -2,6 +2,7 @@ ProgramNode(0...16)( [], StatementsNode(0...16)( [DefNode(0...16)( + :x, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/unparser/corpus/literal/class.txt b/test/yarp/snapshots/unparser/corpus/literal/class.txt index 4d8b705623..5d0ca9da7b 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/class.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/class.txt @@ -134,6 +134,7 @@ ProgramNode(0...213)( "include" ), DefNode(172...194)( + :foo, (176...179), nil, nil, diff --git a/test/yarp/snapshots/unparser/corpus/literal/def.txt b/test/yarp/snapshots/unparser/corpus/literal/def.txt index d78d9623ba..9bb03d20f2 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/def.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/def.txt @@ -2,6 +2,7 @@ ProgramNode(0...913)( [], StatementsNode(0...913)( [DefNode(0...46)( + :foo, (4...7), nil, nil, @@ -75,6 +76,7 @@ ProgramNode(0...913)( (43...46) ), DefNode(48...103)( + :foo, (52...55), nil, nil, @@ -172,6 +174,7 @@ ProgramNode(0...913)( (100...103) ), DefNode(105...128)( + :foo, (109...112), nil, ParametersNode(113...123)( @@ -194,6 +197,7 @@ ProgramNode(0...913)( (125...128) ), DefNode(130...141)( + :foo, (134...137), nil, nil, @@ -207,6 +211,7 @@ ProgramNode(0...913)( (138...141) ), DefNode(143...160)( + :foo, (147...150), nil, nil, @@ -232,6 +237,7 @@ ProgramNode(0...913)( (157...160) ), DefNode(162...205)( + :foo, (166...169), nil, nil, @@ -299,6 +305,7 @@ ProgramNode(0...913)( (202...205) ), DefNode(207...237)( + :foo, (211...214), nil, nil, @@ -347,6 +354,7 @@ ProgramNode(0...913)( (234...237) ), DefNode(239...269)( + :foo, (243...246), nil, nil, @@ -398,6 +406,7 @@ ProgramNode(0...913)( (266...269) ), DefNode(271...293)( + :foo, (275...278), nil, ParametersNode(279...282)( @@ -419,6 +428,7 @@ ProgramNode(0...913)( (290...293) ), DefNode(295...322)( + :foo, (299...302), nil, ParametersNode(303...311)( @@ -441,6 +451,7 @@ ProgramNode(0...913)( (319...322) ), DefNode(324...351)( + :foo, (328...331), nil, ParametersNode(332...340)( @@ -467,6 +478,7 @@ ProgramNode(0...913)( (348...351) ), DefNode(353...382)( + :foo, (357...360), nil, ParametersNode(361...377)( @@ -510,6 +522,7 @@ ProgramNode(0...913)( (379...382) ), DefNode(384...413)( + :foo, (388...391), nil, ParametersNode(392...402)( @@ -536,6 +549,7 @@ ProgramNode(0...913)( (410...413) ), DefNode(415...449)( + :foo, (419...422), nil, ParametersNode(423...438)( @@ -562,6 +576,7 @@ ProgramNode(0...913)( (446...449) ), DefNode(451...470)( + :foo, (455...458), nil, ParametersNode(459...465)( @@ -587,6 +602,7 @@ ProgramNode(0...913)( (467...470) ), DefNode(472...493)( + :foo, (476...479), nil, ParametersNode(480...488)( @@ -622,6 +638,7 @@ ProgramNode(0...913)( (490...493) ), DefNode(495...518)( + :foo, (499...502), nil, ParametersNode(503...513)( @@ -657,6 +674,7 @@ ProgramNode(0...913)( (515...518) ), DefNode(520...540)( + :foo, (524...527), nil, ParametersNode(528...529)( @@ -690,6 +708,7 @@ ProgramNode(0...913)( (537...540) ), DefNode(542...565)( + :foo, (546...549), nil, ParametersNode(550...554)( @@ -711,6 +730,7 @@ ProgramNode(0...913)( (562...565) ), DefNode(567...595)( + :foo, (571...574), nil, ParametersNode(575...584)( @@ -732,6 +752,7 @@ ProgramNode(0...913)( (592...595) ), DefNode(597...632)( + :foo, (601...604), nil, ParametersNode(605...621)( @@ -770,6 +791,7 @@ ProgramNode(0...913)( (629...632) ), DefNode(634...677)( + :foo, (638...641), nil, ParametersNode(642...666)( @@ -808,6 +830,7 @@ ProgramNode(0...913)( (674...677) ), DefNode(679...719)( + :foo, (683...686), nil, ParametersNode(687...708)( @@ -834,6 +857,7 @@ ProgramNode(0...913)( (716...719) ), DefNode(721...746)( + :foo, (725...728), nil, ParametersNode(729...735)( @@ -867,6 +891,7 @@ ProgramNode(0...913)( (743...746) ), DefNode(748...778)( + :foo, (752...755), nil, ParametersNode(756...767)( @@ -888,6 +913,7 @@ ProgramNode(0...913)( (775...778) ), DefNode(780...803)( + :foo, (784...787), nil, nil, @@ -924,6 +950,7 @@ ProgramNode(0...913)( (800...803) ), DefNode(805...821)( + :f, (809...810), nil, ParametersNode(811...816)( @@ -953,6 +980,7 @@ ProgramNode(0...913)( (818...821) ), DefNode(823...854)( + :foo, (827...830), nil, ParametersNode(831...849)( @@ -984,6 +1012,7 @@ ProgramNode(0...913)( (851...854) ), DefNode(856...896)( + :f, (860...861), nil, nil, @@ -1005,6 +1034,7 @@ ProgramNode(0...913)( (893...896) ), DefNode(898...913)( + :f, (902...903), nil, nil, diff --git a/test/yarp/snapshots/unparser/corpus/literal/defs.txt b/test/yarp/snapshots/unparser/corpus/literal/defs.txt index 0d18f430af..fdc08dcc59 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/defs.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/defs.txt @@ -2,6 +2,7 @@ ProgramNode(0...266)( [], StatementsNode(0...266)( [DefNode(0...16)( + :foo, (9...12), SelfNode(4...8)(), nil, @@ -15,6 +16,7 @@ ProgramNode(0...266)( (13...16) ), DefNode(18...40)( + :foo, (27...30), SelfNode(22...26)(), nil, @@ -30,6 +32,7 @@ ProgramNode(0...266)( (37...40) ), DefNode(42...70)( + :foo, (51...54), SelfNode(46...50)(), nil, @@ -46,6 +49,7 @@ ProgramNode(0...266)( (67...70) ), DefNode(72...93)( + :bar, (80...83), ConstantReadNode(76...79)(:Foo), nil, @@ -61,6 +65,7 @@ ProgramNode(0...266)( (90...93) ), DefNode(95...128)( + :bar, (115...118), ParenthesesNode(99...114)( CallNode(100...113)( @@ -119,6 +124,7 @@ ProgramNode(0...266)( (125...128) ), DefNode(130...156)( + :bar, (143...146), ParenthesesNode(134...142)( CallNode(135...141)( @@ -158,6 +164,7 @@ ProgramNode(0...266)( (153...156) ), DefNode(158...190)( + :bar, (177...180), ParenthesesNode(162...176)( CallNode(163...175)( @@ -201,6 +208,7 @@ ProgramNode(0...266)( (187...190) ), DefNode(192...220)( + :bar, (207...210), ParenthesesNode(196...206)( ConstantPathNode(197...205)( @@ -234,6 +242,7 @@ ProgramNode(0...266)( (217...220) ), DefNode(222...243)( + :bar, (230...233), ConstantReadNode(226...229)(:Foo), nil, @@ -259,6 +268,7 @@ ProgramNode(0...266)( (240...243) ), DefNode(245...266)( + :bar, (253...256), CallNode(249...252)( nil, diff --git a/test/yarp/snapshots/unparser/corpus/literal/module.txt b/test/yarp/snapshots/unparser/corpus/literal/module.txt index e9b4470d6f..355b57ac53 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/module.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/module.txt @@ -66,6 +66,7 @@ ProgramNode(0...106)( "include" ), DefNode(80...102)( + :foo, (84...87), nil, nil, diff --git a/test/yarp/snapshots/unparser/corpus/literal/send.txt b/test/yarp/snapshots/unparser/corpus/literal/send.txt index cc3f23beed..67f3222a0e 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/send.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/send.txt @@ -128,6 +128,7 @@ ProgramNode(0...999)( ParenthesesNode(133...152)( StatementsNode(134...151)( [DefNode(134...145)( + :foo, (138...141), nil, nil, @@ -234,6 +235,7 @@ ProgramNode(0...999)( ), CallNode(218...238)( DefNode(218...234)( + :foo, (227...230), SelfNode(222...226)(), nil, @@ -257,6 +259,7 @@ ProgramNode(0...999)( ), CallNode(239...254)( DefNode(239...250)( + :foo, (243...246), nil, nil, diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/31.txt b/test/yarp/snapshots/unparser/corpus/literal/since/31.txt index f21bf30e04..c5f903bbeb 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/since/31.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/since/31.txt @@ -2,6 +2,7 @@ ProgramNode(0...51)( [], StatementsNode(0...51)( [DefNode(0...23)( + :foo, (4...7), nil, ParametersNode(8...9)( @@ -37,6 +38,7 @@ ProgramNode(0...51)( (20...23) ), DefNode(25...51)( + :foo, (29...32), nil, ParametersNode(33...37)( diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt index eeae33beb7..b6335ced86 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt @@ -2,6 +2,7 @@ ProgramNode(0...90)( [], StatementsNode(0...90)( [DefNode(0...45)( + :foo, (4...7), nil, ParametersNode(8...20)( @@ -40,6 +41,7 @@ ProgramNode(0...90)( (42...45) ), DefNode(47...90)( + :foo, (51...54), nil, ParametersNode(55...66)( diff --git a/test/yarp/snapshots/unparser/corpus/literal/while.txt b/test/yarp/snapshots/unparser/corpus/literal/while.txt index 6d90f45539..f6dc399041 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/while.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/while.txt @@ -67,6 +67,7 @@ ProgramNode(0...620)( :A ), DefNode(70...110)( + :foo, (74...77), nil, nil, diff --git a/test/yarp/snapshots/unparser/corpus/semantic/def.txt b/test/yarp/snapshots/unparser/corpus/semantic/def.txt index 46c69936a4..428b7138cb 100644 --- a/test/yarp/snapshots/unparser/corpus/semantic/def.txt +++ b/test/yarp/snapshots/unparser/corpus/semantic/def.txt @@ -2,6 +2,7 @@ ProgramNode(0...55)( [], StatementsNode(0...55)( [DefNode(0...21)( + :foo, (4...7), nil, nil, @@ -55,6 +56,7 @@ ProgramNode(0...55)( (18...21) ), DefNode(23...55)( + :foo, (27...30), nil, nil, diff --git a/test/yarp/snapshots/while.txt b/test/yarp/snapshots/while.txt index aeb0fc9b0d..078df5066c 100644 --- a/test/yarp/snapshots/while.txt +++ b/test/yarp/snapshots/while.txt @@ -72,6 +72,7 @@ ProgramNode(0...314)( (111...116), (158...161), DefNode(117...149)( + :foo, (126...129), SelfNode(121...125)(), ParametersNode(130...144)( diff --git a/test/yarp/snapshots/whitequark/anonymous_blockarg.txt b/test/yarp/snapshots/whitequark/anonymous_blockarg.txt index d5c7ef56dd..af34a92864 100644 --- a/test/yarp/snapshots/whitequark/anonymous_blockarg.txt +++ b/test/yarp/snapshots/whitequark/anonymous_blockarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :foo, (4...7), nil, ParametersNode(8...9)( diff --git a/test/yarp/snapshots/whitequark/arg.txt b/test/yarp/snapshots/whitequark/arg.txt index 403c382cb7..037d3eb070 100644 --- a/test/yarp/snapshots/whitequark/arg.txt +++ b/test/yarp/snapshots/whitequark/arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...37)( [], StatementsNode(0...37)( [DefNode(0...15)( + :f, (4...5), nil, ParametersNode(6...9)( @@ -23,6 +24,7 @@ ProgramNode(0...37)( (12...15) ), DefNode(17...37)( + :f, (21...22), nil, ParametersNode(23...31)( diff --git a/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt b/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt index 5c88c71d50..304ca36eba 100644 --- a/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt +++ b/test/yarp/snapshots/whitequark/arg_duplicate_ignored.txt @@ -2,6 +2,7 @@ ProgramNode(0...40)( [], StatementsNode(0...40)( [DefNode(0...18)( + :foo, (4...7), nil, ParametersNode(8...12)( @@ -24,6 +25,7 @@ ProgramNode(0...40)( (15...18) ), DefNode(20...40)( + :foo, (24...27), nil, ParametersNode(28...34)( diff --git a/test/yarp/snapshots/whitequark/arg_label.txt b/test/yarp/snapshots/whitequark/arg_label.txt index cfa55d0124..40014d7289 100644 --- a/test/yarp/snapshots/whitequark/arg_label.txt +++ b/test/yarp/snapshots/whitequark/arg_label.txt @@ -2,6 +2,7 @@ ProgramNode(0...49)( [], StatementsNode(0...49)( [DefNode(0...16)( + :foo, (4...7), nil, nil, @@ -29,6 +30,7 @@ ProgramNode(0...49)( (13...16) ), DefNode(18...35)( + :foo, (22...25), nil, nil, diff --git a/test/yarp/snapshots/whitequark/args.txt b/test/yarp/snapshots/whitequark/args.txt index 21764cccc2..7ee971121e 100644 --- a/test/yarp/snapshots/whitequark/args.txt +++ b/test/yarp/snapshots/whitequark/args.txt @@ -2,6 +2,7 @@ ProgramNode(0...690)( [], StatementsNode(0...690)( [DefNode(0...13)( + :f, (4...5), nil, ParametersNode(6...8)( @@ -23,6 +24,7 @@ ProgramNode(0...690)( (10...13) ), DefNode(15...33)( + :f, (19...20), nil, ParametersNode(22...27)( @@ -52,6 +54,7 @@ ProgramNode(0...690)( (30...33) ), DefNode(35...51)( + :f, (39...40), nil, ParametersNode(42...45)( @@ -77,6 +80,7 @@ ProgramNode(0...690)( (48...51) ), DefNode(53...72)( + :f, (57...58), nil, ParametersNode(60...66)( @@ -103,6 +107,7 @@ ProgramNode(0...690)( (69...72) ), DefNode(74...91)( + :f, (78...79), nil, ParametersNode(81...85)( @@ -131,6 +136,7 @@ ProgramNode(0...690)( (88...91) ), DefNode(93...113)( + :f, (97...98), nil, ParametersNode(100...107)( @@ -160,6 +166,7 @@ ProgramNode(0...690)( (110...113) ), DefNode(115...134)( + :f, (119...120), nil, ParametersNode(122...128)( @@ -186,6 +193,7 @@ ProgramNode(0...690)( (131...134) ), DefNode(136...158)( + :f, (140...141), nil, ParametersNode(143...152)( @@ -213,6 +221,7 @@ ProgramNode(0...690)( (155...158) ), DefNode(160...180)( + :f, (164...165), nil, ParametersNode(167...174)( @@ -242,6 +251,7 @@ ProgramNode(0...690)( (177...180) ), DefNode(182...205)( + :f, (186...187), nil, ParametersNode(189...199)( @@ -272,6 +282,7 @@ ProgramNode(0...690)( (202...205) ), DefNode(207...227)( + :f, (211...212), nil, ParametersNode(214...221)( @@ -298,6 +309,7 @@ ProgramNode(0...690)( (224...227) ), DefNode(229...252)( + :f, (233...234), nil, ParametersNode(236...246)( @@ -323,6 +335,7 @@ ProgramNode(0...690)( (249...252) ), DefNode(254...292)( + :f, (258...259), nil, ParametersNode(261...286)( @@ -353,6 +366,7 @@ ProgramNode(0...690)( (289...292) ), DefNode(294...314)( + :f, (298...299), nil, ParametersNode(300...309)( @@ -374,6 +388,7 @@ ProgramNode(0...690)( (311...314) ), DefNode(316...332)( + :f, (320...321), nil, ParametersNode(322...327)( @@ -395,6 +410,7 @@ ProgramNode(0...690)( (329...332) ), DefNode(334...351)( + :f, (338...339), nil, ParametersNode(340...346)( @@ -416,6 +432,7 @@ ProgramNode(0...690)( (348...351) ), DefNode(353...373)( + :f, (357...358), nil, ParametersNode(359...368)( @@ -437,6 +454,7 @@ ProgramNode(0...690)( (370...373) ), DefNode(375...386)( + :f, (379...380), nil, nil, @@ -450,6 +468,7 @@ ProgramNode(0...690)( (383...386) ), DefNode(388...404)( + :f, (392...393), nil, ParametersNode(394...399)( @@ -471,6 +490,7 @@ ProgramNode(0...690)( (401...404) ), DefNode(406...426)( + :f, (410...411), nil, ParametersNode(412...421)( @@ -492,6 +512,7 @@ ProgramNode(0...690)( (423...426) ), DefNode(428...451)( + :f, (432...433), nil, ParametersNode(434...446)( @@ -513,6 +534,7 @@ ProgramNode(0...690)( (448...451) ), DefNode(453...474)( + :f, (457...458), nil, ParametersNode(459...469)( @@ -539,6 +561,7 @@ ProgramNode(0...690)( (471...474) ), DefNode(476...501)( + :f, (480...481), nil, ParametersNode(482...496)( @@ -565,6 +588,7 @@ ProgramNode(0...690)( (498...501) ), DefNode(503...531)( + :f, (507...508), nil, ParametersNode(509...526)( @@ -591,6 +615,7 @@ ProgramNode(0...690)( (528...531) ), DefNode(533...557)( + :f, (537...538), nil, ParametersNode(539...552)( @@ -617,6 +642,7 @@ ProgramNode(0...690)( (554...557) ), DefNode(559...575)( + :f, (563...564), nil, ParametersNode(565...569)( @@ -638,6 +664,7 @@ ProgramNode(0...690)( (572...575) ), DefNode(577...596)( + :f, (581...582), nil, ParametersNode(583...590)( @@ -663,6 +690,7 @@ ProgramNode(0...690)( (593...596) ), DefNode(598...616)( + :f, (602...603), nil, ParametersNode(604...611)( @@ -689,6 +717,7 @@ ProgramNode(0...690)( (613...616) ), DefNode(618...640)( + :f, (622...623), nil, ParametersNode(624...635)( @@ -715,6 +744,7 @@ ProgramNode(0...690)( (637...640) ), DefNode(642...667)( + :f, (646...647), nil, ParametersNode(648...662)( @@ -741,6 +771,7 @@ ProgramNode(0...690)( (664...667) ), DefNode(669...690)( + :f, (673...674), nil, ParametersNode(675...685)( diff --git a/test/yarp/snapshots/whitequark/blockarg.txt b/test/yarp/snapshots/whitequark/blockarg.txt index 4e31eac3d8..67e1db44df 100644 --- a/test/yarp/snapshots/whitequark/blockarg.txt +++ b/test/yarp/snapshots/whitequark/blockarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...18)( [], StatementsNode(0...18)( [DefNode(0...18)( + :f, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/whitequark/bug_481.txt b/test/yarp/snapshots/whitequark/bug_481.txt index 1bd74e1235..5bdeaf1d47 100644 --- a/test/yarp/snapshots/whitequark/bug_481.txt +++ b/test/yarp/snapshots/whitequark/bug_481.txt @@ -8,6 +8,7 @@ ProgramNode(0...28)( nil, ArgumentsNode(2...14)( [DefNode(2...14)( + :x, (6...7), nil, nil, diff --git a/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt b/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt index 12efa14109..24159031ce 100644 --- a/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt +++ b/test/yarp/snapshots/whitequark/bug_def_no_paren_eql_begin.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :foo, (4...7), nil, nil, diff --git a/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt b/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt index 555819dfbd..70ce5db09b 100644 --- a/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt +++ b/test/yarp/snapshots/whitequark/bug_do_block_in_call_args.txt @@ -8,6 +8,7 @@ ProgramNode(0...33)( nil, ArgumentsNode(4...33)( [DefNode(4...33)( + :foo, (8...11), nil, nil, diff --git a/test/yarp/snapshots/whitequark/const_op_asgn.txt b/test/yarp/snapshots/whitequark/const_op_asgn.txt index d417c5d1c9..1b17733415 100644 --- a/test/yarp/snapshots/whitequark/const_op_asgn.txt +++ b/test/yarp/snapshots/whitequark/const_op_asgn.txt @@ -25,6 +25,7 @@ ProgramNode(0...77)( :+ ), DefNode(29...50)( + :x, (33...34), nil, nil, @@ -48,6 +49,7 @@ ProgramNode(0...77)( (47...50) ), DefNode(52...77)( + :x, (56...57), nil, nil, diff --git a/test/yarp/snapshots/whitequark/def.txt b/test/yarp/snapshots/whitequark/def.txt index f745476533..383b2a666c 100644 --- a/test/yarp/snapshots/whitequark/def.txt +++ b/test/yarp/snapshots/whitequark/def.txt @@ -2,6 +2,7 @@ ProgramNode(0...93)( [], StatementsNode(0...93)( [DefNode(0...14)( + :BEGIN, (4...9), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...93)( (11...14) ), DefNode(16...28)( + :END, (20...23), nil, nil, @@ -28,6 +30,7 @@ ProgramNode(0...93)( (25...28) ), DefNode(30...45)( + :String, (34...40), nil, nil, @@ -41,6 +44,7 @@ ProgramNode(0...93)( (42...45) ), DefNode(47...63)( + :String=, (51...58), nil, nil, @@ -54,6 +58,7 @@ ProgramNode(0...93)( (60...63) ), DefNode(65...77)( + :foo, (69...72), nil, nil, @@ -67,6 +72,7 @@ ProgramNode(0...93)( (74...77) ), DefNode(79...93)( + :until, (83...88), nil, nil, diff --git a/test/yarp/snapshots/whitequark/defs.txt b/test/yarp/snapshots/whitequark/defs.txt index 372edbfdcd..6072d21645 100644 --- a/test/yarp/snapshots/whitequark/defs.txt +++ b/test/yarp/snapshots/whitequark/defs.txt @@ -2,6 +2,7 @@ ProgramNode(0...100)( [], StatementsNode(0...100)( [DefNode(0...18)( + :foo, (10...13), ParenthesesNode(4...9)( CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"), @@ -19,6 +20,7 @@ ProgramNode(0...100)( (15...18) ), DefNode(20...39)( + :foo, (31...34), ConstantReadNode(24...30)(:String), nil, @@ -32,6 +34,7 @@ ProgramNode(0...100)( (36...39) ), DefNode(41...61)( + :foo, (53...56), ConstantReadNode(45...51)(:String), nil, @@ -45,6 +48,7 @@ ProgramNode(0...100)( (58...61) ), DefNode(63...80)( + :foo, (72...75), SelfNode(67...71)(), nil, @@ -58,6 +62,7 @@ ProgramNode(0...100)( (77...80) ), DefNode(82...100)( + :foo, (92...95), SelfNode(86...90)(), nil, diff --git a/test/yarp/snapshots/whitequark/endless_comparison_method.txt b/test/yarp/snapshots/whitequark/endless_comparison_method.txt index fa83705659..b0d3b33aca 100644 --- a/test/yarp/snapshots/whitequark/endless_comparison_method.txt +++ b/test/yarp/snapshots/whitequark/endless_comparison_method.txt @@ -2,6 +2,7 @@ ProgramNode(0...179)( [], StatementsNode(0...179)( [DefNode(0...28)( + :!=, (4...6), nil, ParametersNode(7...12)( @@ -35,6 +36,7 @@ ProgramNode(0...179)( nil ), DefNode(30...58)( + :!=, (34...36), nil, ParametersNode(37...42)( @@ -68,6 +70,7 @@ ProgramNode(0...179)( nil ), DefNode(60...88)( + :<=, (64...66), nil, ParametersNode(67...72)( @@ -101,6 +104,7 @@ ProgramNode(0...179)( nil ), DefNode(90...118)( + :==, (94...96), nil, ParametersNode(97...102)( @@ -134,6 +138,7 @@ ProgramNode(0...179)( nil ), DefNode(120...149)( + :===, (124...127), nil, ParametersNode(128...133)( @@ -167,6 +172,7 @@ ProgramNode(0...179)( nil ), DefNode(151...179)( + :>=, (155...157), nil, ParametersNode(158...163)( diff --git a/test/yarp/snapshots/whitequark/endless_method.txt b/test/yarp/snapshots/whitequark/endless_method.txt index a80e6b57db..c81dd69456 100644 --- a/test/yarp/snapshots/whitequark/endless_method.txt +++ b/test/yarp/snapshots/whitequark/endless_method.txt @@ -2,6 +2,7 @@ ProgramNode(0...78)( [], StatementsNode(0...78)( [DefNode(0...14)( + :foo, (4...7), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...78)( nil ), DefNode(16...34)( + :inc, (20...23), nil, ParametersNode(24...25)( @@ -48,6 +50,7 @@ ProgramNode(0...78)( nil ), DefNode(36...54)( + :foo, (44...47), CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "obj"), nil, @@ -61,6 +64,7 @@ ProgramNode(0...78)( nil ), DefNode(56...78)( + :inc, (64...67), CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 2, "obj"), ParametersNode(68...69)( diff --git a/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt b/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt index 33c64edfed..3015996dde 100644 --- a/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt +++ b/test/yarp/snapshots/whitequark/endless_method_command_syntax.txt @@ -2,6 +2,7 @@ ProgramNode(0...278)( [], StatementsNode(0...278)( [DefNode(0...22)( + :foo, (4...7), nil, nil, @@ -29,6 +30,7 @@ ProgramNode(0...278)( nil ), DefNode(24...48)( + :foo, (28...31), nil, nil, @@ -56,6 +58,7 @@ ProgramNode(0...278)( nil ), DefNode(50...69)( + :foo, (54...57), nil, ParametersNode(58...59)( @@ -89,6 +92,7 @@ ProgramNode(0...278)( nil ), DefNode(71...97)( + :foo, (79...82), CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 2, "obj"), nil, @@ -116,6 +120,7 @@ ProgramNode(0...278)( nil ), DefNode(99...127)( + :foo, (107...110), CallNode(103...106)( nil, @@ -158,6 +163,7 @@ ProgramNode(0...278)( nil ), DefNode(129...152)( + :foo, (137...140), CallNode(133...136)( nil, @@ -203,6 +209,7 @@ ProgramNode(0...278)( nil ), DefNode(154...214)( + :rescued, (158...165), nil, ParametersNode(166...167)( @@ -258,6 +265,7 @@ ProgramNode(0...278)( nil ), DefNode(216...278)( + :rescued, (225...232), SelfNode(220...224)(), ParametersNode(233...234)( diff --git a/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt b/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt index 87c50ca846..c60263dc9a 100644 --- a/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt +++ b/test/yarp/snapshots/whitequark/endless_method_forwarded_args_legacy.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :foo, (4...7), nil, ParametersNode(8...11)( diff --git a/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt b/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt index ac757efdbb..3f77cf8c23 100644 --- a/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt +++ b/test/yarp/snapshots/whitequark/endless_method_with_rescue_mod.txt @@ -2,6 +2,7 @@ ProgramNode(0...47)( [], StatementsNode(0...47)( [DefNode(0...20)( + :m, (4...5), nil, nil, @@ -21,6 +22,7 @@ ProgramNode(0...47)( nil ), DefNode(22...47)( + :m, (31...32), SelfNode(26...30)(), nil, diff --git a/test/yarp/snapshots/whitequark/endless_method_without_args.txt b/test/yarp/snapshots/whitequark/endless_method_without_args.txt index 778c2b595b..7287c14cd8 100644 --- a/test/yarp/snapshots/whitequark/endless_method_without_args.txt +++ b/test/yarp/snapshots/whitequark/endless_method_without_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...86)( [], StatementsNode(0...86)( [DefNode(0...12)( + :foo, (4...7), nil, nil, @@ -15,6 +16,7 @@ ProgramNode(0...86)( nil ), DefNode(14...37)( + :foo, (18...21), nil, nil, @@ -34,6 +36,7 @@ ProgramNode(0...86)( nil ), DefNode(39...56)( + :foo, (48...51), SelfNode(43...47)(), nil, @@ -47,6 +50,7 @@ ProgramNode(0...86)( nil ), DefNode(58...86)( + :foo, (67...70), SelfNode(62...66)(), nil, diff --git a/test/yarp/snapshots/whitequark/forward_arg.txt b/test/yarp/snapshots/whitequark/forward_arg.txt index 449db10831..896555a27e 100644 --- a/test/yarp/snapshots/whitequark/forward_arg.txt +++ b/test/yarp/snapshots/whitequark/forward_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...27)( [], StatementsNode(0...27)( [DefNode(0...27)( + :foo, (4...7), nil, ParametersNode(8...11)( diff --git a/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt b/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt index 55352e9d70..e4ebb2d950 100644 --- a/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt +++ b/test/yarp/snapshots/whitequark/forward_arg_with_open_args.txt @@ -4,6 +4,7 @@ ProgramNode(0...292)( [ParenthesesNode(0...28)( StatementsNode(1...27)( [DefNode(1...27)( + :foo, (5...8), nil, ParametersNode(9...12)( @@ -43,6 +44,7 @@ ProgramNode(0...292)( ParenthesesNode(30...58)( StatementsNode(31...57)( [DefNode(31...57)( + :foo, (35...38), nil, ParametersNode(39...42)( @@ -80,6 +82,7 @@ ProgramNode(0...292)( (57...58) ), DefNode(60...75)( + :foo, (64...67), nil, ParametersNode(68...71)( @@ -101,6 +104,7 @@ ProgramNode(0...292)( (72...75) ), DefNode(77...103)( + :foo, (81...84), nil, ParametersNode(85...88)( @@ -134,6 +138,7 @@ ProgramNode(0...292)( (100...103) ), DefNode(105...134)( + :foo, (109...112), nil, ParametersNode(113...119)( @@ -167,6 +172,7 @@ ProgramNode(0...292)( (131...134) ), DefNode(136...165)( + :foo, (140...143), nil, ParametersNode(144...150)( @@ -200,6 +206,7 @@ ProgramNode(0...292)( (162...165) ), DefNode(167...192)( + :foo, (171...174), nil, ParametersNode(175...188)( @@ -226,6 +233,7 @@ ProgramNode(0...292)( (189...192) ), DefNode(194...227)( + :foo, (198...201), nil, ParametersNode(202...212)( @@ -264,6 +272,7 @@ ProgramNode(0...292)( (224...227) ), DefNode(229...262)( + :foo, (233...236), nil, ParametersNode(237...247)( @@ -302,6 +311,7 @@ ProgramNode(0...292)( (259...262) ), DefNode(264...292)( + :foo, (268...271), nil, ParametersNode(272...278)( diff --git a/test/yarp/snapshots/whitequark/forward_args_legacy.txt b/test/yarp/snapshots/whitequark/forward_args_legacy.txt index eeaf4f1d53..39b5cdbbaf 100644 --- a/test/yarp/snapshots/whitequark/forward_args_legacy.txt +++ b/test/yarp/snapshots/whitequark/forward_args_legacy.txt @@ -2,6 +2,7 @@ ProgramNode(0...77)( [], StatementsNode(0...77)( [DefNode(0...27)( + :foo, (4...7), nil, ParametersNode(8...11)( @@ -35,6 +36,7 @@ ProgramNode(0...77)( (24...27) ), DefNode(29...46)( + :foo, (33...36), nil, ParametersNode(37...40)( @@ -56,6 +58,7 @@ ProgramNode(0...77)( (43...46) ), DefNode(48...77)( + :foo, (52...55), nil, ParametersNode(56...59)( diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt index da165e8e71..9008112a49 100644 --- a/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...45)( [], StatementsNode(0...45)( [DefNode(0...45)( + :foo, (4...7), nil, ParametersNode(8...20)( diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt index d2ef199933..842def39c5 100644 --- a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...43)( [], StatementsNode(0...43)( [DefNode(0...43)( + :foo, (4...7), nil, ParametersNode(8...19)( diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt index 51d8720fe6..264c73a6c3 100644 --- a/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...25)( [], StatementsNode(0...25)( [DefNode(0...25)( + :foo, (4...7), nil, ParametersNode(8...10)( diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt index e0d078128b..aa815fce8e 100644 --- a/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...41)( [], StatementsNode(0...41)( [DefNode(0...41)( + :foo, (4...7), nil, ParametersNode(8...10)( diff --git a/test/yarp/snapshots/whitequark/forwarded_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_restarg.txt index 485032d487..40384fce94 100644 --- a/test/yarp/snapshots/whitequark/forwarded_restarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_restarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...23)( [], StatementsNode(0...23)( [DefNode(0...23)( + :foo, (4...7), nil, ParametersNode(8...9)( diff --git a/test/yarp/snapshots/whitequark/kwarg.txt b/test/yarp/snapshots/whitequark/kwarg.txt index 9b605f5c5e..b63c7ac9f5 100644 --- a/test/yarp/snapshots/whitequark/kwarg.txt +++ b/test/yarp/snapshots/whitequark/kwarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...16)( [], StatementsNode(0...16)( [DefNode(0...16)( + :f, (4...5), nil, ParametersNode(6...10)( diff --git a/test/yarp/snapshots/whitequark/kwnilarg.txt b/test/yarp/snapshots/whitequark/kwnilarg.txt index 0995a597c2..402d0d3fb2 100644 --- a/test/yarp/snapshots/whitequark/kwnilarg.txt +++ b/test/yarp/snapshots/whitequark/kwnilarg.txt @@ -23,6 +23,7 @@ ProgramNode(0...46)( nil ), DefNode(14...31)( + :f, (18...19), nil, ParametersNode(20...25)( diff --git a/test/yarp/snapshots/whitequark/kwoptarg.txt b/test/yarp/snapshots/whitequark/kwoptarg.txt index effee043fa..06ad798523 100644 --- a/test/yarp/snapshots/whitequark/kwoptarg.txt +++ b/test/yarp/snapshots/whitequark/kwoptarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...18)( [], StatementsNode(0...18)( [DefNode(0...18)( + :f, (4...5), nil, ParametersNode(6...12)( diff --git a/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt b/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt index bd1c1e6e54..dfc20df0b4 100644 --- a/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt +++ b/test/yarp/snapshots/whitequark/kwoptarg_with_kwrestarg_and_forwarded_args.txt @@ -2,6 +2,7 @@ ProgramNode(0...28)( [], StatementsNode(0...28)( [DefNode(0...28)( + :f, (4...5), nil, ParametersNode(6...16)( diff --git a/test/yarp/snapshots/whitequark/kwrestarg_named.txt b/test/yarp/snapshots/whitequark/kwrestarg_named.txt index 2dd4c0225e..cf0086619f 100644 --- a/test/yarp/snapshots/whitequark/kwrestarg_named.txt +++ b/test/yarp/snapshots/whitequark/kwrestarg_named.txt @@ -2,6 +2,7 @@ ProgramNode(0...17)( [], StatementsNode(0...17)( [DefNode(0...17)( + :f, (4...5), nil, ParametersNode(6...11)( diff --git a/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt b/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt index 3fa1dcd7fe..e59e72c304 100644 --- a/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt +++ b/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt @@ -2,6 +2,7 @@ ProgramNode(0...14)( [], StatementsNode(0...14)( [DefNode(0...14)( + :f, (4...5), nil, ParametersNode(6...8)( diff --git a/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt b/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt index 3179d39b95..099ae93986 100644 --- a/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt +++ b/test/yarp/snapshots/whitequark/method_definition_in_while_cond.txt @@ -5,6 +5,7 @@ ProgramNode(0...190)( (0...5), (42...45), DefNode(6...33)( + :foo, (10...13), nil, ParametersNode(14...28)( @@ -47,6 +48,7 @@ ProgramNode(0...190)( (47...52), (86...89), DefNode(53...77)( + :foo, (57...60), nil, nil, @@ -78,6 +80,7 @@ ProgramNode(0...190)( (91...96), (138...141), DefNode(97...129)( + :foo, (106...109), SelfNode(101...105)(), ParametersNode(110...124)( @@ -120,6 +123,7 @@ ProgramNode(0...190)( (143...148), (187...190), DefNode(149...178)( + :foo, (158...161), SelfNode(153...157)(), nil, diff --git a/test/yarp/snapshots/whitequark/numparam_outside_block.txt b/test/yarp/snapshots/whitequark/numparam_outside_block.txt index 5b41378aa7..0dff33b0a9 100644 --- a/test/yarp/snapshots/whitequark/numparam_outside_block.txt +++ b/test/yarp/snapshots/whitequark/numparam_outside_block.txt @@ -25,6 +25,7 @@ ProgramNode(0...83)( :A ), DefNode(45...64)( + :m, (54...55), SelfNode(49...53)(), nil, diff --git a/test/yarp/snapshots/whitequark/optarg.txt b/test/yarp/snapshots/whitequark/optarg.txt index 2cbb681c61..f2a0dd2437 100644 --- a/test/yarp/snapshots/whitequark/optarg.txt +++ b/test/yarp/snapshots/whitequark/optarg.txt @@ -2,6 +2,7 @@ ProgramNode(0...44)( [], StatementsNode(0...44)( [DefNode(0...18)( + :f, (4...5), nil, ParametersNode(6...13)( @@ -28,6 +29,7 @@ ProgramNode(0...44)( (15...18) ), DefNode(20...44)( + :f, (24...25), nil, ParametersNode(26...38)( diff --git a/test/yarp/snapshots/whitequark/parser_bug_490.txt b/test/yarp/snapshots/whitequark/parser_bug_490.txt index a82c7d1bb7..5c087b60f6 100644 --- a/test/yarp/snapshots/whitequark/parser_bug_490.txt +++ b/test/yarp/snapshots/whitequark/parser_bug_490.txt @@ -2,6 +2,7 @@ ProgramNode(0...132)( [], StatementsNode(0...132)( [DefNode(0...39)( + :m, (4...5), nil, nil, @@ -31,6 +32,7 @@ ProgramNode(0...132)( (36...39) ), DefNode(41...85)( + :m, (45...46), nil, nil, @@ -64,6 +66,7 @@ ProgramNode(0...132)( (82...85) ), DefNode(87...132)( + :m, (91...92), nil, nil, diff --git a/test/yarp/snapshots/whitequark/restarg_named.txt b/test/yarp/snapshots/whitequark/restarg_named.txt index 9883a44ed6..d3eed889c6 100644 --- a/test/yarp/snapshots/whitequark/restarg_named.txt +++ b/test/yarp/snapshots/whitequark/restarg_named.txt @@ -2,6 +2,7 @@ ProgramNode(0...16)( [], StatementsNode(0...16)( [DefNode(0...16)( + :f, (4...5), nil, ParametersNode(6...10)( diff --git a/test/yarp/snapshots/whitequark/restarg_unnamed.txt b/test/yarp/snapshots/whitequark/restarg_unnamed.txt index 8f282e126a..a15f667603 100644 --- a/test/yarp/snapshots/whitequark/restarg_unnamed.txt +++ b/test/yarp/snapshots/whitequark/restarg_unnamed.txt @@ -2,6 +2,7 @@ ProgramNode(0...13)( [], StatementsNode(0...13)( [DefNode(0...13)( + :f, (4...5), nil, ParametersNode(6...7)( diff --git a/test/yarp/snapshots/whitequark/ruby_bug_12073.txt b/test/yarp/snapshots/whitequark/ruby_bug_12073.txt index 0688332fd3..29ac50831d 100644 --- a/test/yarp/snapshots/whitequark/ruby_bug_12073.txt +++ b/test/yarp/snapshots/whitequark/ruby_bug_12073.txt @@ -28,6 +28,7 @@ ProgramNode(0...49)( "a" ), DefNode(15...49)( + :foo, (19...22), nil, ParametersNode(23...28)( diff --git a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt b/test/yarp/snapshots/whitequark/ruby_bug_9669.txt index aad27053bb..c79fad9941 100644 --- a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt +++ b/test/yarp/snapshots/whitequark/ruby_bug_9669.txt @@ -2,6 +2,7 @@ ProgramNode(0...33)( [:o], StatementsNode(0...33)( [DefNode(0...19)( + :a, (4...5), nil, ParametersNode(6...8)( diff --git a/test/yarp/snapshots/whitequark/trailing_forward_arg.txt b/test/yarp/snapshots/whitequark/trailing_forward_arg.txt index 61f29acca5..f250529610 100644 --- a/test/yarp/snapshots/whitequark/trailing_forward_arg.txt +++ b/test/yarp/snapshots/whitequark/trailing_forward_arg.txt @@ -2,6 +2,7 @@ ProgramNode(0...40)( [], StatementsNode(0...40)( [DefNode(0...40)( + :foo, (4...7), nil, ParametersNode(8...17)( diff --git a/test/yarp/snapshots/whitequark/var_op_asgn.txt b/test/yarp/snapshots/whitequark/var_op_asgn.txt index 0927e8b8f3..48abb4ebf6 100644 --- a/test/yarp/snapshots/whitequark/var_op_asgn.txt +++ b/test/yarp/snapshots/whitequark/var_op_asgn.txt @@ -24,6 +24,7 @@ ProgramNode(0...53)( 0 ), DefNode(30...53)( + :a, (34...35), nil, nil, |