Constants on keyword parameters

ruby · Sep 6, 2023 · d2d4f25 · d2d4f25
1 parent 2cd9a67
commit d2d4f25
Show file tree

Hide file tree

Showing 36 changed files with 94 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/test/yarp/snapshots/lambda.txt b/test/yarp/snapshots/lambda.txt
diff --git a/test/yarp/snapshots/methods.txt b/test/yarp/snapshots/methods.txt
diff --git a/test/yarp/snapshots/procs.txt b/test/yarp/snapshots/procs.txt
diff --git a/test/yarp/snapshots/seattlerb/args_kw_block.txt b/test/yarp/snapshots/seattlerb/args_kw_block.txt
diff --git a/test/yarp/snapshots/seattlerb/block_kw.txt b/test/yarp/snapshots/seattlerb/block_kw.txt
diff --git a/test/yarp/snapshots/seattlerb/block_kw__required.txt b/test/yarp/snapshots/seattlerb/block_kw__required.txt
diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar.txt
diff --git a/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/yarp/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_kwarg.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_kwarg_lvar.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_lvar.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_no_parens.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt b/test/yarp/snapshots/seattlerb/defn_kwarg_val.txt
diff --git a/test/yarp/snapshots/seattlerb/defs_kwarg.txt b/test/yarp/snapshots/seattlerb/defs_kwarg.txt
diff --git a/test/yarp/snapshots/seattlerb/f_kw.txt b/test/yarp/snapshots/seattlerb/f_kw.txt
diff --git a/test/yarp/snapshots/seattlerb/f_kw__required.txt b/test/yarp/snapshots/seattlerb/f_kw__required.txt
diff --git a/test/yarp/snapshots/seattlerb/iter_kwarg.txt b/test/yarp/snapshots/seattlerb/iter_kwarg.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/seattlerb/required_kwarg_no_value.txt b/test/yarp/snapshots/seattlerb/required_kwarg_no_value.txt