diff --git a/config.yml b/config.yml index 9515ef84ae3..73320c11181 100644 --- a/config.yml +++ b/config.yml @@ -1558,6 +1558,8 @@ nodes: ^^^^ - name: KeywordParameterNode fields: + - name: name + type: constant - name: name_loc type: location - name: value diff --git a/lib/yarp.rb b/lib/yarp.rb index 0dab1515fc3..bb855280c5d 100644 --- a/lib/yarp.rb +++ b/lib/yarp.rb @@ -542,8 +542,8 @@ def self.yarp_locals(source) *params.optionals.map(&:name), *((params.rest.name ? params.rest.name.to_sym : :*) if params.rest && params.rest.operator != ","), *params.posts.grep(RequiredParameterNode).map(&:name), - *params.keywords.reject(&:value).map { |param| param.name.chomp(":").to_sym }, - *params.keywords.select(&:value).map { |param| param.name.chomp(":").to_sym } + *params.keywords.reject(&:value).map(&:name), + *params.keywords.select(&:value).map(&:name) ] # TODO: When we get a ... parameter, we should be pushing * and & diff --git a/src/yarp.c b/src/yarp.c index cc572ad39a5..5607adc0018 100644 --- a/src/yarp.c +++ b/src/yarp.c @@ -3069,6 +3069,7 @@ yp_keyword_parameter_node_create(yp_parser_t *parser, const yp_token_t *name, yp .end = value == NULL ? name->end : value->location.end }, }, + .name = yp_parser_constant_id_location(parser, name->start, name->end - 1), .name_loc = YP_LOCATION_TOKEN_VALUE(name), .value = value }; diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb index 092141387fc..75effa0ed01 100644 --- a/test/yarp/errors_test.rb +++ b/test/yarp/errors_test.rb @@ -716,7 +716,7 @@ def test_keywords_parameters_before_required_parameters [], [RequiredParameterNode(:a)], nil, - [KeywordParameterNode(Location(), nil)], + [KeywordParameterNode(:b, Location(), nil)], nil, nil ), @@ -743,7 +743,7 @@ def test_rest_keywords_parameters_before_required_parameters [], [], nil, - [KeywordParameterNode(Location(), nil)], + [KeywordParameterNode(:b, Location(), nil)], KeywordRestParameterNode(Location(), Location()), nil ), @@ -790,7 +790,7 @@ def test_multiple_error_in_parameters_order [], [RequiredParameterNode(:a)], nil, - [KeywordParameterNode(Location(), nil)], + [KeywordParameterNode(:b, Location(), nil)], KeywordRestParameterNode(Location(), Location()), nil ), @@ -819,7 +819,7 @@ def test_switching_to_optional_arguments_twice [], [RequiredParameterNode(:a)], nil, - [KeywordParameterNode(Location(), nil)], + [KeywordParameterNode(:b, Location(), nil)], KeywordRestParameterNode(Location(), Location()), nil ), @@ -848,7 +848,7 @@ def test_switching_to_named_arguments_twice [], [RequiredParameterNode(:a)], nil, - [KeywordParameterNode(Location(), nil)], + [KeywordParameterNode(:b, Location(), nil)], KeywordRestParameterNode(Location(), Location()), nil ), diff --git a/test/yarp/snapshots/blocks.txt b/test/yarp/snapshots/blocks.txt index 4a2c3f7585e..54a8d6f743f 100644 --- a/test/yarp/snapshots/blocks.txt +++ b/test/yarp/snapshots/blocks.txt @@ -405,7 +405,7 @@ ProgramNode(0...402)( )], [], nil, - [KeywordParameterNode(270...272)((270...272), nil)], + [KeywordParameterNode(270...272)(:z, (270...272), nil)], nil, nil ), @@ -561,10 +561,12 @@ ProgramNode(0...402)( [], nil, [KeywordParameterNode(365...369)( + :a, (365...367), IntegerNode(368...369)() ), KeywordParameterNode(373...377)( + :b, (373...375), IntegerNode(376...377)() )], diff --git a/test/yarp/snapshots/lambda.txt b/test/yarp/snapshots/lambda.txt index 6640b585c32..01846d7c147 100644 --- a/test/yarp/snapshots/lambda.txt +++ b/test/yarp/snapshots/lambda.txt @@ -34,6 +34,7 @@ ProgramNode(0...92)( [], nil, [KeywordParameterNode(19...29)( + :x, (19...21), InterpolatedStringNode(22...29)( (22...23), @@ -79,6 +80,7 @@ ProgramNode(0...92)( [], nil, [KeywordParameterNode(39...47)( + :a, (39...41), CallNode(42...47)( CallNode(42...43)( @@ -159,6 +161,7 @@ ProgramNode(0...92)( [], nil, [KeywordParameterNode(77...85)( + :foo, (77...81), CallNode(82...85)( nil, diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt index 13a81d15cda..390522bae4d 100644 --- a/test/yarp/snapshots/methods.txt +++ b/test/yarp/snapshots/methods.txt @@ -218,7 +218,7 @@ ProgramNode(0...1194)( [], [], nil, - [KeywordParameterNode(212...214)((212...214), nil)], + [KeywordParameterNode(212...214)(:b, (212...214), nil)], nil, nil ), @@ -240,7 +240,7 @@ ProgramNode(0...1194)( [], [], nil, - [KeywordParameterNode(235...237)((235...237), nil)], + [KeywordParameterNode(235...237)(:b, (235...237), nil)], nil, nil ), @@ -359,8 +359,9 @@ ProgramNode(0...1194)( [], [], nil, - [KeywordParameterNode(333...335)((333...335), nil), + [KeywordParameterNode(333...335)(:b, (333...335), nil), KeywordParameterNode(337...341)( + :c, (337...339), IntegerNode(340...341)() )], @@ -384,8 +385,9 @@ ProgramNode(0...1194)( [], [], nil, - [KeywordParameterNode(353...355)((353...355), nil), + [KeywordParameterNode(353...355)(:b, (353...355), nil), KeywordParameterNode(357...361)( + :c, (357...359), IntegerNode(360...361)() )], @@ -410,10 +412,11 @@ ProgramNode(0...1194)( [], nil, [KeywordParameterNode(374...380)( + :b, (374...376), IntegerNode(379...380)() ), - KeywordParameterNode(382...384)((382...384), nil)], + KeywordParameterNode(382...384)(:c, (382...384), nil)], nil, nil ), @@ -1111,6 +1114,7 @@ ProgramNode(0...1194)( [], nil, [KeywordParameterNode(990...1001)( + :a, (990...992), ParenthesesNode(993...1001)( StatementsNode(994...1000)( @@ -1146,6 +1150,7 @@ ProgramNode(0...1194)( [], nil, [KeywordParameterNode(1016...1026)( + :a, (1016...1018), ParenthesesNode(1019...1026)( StatementsNode(1020...1025)( @@ -1181,6 +1186,7 @@ ProgramNode(0...1194)( [], nil, [KeywordParameterNode(1041...1050)( + :a, (1041...1043), ParenthesesNode(1044...1050)( StatementsNode(1045...1049)( diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt index 64ad900220f..e825afd8e46 100644 --- a/test/yarp/snapshots/procs.txt +++ b/test/yarp/snapshots/procs.txt @@ -90,8 +90,8 @@ ProgramNode(0...266)( )], [], nil, - [KeywordParameterNode(113...115)((113...115), nil), - KeywordParameterNode(117...119)((117...119), nil)], + [KeywordParameterNode(113...115)(:c, (113...115), nil), + KeywordParameterNode(117...119)(:d, (117...119), nil)], nil, BlockParameterNode(121...123)(:e, (122...123), (121...122)) ), @@ -117,8 +117,8 @@ ProgramNode(0...266)( )], [], RestParameterNode(145...147)((145...146), (146...147)), - [KeywordParameterNode(149...151)((149...151), nil), - KeywordParameterNode(153...155)((153...155), nil)], + [KeywordParameterNode(149...151)(:d, (149...151), nil), + KeywordParameterNode(153...155)(:e, (153...155), nil)], KeywordRestParameterNode(157...160)((157...159), (159...160)), BlockParameterNode(162...164)(:g, (163...164), (162...163)) ), @@ -144,8 +144,8 @@ ProgramNode(0...266)( )], [], RestParameterNode(187...189)((187...188), (188...189)), - [KeywordParameterNode(191...193)((191...193), nil), - KeywordParameterNode(195...197)((195...197), nil)], + [KeywordParameterNode(191...193)(:d, (191...193), nil), + KeywordParameterNode(195...197)(:e, (195...197), nil)], KeywordRestParameterNode(199...202)((199...201), (201...202)), BlockParameterNode(204...206)(:g, (205...206), (204...205)) ), diff --git a/test/yarp/snapshots/seattlerb/args_kw_block.txt b/test/yarp/snapshots/seattlerb/args_kw_block.txt index c11a1590702..3ccb7472787 100644 --- a/test/yarp/snapshots/seattlerb/args_kw_block.txt +++ b/test/yarp/snapshots/seattlerb/args_kw_block.txt @@ -9,7 +9,7 @@ ProgramNode(0...20)( [], [], nil, - [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())], + [KeywordParameterNode(6...10)(:a, (6...8), IntegerNode(9...10)())], nil, BlockParameterNode(12...14)(:b, (13...14), (12...13)) ), diff --git a/test/yarp/snapshots/seattlerb/block_kw.txt b/test/yarp/snapshots/seattlerb/block_kw.txt index b8f61d8e30a..32a518dc394 100644 --- a/test/yarp/snapshots/seattlerb/block_kw.txt +++ b/test/yarp/snapshots/seattlerb/block_kw.txt @@ -16,7 +16,11 @@ ProgramNode(0...15)( [], [], nil, - [KeywordParameterNode(8...12)((8...10), IntegerNode(10...12)())], + [KeywordParameterNode(8...12)( + :k, + (8...10), + IntegerNode(10...12)() + )], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/block_kw__required.txt b/test/yarp/snapshots/seattlerb/block_kw__required.txt index cb7b2912371..be6125fa1d8 100644 --- a/test/yarp/snapshots/seattlerb/block_kw__required.txt +++ b/test/yarp/snapshots/seattlerb/block_kw__required.txt @@ -16,7 +16,7 @@ ProgramNode(0...16)( [], [], nil, - [KeywordParameterNode(9...11)((9...11), nil)], + [KeywordParameterNode(9...11)(:k, (9...11), nil)], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt index dd1df1b7ad8..eb215151086 100644 --- a/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt +++ b/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt @@ -17,6 +17,7 @@ ProgramNode(0...20)( [], nil, [KeywordParameterNode(6...14)( + :kw, (6...9), SymbolNode(10...14)((10...11), (11...14), nil, "val") )], diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt index ae561f5de39..240ece6f706 100644 --- a/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt +++ b/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt @@ -17,10 +17,12 @@ ProgramNode(0...33)( [], nil, [KeywordParameterNode(6...14)( + :kw, (6...9), SymbolNode(10...14)((10...11), (11...14), nil, "val") ), KeywordParameterNode(16...26)( + :kw2, (16...20), SymbolNode(21...26)((21...22), (22...26), nil, "val2") )], diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt index 6dcd4aaf2bd..6a1abc0d205 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt @@ -9,8 +9,12 @@ ProgramNode(0...24)( [], [], nil, - [KeywordParameterNode(9...13)((9...11), IntegerNode(12...13)()), - KeywordParameterNode(15...19)((15...17), IntegerNode(18...19)())], + [KeywordParameterNode(9...13)(:b, (9...11), IntegerNode(12...13)()), + KeywordParameterNode(15...19)( + :c, + (15...17), + IntegerNode(18...19)() + )], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt index 5bc6490a6f6..bc4cb7d8a9f 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt @@ -9,7 +9,7 @@ ProgramNode(0...20)( [], [], nil, - [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())], + [KeywordParameterNode(6...10)(:b, (6...8), IntegerNode(9...10)())], KeywordRestParameterNode(12...15)((12...14), (14...15)), nil ), diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt index 3dfb42f6d75..009b3f0fcae 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt @@ -9,7 +9,7 @@ ProgramNode(0...19)( [], [], nil, - [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())], + [KeywordParameterNode(6...10)(:b, (6...8), IntegerNode(9...10)())], KeywordRestParameterNode(12...14)((12...14), nil), nil ), diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt index f4f6964c583..e118d362a49 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt @@ -10,6 +10,7 @@ ProgramNode(0...26)( [], nil, [KeywordParameterNode(8...16)( + :kw, (8...11), SymbolNode(12...16)((12...13), (13...16), nil, "val") )], diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt index b0649973acc..27982d5cb80 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt @@ -9,7 +9,7 @@ ProgramNode(0...14)( [], [], nil, - [KeywordParameterNode(6...10)((6...8), IntegerNode(9...10)())], + [KeywordParameterNode(6...10)(:a, (6...8), IntegerNode(9...10)())], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt index dfa99b70664..2ae853d3f4b 100644 --- a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt +++ b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt @@ -9,7 +9,7 @@ ProgramNode(0...17)( [], [], nil, - [KeywordParameterNode(9...12)((9...11), IntegerNode(11...12)())], + [KeywordParameterNode(9...12)(:b, (9...11), IntegerNode(11...12)())], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/defs_kwarg.txt b/test/yarp/snapshots/seattlerb/defs_kwarg.txt index 0309161b8e4..d7288bc1e05 100644 --- a/test/yarp/snapshots/seattlerb/defs_kwarg.txt +++ b/test/yarp/snapshots/seattlerb/defs_kwarg.txt @@ -9,7 +9,11 @@ ProgramNode(0...19)( [], [], nil, - [KeywordParameterNode(11...15)((11...13), IntegerNode(14...15)())], + [KeywordParameterNode(11...15)( + :b, + (11...13), + IntegerNode(14...15)() + )], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/f_kw.txt b/test/yarp/snapshots/seattlerb/f_kw.txt index ace0997f9e1..420dab984dc 100644 --- a/test/yarp/snapshots/seattlerb/f_kw.txt +++ b/test/yarp/snapshots/seattlerb/f_kw.txt @@ -9,7 +9,7 @@ ProgramNode(0...15)( [], [], nil, - [KeywordParameterNode(6...10)((6...8), IntegerNode(8...10)())], + [KeywordParameterNode(6...10)(:k, (6...8), IntegerNode(8...10)())], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/f_kw__required.txt b/test/yarp/snapshots/seattlerb/f_kw__required.txt index 38d564599ff..30cd82d52c6 100644 --- a/test/yarp/snapshots/seattlerb/f_kw__required.txt +++ b/test/yarp/snapshots/seattlerb/f_kw__required.txt @@ -9,7 +9,7 @@ ProgramNode(0...13)( [], [], nil, - [KeywordParameterNode(6...8)((6...8), nil)], + [KeywordParameterNode(6...8)(:k, (6...8), nil)], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg.txt b/test/yarp/snapshots/seattlerb/iter_kwarg.txt index a3984ee42f5..4dfc24209a4 100644 --- a/test/yarp/snapshots/seattlerb/iter_kwarg.txt +++ b/test/yarp/snapshots/seattlerb/iter_kwarg.txt @@ -16,7 +16,7 @@ ProgramNode(0...12)( [], [], nil, - [KeywordParameterNode(5...9)((5...7), IntegerNode(8...9)())], + [KeywordParameterNode(5...9)(:b, (5...7), IntegerNode(8...9)())], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt index 39dce0cca39..b068be0913a 100644 --- a/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt +++ b/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt @@ -16,7 +16,7 @@ ProgramNode(0...17)( [], [], nil, - [KeywordParameterNode(5...9)((5...7), IntegerNode(8...9)())], + [KeywordParameterNode(5...9)(:b, (5...7), IntegerNode(8...9)())], KeywordRestParameterNode(11...14)((11...13), (13...14)), nil ), diff --git a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt index 95cf0e279a7..3f95094fef4 100644 --- a/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt +++ b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt @@ -9,8 +9,8 @@ ProgramNode(0...16)( [], [], nil, - [KeywordParameterNode(6...8)((6...8), nil), - KeywordParameterNode(10...12)((10...12), nil)], + [KeywordParameterNode(6...8)(:a, (6...8), nil), + KeywordParameterNode(10...12)(:b, (10...12), nil)], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/stabby_block_kw.txt b/test/yarp/snapshots/seattlerb/stabby_block_kw.txt index 8df95715c9f..ffb20333869 100644 --- a/test/yarp/snapshots/seattlerb/stabby_block_kw.txt +++ b/test/yarp/snapshots/seattlerb/stabby_block_kw.txt @@ -12,7 +12,7 @@ ProgramNode(0...13)( [], [], nil, - [KeywordParameterNode(4...8)((4...6), IntegerNode(6...8)())], + [KeywordParameterNode(4...8)(:k, (4...6), IntegerNode(6...8)())], nil, nil ), diff --git a/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt b/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt index 8d3e73af8b7..3b1ba23e9d0 100644 --- a/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt +++ b/test/yarp/snapshots/seattlerb/stabby_block_kw__required.txt @@ -12,7 +12,7 @@ ProgramNode(0...11)( [], [], nil, - [KeywordParameterNode(4...6)((4...6), nil)], + [KeywordParameterNode(4...6)(:k, (4...6), nil)], nil, nil ), diff --git a/test/yarp/snapshots/unparser/corpus/literal/def.txt b/test/yarp/snapshots/unparser/corpus/literal/def.txt index f458483791f..d4def391b70 100644 --- a/test/yarp/snapshots/unparser/corpus/literal/def.txt +++ b/test/yarp/snapshots/unparser/corpus/literal/def.txt @@ -179,8 +179,8 @@ ProgramNode(0...913)( [], [], nil, - [KeywordParameterNode(113...117)((113...117), nil), - KeywordParameterNode(119...123)((119...123), nil)], + [KeywordParameterNode(113...117)(:bar, (113...117), nil), + KeywordParameterNode(119...123)(:baz, (119...123), nil)], nil, nil ), @@ -570,6 +570,7 @@ ProgramNode(0...913)( [], nil, [KeywordParameterNode(459...465)( + :bar, (459...463), IntegerNode(464...465)() )], @@ -594,6 +595,7 @@ ProgramNode(0...913)( [], nil, [KeywordParameterNode(480...488)( + :bar, (480...484), CallNode(485...488)( nil, @@ -628,6 +630,7 @@ ProgramNode(0...913)( [], nil, [KeywordParameterNode(503...513)( + :bar, (503...507), CallNode(508...513)( nil, @@ -957,8 +960,9 @@ ProgramNode(0...913)( [], [], nil, - [KeywordParameterNode(831...835)((831...835), nil), + [KeywordParameterNode(831...835)(:bar, (831...835), nil), KeywordParameterNode(837...849)( + :baz, (837...841), StringNode(842...849)( (842...843), diff --git a/test/yarp/snapshots/whitequark/args.txt b/test/yarp/snapshots/whitequark/args.txt index faa2ee44592..8d5ce21dcb0 100644 --- a/test/yarp/snapshots/whitequark/args.txt +++ b/test/yarp/snapshots/whitequark/args.txt @@ -306,6 +306,7 @@ ProgramNode(0...690)( [], nil, [KeywordParameterNode(236...242)( + :foo, (236...240), IntegerNode(241...242)() )], @@ -330,10 +331,12 @@ ProgramNode(0...690)( [], nil, [KeywordParameterNode(261...267)( + :foo, (261...265), IntegerNode(266...267)() ), KeywordParameterNode(269...275)( + :bar, (269...273), IntegerNode(274...275)() )], @@ -621,7 +624,7 @@ ProgramNode(0...690)( [], [], nil, - [KeywordParameterNode(565...569)((565...569), nil)], + [KeywordParameterNode(565...569)(:foo, (565...569), nil)], nil, nil ), @@ -643,6 +646,7 @@ ProgramNode(0...690)( [], nil, [KeywordParameterNode(583...590)( + :foo, (583...587), IntegerNode(588...590)() )], diff --git a/test/yarp/snapshots/whitequark/blockargs.txt b/test/yarp/snapshots/whitequark/blockargs.txt index d7160036433..56bf4f49ca3 100644 --- a/test/yarp/snapshots/whitequark/blockargs.txt +++ b/test/yarp/snapshots/whitequark/blockargs.txt @@ -807,6 +807,7 @@ ProgramNode(0...550)( [], nil, [KeywordParameterNode(403...409)( + :foo, (403...407), IntegerNode(408...409)() )], @@ -840,10 +841,12 @@ ProgramNode(0...550)( [], nil, [KeywordParameterNode(422...428)( + :foo, (422...426), IntegerNode(427...428)() ), KeywordParameterNode(430...436)( + :bar, (430...434), IntegerNode(435...436)() )], @@ -876,7 +879,7 @@ ProgramNode(0...550)( [], [], nil, - [KeywordParameterNode(456...460)((456...460), nil)], + [KeywordParameterNode(456...460)(:foo, (456...460), nil)], nil, nil ), diff --git a/test/yarp/snapshots/whitequark/kwarg.txt b/test/yarp/snapshots/whitequark/kwarg.txt index d096caece0c..9b605f5c5e5 100644 --- a/test/yarp/snapshots/whitequark/kwarg.txt +++ b/test/yarp/snapshots/whitequark/kwarg.txt @@ -9,7 +9,7 @@ ProgramNode(0...16)( [], [], nil, - [KeywordParameterNode(6...10)((6...10), nil)], + [KeywordParameterNode(6...10)(:foo, (6...10), nil)], nil, nil ), diff --git a/test/yarp/snapshots/whitequark/kwoptarg.txt b/test/yarp/snapshots/whitequark/kwoptarg.txt index 9514567387d..effee043fad 100644 --- a/test/yarp/snapshots/whitequark/kwoptarg.txt +++ b/test/yarp/snapshots/whitequark/kwoptarg.txt @@ -9,7 +9,11 @@ ProgramNode(0...18)( [], [], nil, - [KeywordParameterNode(6...12)((6...10), IntegerNode(11...12)())], + [KeywordParameterNode(6...12)( + :foo, + (6...10), + IntegerNode(11...12)() + )], nil, nil ), 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 14fd8da3951..c9e8989ef35 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 @@ -9,7 +9,7 @@ ProgramNode(0...28)( [], [], nil, - [KeywordParameterNode(6...12)((6...8), NilNode(9...12)())], + [KeywordParameterNode(6...12)(:a, (6...8), NilNode(9...12)())], KeywordRestParameterNode(14...16)((14...16), nil), nil ), diff --git a/test/yarp/snapshots/whitequark/ruby_bug_15789.txt b/test/yarp/snapshots/whitequark/ruby_bug_15789.txt index 0621e71c8cc..9066a4032bb 100644 --- a/test/yarp/snapshots/whitequark/ruby_bug_15789.txt +++ b/test/yarp/snapshots/whitequark/ruby_bug_15789.txt @@ -76,6 +76,7 @@ ProgramNode(0...41)( [], nil, [KeywordParameterNode(27...36)( + :a, (27...29), LambdaNode(30...36)( [], diff --git a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt b/test/yarp/snapshots/whitequark/ruby_bug_9669.txt index 6302c3d317b..aad27053bbc 100644 --- a/test/yarp/snapshots/whitequark/ruby_bug_9669.txt +++ b/test/yarp/snapshots/whitequark/ruby_bug_9669.txt @@ -9,7 +9,7 @@ ProgramNode(0...33)( [], [], nil, - [KeywordParameterNode(6...8)((6...8), nil)], + [KeywordParameterNode(6...8)(:b, (6...8), nil)], nil, nil ), diff --git a/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt b/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt index ebb6fb10651..57f5c2ead21 100644 --- a/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt +++ b/test/yarp/snapshots/whitequark/send_lambda_args_noparen.txt @@ -12,7 +12,7 @@ ProgramNode(0...22)( [], [], nil, - [KeywordParameterNode(3...7)((3...5), IntegerNode(6...7)())], + [KeywordParameterNode(3...7)(:a, (3...5), IntegerNode(6...7)())], nil, nil ), @@ -33,7 +33,7 @@ ProgramNode(0...22)( [], [], nil, - [KeywordParameterNode(16...18)((16...18), nil)], + [KeywordParameterNode(16...18)(:a, (16...18), nil)], nil, nil ),