Constants on keyword rest parameters

ruby · Sep 6, 2023 · 5e1a8fb · 5e1a8fb
1 parent d2d4f25
commit 5e1a8fb
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 33 deletions.
diff --git a/config.yml b/config.yml
@@ -1576,10 +1576,12 @@ nodes:
           end
   - name: KeywordRestParameterNode
     fields:
-      - name: operator_loc
-        type: location
+      - name: name
+        type: constant?
       - name: name_loc
         type: location?
+      - name: operator_loc
+        type: location
     comment: |
       Represents a keyword rest parameter to a method, block, or lambda definition.
 

diff --git a/src/yarp.c b/src/yarp.c
@@ -3090,8 +3090,9 @@ yp_keyword_rest_parameter_node_create(yp_parser_t *parser, const yp_token_t *ope
                 .end = (name->type == YP_TOKEN_NOT_PROVIDED ? operator->end : name->end)
             },
         },
-        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator),
-        .name_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(name)
+        .name = yp_parser_optional_constant_id_token(parser, name),
+        .name_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(name),
+        .operator_loc = YP_LOCATION_TOKEN_VALUE(operator)
     };
 
     return node;

diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb
@@ -744,7 +744,7 @@ def test_rest_keywords_parameters_before_required_parameters
           [],
           nil,
           [KeywordParameterNode(:b, Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
+          KeywordRestParameterNode(:rest, Location(), Location()),
           nil
         ),
         nil,
@@ -791,7 +791,7 @@ def test_multiple_error_in_parameters_order
           [RequiredParameterNode(:a)],
           nil,
           [KeywordParameterNode(:b, Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
+          KeywordRestParameterNode(:args, Location(), Location()),
           nil
         ),
         nil,
@@ -820,7 +820,7 @@ def test_switching_to_optional_arguments_twice
           [RequiredParameterNode(:a)],
           nil,
           [KeywordParameterNode(:b, Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
+          KeywordRestParameterNode(:args, Location(), Location()),
           nil
         ),
         nil,
@@ -849,7 +849,7 @@ def test_switching_to_named_arguments_twice
           [RequiredParameterNode(:a)],
           nil,
           [KeywordParameterNode(:b, Location(), nil)],
-          KeywordRestParameterNode(Location(), Location()),
+          KeywordRestParameterNode(:args, Location(), Location()),
           nil
         ),
         nil,
@@ -1069,7 +1069,7 @@ def test_duplicated_parameter_names
       expected = DefNode(
         Location(),
         nil,
-        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], KeywordRestParameterNode(Location(), Location()), nil),
+        ParametersNode([RequiredParameterNode(:a), RequiredParameterNode(:b)], [], [], nil, [], KeywordRestParameterNode(:a, Location(), Location()), nil),
         nil,
         [:a, :b],
         Location(),

diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt
diff --git a/test/yarp/snapshots/non_alphanumeric_methods.txt b/test/yarp/snapshots/non_alphanumeric_methods.txt
diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt
diff --git a/test/yarp/snapshots/seattlerb/block_arg_kwsplat.txt b/test/yarp/snapshots/seattlerb/block_arg_kwsplat.txt
diff --git a/test/yarp/snapshots/seattlerb/block_args_kwargs.txt b/test/yarp/snapshots/seattlerb/block_args_kwargs.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_env.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwsplat_anon.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_powarg.txt b/test/yarp/snapshots/seattlerb/defn_powarg.txt
diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/yarp/snapshots/seattlerb/iter_kwarg_kwsplat.txt
diff --git a/test/yarp/snapshots/unparser/corpus/literal/since/32.txt b/test/yarp/snapshots/unparser/corpus/literal/since/32.txt
diff --git a/test/yarp/snapshots/whitequark/args.txt b/test/yarp/snapshots/whitequark/args.txt
diff --git a/test/yarp/snapshots/whitequark/blockargs.txt b/test/yarp/snapshots/whitequark/blockargs.txt
diff --git a/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_argument_with_kwrestarg.txt
diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg.txt
diff --git a/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt b/test/yarp/snapshots/whitequark/forwarded_kwrestarg_with_additional_kwarg.txt
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
diff --git a/test/yarp/snapshots/whitequark/kwrestarg_named.txt b/test/yarp/snapshots/whitequark/kwrestarg_named.txt
diff --git a/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt b/test/yarp/snapshots/whitequark/kwrestarg_unnamed.txt