diff options
| author | Kevin Newton <kddnewton@gmail.com> | 2023-09-06 11:22:27 -0400 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-09-07 12:42:02 +0000 |
| commit | 9343ef250452c17b2842701805a4a0417165dd15 (patch) | |
| tree | 8f4a701db226bfc46c2818f9454e87f911b19384 /test | |
| parent | 3f78eec44ab2f06f05c699cbd90714716e13ebd7 (diff) | |
[ruby/yarp] Constants on rest parameter nodes
https://github.com/ruby/yarp/commit/a6fdb8aae9
Diffstat (limited to 'test')
37 files changed, 75 insertions, 75 deletions
diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb index f4f3eab12f..adaac44b35 100644 --- a/test/yarp/errors_test.rb +++ b/test/yarp/errors_test.rb @@ -1047,7 +1047,7 @@ module YARP expected = DefNode( Location(), nil, - ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], RestParameterNode(Location(), Location()), [], nil, nil), + ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], RestParameterNode(:a, Location(), Location()), [], nil, nil), nil, [:a, :b], Location(), @@ -1101,7 +1101,7 @@ module YARP expected = DefNode( Location(), nil, - ParametersNode([], [OptionalParameterNode(:a, Location(), Location(), IntegerNode())], [RequiredParameterNode(:b)], RestParameterNode(Location(), Location()), [], nil, nil), + ParametersNode([], [OptionalParameterNode(:a, Location(), Location(), IntegerNode())], [RequiredParameterNode(:b)], RestParameterNode(:c, Location(), Location()), [], nil, nil), nil, [:a, :b, :c], Location(), diff --git a/test/yarp/snapshots/blocks.txt b/test/yarp/snapshots/blocks.txt index 54a8d6f743..b23965960a 100644 --- a/test/yarp/snapshots/blocks.txt +++ b/test/yarp/snapshots/blocks.txt @@ -604,7 +604,7 @@ ProgramNode(0...402)( [RequiredParameterNode(393...396)(:bar)], [], [], - RestParameterNode(396...397)((396...397), nil), + RestParameterNode(396...397)(nil, nil, (396...397)), [], nil, nil diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt index ae808aba0d..72fb1a704a 100644 --- a/test/yarp/snapshots/methods.txt +++ b/test/yarp/snapshots/methods.txt @@ -549,7 +549,7 @@ ProgramNode(0...1194)( [], [], [], - RestParameterNode(509...511)((509...510), (510...511)), + RestParameterNode(509...511)(:b, (510...511), (509...510)), [], nil, nil @@ -570,7 +570,7 @@ ProgramNode(0...1194)( [], [], [], - RestParameterNode(523...524)((523...524), nil), + RestParameterNode(523...524)(nil, nil, (523...524)), [], nil, nil @@ -740,7 +740,7 @@ ProgramNode(0...1194)( [], [], [], - RestParameterNode(693...694)((693...694), nil), + RestParameterNode(693...694)(nil, nil, (693...694)), [], nil, nil diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt index 3f6f1d7470..fca9ccb710 100644 --- a/test/yarp/snapshots/procs.txt +++ b/test/yarp/snapshots/procs.txt @@ -116,7 +116,7 @@ ProgramNode(0...266)( IntegerNode(142...143)() )], [], - RestParameterNode(145...147)((145...146), (146...147)), + RestParameterNode(145...147)(:c, (146...147), (145...146)), [KeywordParameterNode(149...151)(:d, (149...151), nil), KeywordParameterNode(153...155)(:e, (153...155), nil)], KeywordRestParameterNode(157...160)(:f, (159...160), (157...159)), @@ -143,7 +143,7 @@ ProgramNode(0...266)( IntegerNode(184...185)() )], [], - RestParameterNode(187...189)((187...188), (188...189)), + RestParameterNode(187...189)(:c, (188...189), (187...188)), [KeywordParameterNode(191...193)(:d, (191...193), nil), KeywordParameterNode(195...197)(:e, (195...197), nil)], KeywordRestParameterNode(199...202)(:f, (201...202), (199...201)), @@ -227,7 +227,7 @@ ProgramNode(0...266)( )], [], [], - RestParameterNode(259...261)((259...260), (260...261)), + RestParameterNode(259...261)(:c, (260...261), (259...260)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt index 096a00092d..28e355ebe5 100644 --- a/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt +++ b/test/yarp/snapshots/seattlerb/block_arg_opt_splat.txt @@ -20,7 +20,7 @@ ProgramNode(0...20)( IntegerNode(12...13)() )], [], - RestParameterNode(15...17)((15...16), (16...17)), + RestParameterNode(15...17)(:d, (16...17), (15...16)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt index dc7500ce92..2bfb380f06 100644 --- a/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt +++ b/test/yarp/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt @@ -20,7 +20,7 @@ ProgramNode(0...25)( IntegerNode(10...11)() )], [RequiredParameterNode(17...18)(:e)], - RestParameterNode(13...15)((13...14), (14...15)), + RestParameterNode(13...15)(:d, (14...15), (13...14)), [], nil, BlockParameterNode(20...22)(:f, (21...22), (20...21)) diff --git a/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt b/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt index 01732f748e..bc2cb81b64 100644 --- a/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt +++ b/test/yarp/snapshots/seattlerb/block_arg_splat_arg.txt @@ -15,7 +15,7 @@ ProgramNode(0...16)( [RequiredParameterNode(5...6)(:b)], [], [RequiredParameterNode(12...13)(:d)], - RestParameterNode(8...10)((8...9), (9...10)), + RestParameterNode(8...10)(:c, (9...10), (8...9)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/block_opt_splat.txt b/test/yarp/snapshots/seattlerb/block_opt_splat.txt index 59b1a79e40..7e5aebff1b 100644 --- a/test/yarp/snapshots/seattlerb/block_opt_splat.txt +++ b/test/yarp/snapshots/seattlerb/block_opt_splat.txt @@ -20,7 +20,7 @@ ProgramNode(0...17)( IntegerNode(9...10)() )], [], - RestParameterNode(12...14)((12...13), (13...14)), + RestParameterNode(12...14)(:c, (13...14), (12...13)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt index 0efcade229..89ee3553bf 100644 --- a/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt +++ b/test/yarp/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt @@ -20,7 +20,7 @@ ProgramNode(0...22)( IntegerNode(7...8)() )], [RequiredParameterNode(14...15)(:d)], - RestParameterNode(10...12)((10...11), (11...12)), + RestParameterNode(10...12)(:c, (11...12), (10...11)), [], nil, BlockParameterNode(17...19)(:e, (18...19), (17...18)) diff --git a/test/yarp/snapshots/seattlerb/block_splat_reg.txt b/test/yarp/snapshots/seattlerb/block_splat_reg.txt index 85011bd781..b8d574b454 100644 --- a/test/yarp/snapshots/seattlerb/block_splat_reg.txt +++ b/test/yarp/snapshots/seattlerb/block_splat_reg.txt @@ -15,7 +15,7 @@ ProgramNode(0...13)( [], [], [RequiredParameterNode(9...10)(:c)], - RestParameterNode(5...7)((5...6), (6...7)), + RestParameterNode(5...7)(:b, (6...7), (5...6)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/bug236.txt b/test/yarp/snapshots/seattlerb/bug236.txt index bf6b429802..c83125b65f 100644 --- a/test/yarp/snapshots/seattlerb/bug236.txt +++ b/test/yarp/snapshots/seattlerb/bug236.txt @@ -15,7 +15,7 @@ ProgramNode(0...15)( [RequiredParameterNode(3...4)(:a)], [], [], - RestParameterNode(4...5)((4...5), nil), + RestParameterNode(4...5)(nil, nil, (4...5)), [], 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 6e7e9478f1..9f1f7980e8 100644 --- a/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_arg_asplat_arg.txt @@ -8,7 +8,7 @@ ProgramNode(0...29)( [RequiredParameterNode(9...15)(:interp)], [], [RequiredParameterNode(20...24)(:args)], - RestParameterNode(17...18)((17...18), nil), + RestParameterNode(17...18)(nil, nil, (17...18)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt index cd181b55b3..5ce355141d 100644 --- a/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_opt_splat_arg.txt @@ -13,7 +13,7 @@ ProgramNode(0...24)( IntegerNode(11...12)() )], [RequiredParameterNode(18...19)(:c)], - RestParameterNode(14...16)((14...15), (15...16)), + RestParameterNode(14...16)(:b, (15...16), (14...15)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt b/test/yarp/snapshots/seattlerb/defn_splat_arg.txt index 0fb8bb01c1..63e8839a6c 100644 --- a/test/yarp/snapshots/seattlerb/defn_splat_arg.txt +++ b/test/yarp/snapshots/seattlerb/defn_splat_arg.txt @@ -8,7 +8,7 @@ ProgramNode(0...15)( [], [], [RequiredParameterNode(9...10)(:a)], - RestParameterNode(6...7)((6...7), nil), + RestParameterNode(6...7)(nil, nil, (6...7)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/difficult3_2.txt b/test/yarp/snapshots/seattlerb/difficult3_2.txt index 3981937066..fffcbac8be 100644 --- a/test/yarp/snapshots/seattlerb/difficult3_2.txt +++ b/test/yarp/snapshots/seattlerb/difficult3_2.txt @@ -15,7 +15,7 @@ ProgramNode(0...13)( [], [], [RequiredParameterNode(9...10)(:b)], - RestParameterNode(5...7)((5...6), (6...7)), + RestParameterNode(5...7)(:a, (6...7), (5...6)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/difficult3_3.txt b/test/yarp/snapshots/seattlerb/difficult3_3.txt index 5b1e1ca29d..700f53cb67 100644 --- a/test/yarp/snapshots/seattlerb/difficult3_3.txt +++ b/test/yarp/snapshots/seattlerb/difficult3_3.txt @@ -15,7 +15,7 @@ ProgramNode(0...17)( [], [], [RequiredParameterNode(9...10)(:b)], - RestParameterNode(5...7)((5...6), (6...7)), + RestParameterNode(5...7)(:a, (6...7), (5...6)), [], nil, BlockParameterNode(12...14)(:c, (13...14), (12...13)) diff --git a/test/yarp/snapshots/seattlerb/iter_args_10_1.txt b/test/yarp/snapshots/seattlerb/iter_args_10_1.txt index 5da1b5260a..3086873b0d 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_10_1.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_10_1.txt @@ -20,7 +20,7 @@ ProgramNode(0...21)( IntegerNode(12...14)() )], [], - RestParameterNode(16...18)((16...17), (17...18)), + RestParameterNode(16...18)(:c, (17...18), (16...17)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/iter_args_10_2.txt b/test/yarp/snapshots/seattlerb/iter_args_10_2.txt index f847bcc031..1b6efea49f 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_10_2.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_10_2.txt @@ -20,7 +20,7 @@ ProgramNode(0...25)( IntegerNode(12...14)() )], [], - RestParameterNode(16...18)((16...17), (17...18)), + RestParameterNode(16...18)(:c, (17...18), (16...17)), [], nil, BlockParameterNode(20...22)(:d, (21...22), (20...21)) diff --git a/test/yarp/snapshots/seattlerb/iter_args_11_1.txt b/test/yarp/snapshots/seattlerb/iter_args_11_1.txt index 83f48569dc..4b2e76f116 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_11_1.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_11_1.txt @@ -20,7 +20,7 @@ ProgramNode(0...24)( IntegerNode(12...14)() )], [RequiredParameterNode(20...21)(:d)], - RestParameterNode(16...18)((16...17), (17...18)), + RestParameterNode(16...18)(:c, (17...18), (16...17)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/iter_args_11_2.txt b/test/yarp/snapshots/seattlerb/iter_args_11_2.txt index bfd864e20e..e9fa853130 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_11_2.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_11_2.txt @@ -20,7 +20,7 @@ ProgramNode(0...28)( IntegerNode(12...14)() )], [RequiredParameterNode(20...21)(:d)], - RestParameterNode(16...18)((16...17), (17...18)), + RestParameterNode(16...18)(:c, (17...18), (16...17)), [], nil, BlockParameterNode(23...25)(:e, (24...25), (23...24)) diff --git a/test/yarp/snapshots/seattlerb/iter_args_4.txt b/test/yarp/snapshots/seattlerb/iter_args_4.txt index eaa140a522..18671a1832 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_4.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_4.txt @@ -15,7 +15,7 @@ ProgramNode(0...16)( [RequiredParameterNode(5...6)(:a)], [], [RequiredParameterNode(12...13)(:c)], - RestParameterNode(8...10)((8...9), (9...10)), + RestParameterNode(8...10)(:b, (9...10), (8...9)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/iter_args_7_1.txt b/test/yarp/snapshots/seattlerb/iter_args_7_1.txt index ad285d8cad..8bfb90fc33 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_7_1.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_7_1.txt @@ -20,7 +20,7 @@ ProgramNode(0...18)( IntegerNode(9...11)() )], [], - RestParameterNode(13...15)((13...14), (14...15)), + RestParameterNode(13...15)(:b, (14...15), (13...14)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/iter_args_7_2.txt b/test/yarp/snapshots/seattlerb/iter_args_7_2.txt index 3ce974e279..21d217da22 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_7_2.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_7_2.txt @@ -20,7 +20,7 @@ ProgramNode(0...22)( IntegerNode(9...11)() )], [], - RestParameterNode(13...15)((13...14), (14...15)), + RestParameterNode(13...15)(:b, (14...15), (13...14)), [], nil, BlockParameterNode(17...19)(:c, (18...19), (17...18)) diff --git a/test/yarp/snapshots/seattlerb/iter_args_8_1.txt b/test/yarp/snapshots/seattlerb/iter_args_8_1.txt index 1a4ed0f599..6b94b67e0e 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_8_1.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_8_1.txt @@ -20,7 +20,7 @@ ProgramNode(0...21)( IntegerNode(9...11)() )], [RequiredParameterNode(17...18)(:c)], - RestParameterNode(13...15)((13...14), (14...15)), + RestParameterNode(13...15)(:b, (14...15), (13...14)), [], nil, nil diff --git a/test/yarp/snapshots/seattlerb/iter_args_8_2.txt b/test/yarp/snapshots/seattlerb/iter_args_8_2.txt index 8b2b3f2b85..f16d2fca9a 100644 --- a/test/yarp/snapshots/seattlerb/iter_args_8_2.txt +++ b/test/yarp/snapshots/seattlerb/iter_args_8_2.txt @@ -20,7 +20,7 @@ ProgramNode(0...25)( IntegerNode(9...11)() )], [RequiredParameterNode(17...18)(:c)], - RestParameterNode(13...15)((13...14), (14...15)), + RestParameterNode(13...15)(:b, (14...15), (13...14)), [], nil, BlockParameterNode(20...22)(:d, (21...22), (20...21)) diff --git a/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt index 4b16ebf090..fa7b9fe5a4 100644 --- a/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt +++ b/test/yarp/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt @@ -16,7 +16,7 @@ ProgramNode(0...23)( IntegerNode(8...9)() )], [RequiredParameterNode(15...16)(:e)], - RestParameterNode(11...13)((11...12), (12...13)), + RestParameterNode(11...13)(:d, (12...13), (11...12)), [], nil, BlockParameterNode(18...20)(:f, (19...20), (18...19)) diff --git a/test/yarp/snapshots/unparser/corpus/literal/block.txt b/test/yarp/snapshots/unparser/corpus/literal/block.txt index 514ce62760..43a1ead2e8 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/block.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/block.txt @@ -56,7 +56,7 @@ ProgramNode(0...737)( [RequiredParameterNode(27...28)(:a)], [], [], - RestParameterNode(28...29)((28...29), nil), + RestParameterNode(28...29)(nil, nil, (28...29)), [], nil, nil @@ -86,7 +86,7 @@ ProgramNode(0...737)( [RequiredParameterNode(40...41)(:a)], [], [], - RestParameterNode(41...42)((41...42), nil), + RestParameterNode(41...42)(nil, nil, (41...42)), [], nil, nil @@ -164,7 +164,7 @@ ProgramNode(0...737)( [RequiredParameterNode(88...89)(:a)], [], [], - RestParameterNode(91...93)((91...92), (92...93)), + RestParameterNode(91...93)(:b, (92...93), (91...92)), [], nil, nil @@ -194,7 +194,7 @@ ProgramNode(0...737)( [RequiredParameterNode(110...111)(:a)], [], [], - RestParameterNode(113...114)((113...114), nil), + RestParameterNode(113...114)(nil, nil, (113...114)), [], nil, nil @@ -321,7 +321,7 @@ ProgramNode(0...737)( [], [], [], - RestParameterNode(177...179)((177...178), (178...179)), + RestParameterNode(177...179)(:a, (178...179), (177...178)), [], nil, nil @@ -434,7 +434,7 @@ ProgramNode(0...737)( [], [], [], - RestParameterNode(237...238)((237...238), nil), + RestParameterNode(237...238)(nil, nil, (237...238)), [], nil, nil diff --git a/test/yarp/snapshots/unparser/corpus/literal/def.txt b/test/yarp/snapshots/unparser/corpus/literal/def.txt index d4def391b7..d78d9623ba 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/def.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/def.txt @@ -663,7 +663,7 @@ ProgramNode(0...913)( [], [], [], - RestParameterNode(528...529)((528...529), nil), + RestParameterNode(528...529)(nil, nil, (528...529)), [], nil, nil @@ -696,7 +696,7 @@ ProgramNode(0...913)( [], [], [], - RestParameterNode(550...554)((550...551), (551...554)), + RestParameterNode(550...554)(:bar, (551...554), (550...551)), [], nil, nil @@ -717,7 +717,7 @@ ProgramNode(0...913)( [RequiredParameterNode(575...578)(:bar)], [], [], - RestParameterNode(580...584)((580...581), (581...584)), + RestParameterNode(580...584)(:baz, (581...584), (580...581)), [], nil, nil @@ -743,7 +743,7 @@ ProgramNode(0...913)( TrueNode(611...615)() )], [], - RestParameterNode(617...621)((617...618), (618...621)), + RestParameterNode(617...621)(:bor, (618...621), (617...618)), [], nil, nil @@ -781,7 +781,7 @@ ProgramNode(0...913)( TrueNode(648...652)() )], [], - RestParameterNode(654...658)((654...655), (655...658)), + RestParameterNode(654...658)(:bor, (655...658), (654...655)), [], nil, BlockParameterNode(660...666)(:block, (661...666), (660...661)) @@ -819,7 +819,7 @@ ProgramNode(0...913)( TrueNode(698...702)() )], [], - RestParameterNode(704...708)((704...705), (705...708)), + RestParameterNode(704...708)(:bor, (705...708), (704...705)), [], nil, nil diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt index fd07f07237..eeae33beb7 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt @@ -46,7 +46,7 @@ ProgramNode(0...90)( [RequiredParameterNode(55...63)(:argument)], [], [], - RestParameterNode(65...66)((65...66), nil), + RestParameterNode(65...66)(nil, nil, (65...66)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/args.txt b/test/yarp/snapshots/whitequark/args.txt index 12d18fdaff..21764cccc2 100644 --- a/test/yarp/snapshots/whitequark/args.txt +++ b/test/yarp/snapshots/whitequark/args.txt @@ -380,7 +380,7 @@ ProgramNode(0...690)( [], [], [], - RestParameterNode(322...323)((322...323), nil), + RestParameterNode(322...323)(nil, nil, (322...323)), [], KeywordRestParameterNode(325...327)(nil, nil, (325...327)), nil @@ -401,7 +401,7 @@ ProgramNode(0...690)( [], [], [], - RestParameterNode(340...342)((340...341), (341...342)), + RestParameterNode(340...342)(:r, (341...342), (340...341)), [], nil, BlockParameterNode(344...346)(:b, (345...346), (344...345)) @@ -422,7 +422,7 @@ ProgramNode(0...690)( [], [], [RequiredParameterNode(363...364)(:p)], - RestParameterNode(359...361)((359...360), (360...361)), + RestParameterNode(359...361)(:r, (360...361), (359...360)), [], nil, BlockParameterNode(366...368)(:b, (367...368), (366...367)) @@ -477,7 +477,7 @@ ProgramNode(0...690)( [RequiredParameterNode(412...413)(:a)], [], [], - RestParameterNode(415...417)((415...416), (416...417)), + RestParameterNode(415...417)(:r, (416...417), (415...416)), [], nil, BlockParameterNode(419...421)(:b, (420...421), (419...420)) @@ -498,7 +498,7 @@ ProgramNode(0...690)( [RequiredParameterNode(434...435)(:a)], [], [RequiredParameterNode(441...442)(:p)], - RestParameterNode(437...439)((437...438), (438...439)), + RestParameterNode(437...439)(:r, (438...439), (437...438)), [], nil, BlockParameterNode(444...446)(:b, (445...446), (444...445)) @@ -550,7 +550,7 @@ ProgramNode(0...690)( IntegerNode(487...488)() )], [], - RestParameterNode(490...492)((490...491), (491...492)), + RestParameterNode(490...492)(:r, (491...492), (490...491)), [], nil, BlockParameterNode(494...496)(:b, (495...496), (494...495)) @@ -576,7 +576,7 @@ ProgramNode(0...690)( IntegerNode(514...515)() )], [RequiredParameterNode(521...522)(:p)], - RestParameterNode(517...519)((517...518), (518...519)), + RestParameterNode(517...519)(:r, (518...519), (517...518)), [], nil, BlockParameterNode(524...526)(:b, (525...526), (524...525)) @@ -700,7 +700,7 @@ ProgramNode(0...690)( IntegerNode(626...627)() )], [], - RestParameterNode(629...631)((629...630), (630...631)), + RestParameterNode(629...631)(:r, (630...631), (629...630)), [], nil, BlockParameterNode(633...635)(:b, (634...635), (633...634)) @@ -726,7 +726,7 @@ ProgramNode(0...690)( IntegerNode(650...651)() )], [RequiredParameterNode(657...658)(:p)], - RestParameterNode(653...655)((653...654), (654...655)), + RestParameterNode(653...655)(:r, (654...655), (653...654)), [], nil, BlockParameterNode(660...662)(:b, (661...662), (660...661)) diff --git a/test/yarp/snapshots/whitequark/blockargs.txt b/test/yarp/snapshots/whitequark/blockargs.txt index 4c51e4e1a8..dd0b942a29 100644 --- a/test/yarp/snapshots/whitequark/blockargs.txt +++ b/test/yarp/snapshots/whitequark/blockargs.txt @@ -103,7 +103,7 @@ ProgramNode(0...550)( [], [], [], - RestParameterNode(50...51)((50...51), nil), + RestParameterNode(50...51)(nil, nil, (50...51)), [], nil, BlockParameterNode(53...55)(:b, (54...55), (53...54)) @@ -133,7 +133,7 @@ ProgramNode(0...550)( [], [], [RequiredParameterNode(68...69)(:p)], - RestParameterNode(64...66)((64...65), (65...66)), + RestParameterNode(64...66)(:r, (65...66), (64...65)), [], nil, BlockParameterNode(71...73)(:b, (72...73), (71...72)) @@ -163,7 +163,7 @@ ProgramNode(0...550)( [], [], [], - RestParameterNode(82...84)((82...83), (83...84)), + RestParameterNode(82...84)(:s, (83...84), (82...83)), [], nil, BlockParameterNode(86...88)(:b, (87...88), (86...87)) @@ -193,7 +193,7 @@ ProgramNode(0...550)( [], [], [], - RestParameterNode(97...99)((97...98), (98...99)), + RestParameterNode(97...99)(:s, (98...99), (97...98)), [], nil, nil @@ -223,7 +223,7 @@ ProgramNode(0...550)( [], [], [], - RestParameterNode(108...109)((108...109), nil), + RestParameterNode(108...109)(nil, nil, (108...109)), [], nil, nil @@ -327,7 +327,7 @@ ProgramNode(0...550)( [RequiredParameterNode(156...157)(:a)], [], [], - RestParameterNode(159...160)((159...160), nil), + RestParameterNode(159...160)(nil, nil, (159...160)), [], nil, BlockParameterNode(162...164)(:b, (163...164), (162...163)) @@ -357,7 +357,7 @@ ProgramNode(0...550)( [RequiredParameterNode(173...174)(:a)], [], [RequiredParameterNode(180...181)(:p)], - RestParameterNode(176...178)((176...177), (177...178)), + RestParameterNode(176...178)(:r, (177...178), (176...177)), [], nil, BlockParameterNode(183...185)(:b, (184...185), (183...184)) @@ -387,7 +387,7 @@ ProgramNode(0...550)( [RequiredParameterNode(194...195)(:a)], [], [], - RestParameterNode(197...199)((197...198), (198...199)), + RestParameterNode(197...199)(:s, (198...199), (197...198)), [], nil, BlockParameterNode(201...203)(:b, (202...203), (201...202)) @@ -417,7 +417,7 @@ ProgramNode(0...550)( [RequiredParameterNode(212...213)(:a)], [], [], - RestParameterNode(215...217)((215...216), (216...217)), + RestParameterNode(215...217)(:s, (216...217), (215...216)), [], nil, nil @@ -447,7 +447,7 @@ ProgramNode(0...550)( [RequiredParameterNode(226...227)(:a)], [], [], - RestParameterNode(229...230)((229...230), nil), + RestParameterNode(229...230)(nil, nil, (229...230)), [], nil, nil @@ -478,7 +478,7 @@ ProgramNode(0...550)( RequiredParameterNode(242...243)(:b)], [], [], - RestParameterNode(243...244)((243...244), nil), + RestParameterNode(243...244)(nil, nil, (243...244)), [], nil, nil @@ -579,7 +579,7 @@ ProgramNode(0...550)( IntegerNode(290...291)() )], [RequiredParameterNode(297...298)(:p)], - RestParameterNode(293...295)((293...294), (294...295)), + RestParameterNode(293...295)(:r, (294...295), (293...294)), [], nil, BlockParameterNode(300...302)(:b, (301...302), (300...301)) @@ -620,7 +620,7 @@ ProgramNode(0...550)( IntegerNode(322...323)() )], [], - RestParameterNode(325...327)((325...326), (326...327)), + RestParameterNode(325...327)(:r, (326...327), (325...326)), [], nil, BlockParameterNode(329...331)(:b, (330...331), (329...330)) @@ -685,7 +685,7 @@ ProgramNode(0...550)( [RequiredParameterNode(362...363)(:a)], [], [], - RestParameterNode(363...364)((363...364), nil), + RestParameterNode(363...364)(nil, nil, (363...364)), [], nil, nil @@ -952,7 +952,7 @@ ProgramNode(0...550)( IntegerNode(487...488)() )], [], - RestParameterNode(490...492)((490...491), (491...492)), + RestParameterNode(490...492)(:r, (491...492), (490...491)), [], nil, BlockParameterNode(494...496)(:b, (495...496), (494...495)) @@ -987,7 +987,7 @@ ProgramNode(0...550)( IntegerNode(507...508)() )], [RequiredParameterNode(514...515)(:p)], - RestParameterNode(510...512)((510...511), (511...512)), + RestParameterNode(510...512)(:r, (511...512), (510...511)), [], nil, BlockParameterNode(517...519)(:b, (518...519), (517...518)) diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt index ff0602c398..d2ef199933 100644 --- a/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_argument_with_restarg.txt @@ -8,7 +8,7 @@ ProgramNode(0...43)( [RequiredParameterNode(8...16)(:argument)], [], [], - RestParameterNode(18...19)((18...19), nil), + RestParameterNode(18...19)(nil, nil, (18...19)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/forwarded_restarg.txt b/test/yarp/snapshots/whitequark/forwarded_restarg.txt index d45b60fc0a..485032d487 100644 --- a/test/yarp/snapshots/whitequark/forwarded_restarg.txt +++ b/test/yarp/snapshots/whitequark/forwarded_restarg.txt @@ -8,7 +8,7 @@ ProgramNode(0...23)( [], [], [], - RestParameterNode(8...9)((8...9), nil), + RestParameterNode(8...9)(nil, nil, (8...9)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/parser_bug_507.txt b/test/yarp/snapshots/whitequark/parser_bug_507.txt index f305b7daea..07e5d8ed60 100644 --- a/test/yarp/snapshots/whitequark/parser_bug_507.txt +++ b/test/yarp/snapshots/whitequark/parser_bug_507.txt @@ -15,7 +15,7 @@ ProgramNode(0...19)( [], [], [], - RestParameterNode(7...12)((7...8), (8...12)), + RestParameterNode(7...12)(:args, (8...12), (7...8)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/restarg_named.txt b/test/yarp/snapshots/whitequark/restarg_named.txt index ce26b2fc67..9883a44ed6 100644 --- a/test/yarp/snapshots/whitequark/restarg_named.txt +++ b/test/yarp/snapshots/whitequark/restarg_named.txt @@ -8,7 +8,7 @@ ProgramNode(0...16)( [], [], [], - RestParameterNode(6...10)((6...7), (7...10)), + RestParameterNode(6...10)(:foo, (7...10), (6...7)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/restarg_unnamed.txt b/test/yarp/snapshots/whitequark/restarg_unnamed.txt index b6778e293c..8f282e126a 100644 --- a/test/yarp/snapshots/whitequark/restarg_unnamed.txt +++ b/test/yarp/snapshots/whitequark/restarg_unnamed.txt @@ -8,7 +8,7 @@ ProgramNode(0...13)( [], [], [], - RestParameterNode(6...7)((6...7), nil), + RestParameterNode(6...7)(nil, nil, (6...7)), [], nil, nil diff --git a/test/yarp/snapshots/whitequark/send_lambda.txt b/test/yarp/snapshots/whitequark/send_lambda.txt index c30ec09249..52d1fb26a5 100644 --- a/test/yarp/snapshots/whitequark/send_lambda.txt +++ b/test/yarp/snapshots/whitequark/send_lambda.txt @@ -11,7 +11,7 @@ ProgramNode(0...26)( [], [], [], - RestParameterNode(3...4)((3...4), nil), + RestParameterNode(3...4)(nil, nil, (3...4)), [], nil, nil |