Remove name constant from classes/modules

ruby · Sep 6, 2023 · 26105f0 · 26105f0
1 parent 9285989
commit 26105f0
Show file tree

Hide file tree

Showing 30 changed files with 5 additions and 89 deletions.
diff --git a/config.yml b/config.yml
@@ -782,8 +782,6 @@ nodes:
         type: location
       - name: name
         type: constant
-      - name: name_constant
-        type: constant
     comment: |
       Represents a class declaration involving the `class` keyword.
 
@@ -1742,8 +1740,6 @@ nodes:
         type: location
       - name: name
         type: constant
-      - name: name_constant
-        type: constant
     comment: |
       Represents a module declaration involving the `module` keyword.
 

diff --git a/src/yarp.c b/src/yarp.c
@@ -1655,7 +1655,6 @@ yp_case_node_end_keyword_loc_set(yp_case_node_t *node, const yp_token_t *end_key
 static yp_class_node_t *
 yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *class_keyword, yp_node_t *constant_path, const yp_token_t *name, const yp_token_t *inheritance_operator, yp_node_t *superclass, yp_node_t *body, const yp_token_t *end_keyword) {
     yp_class_node_t *node = YP_ALLOC_NODE(parser, yp_class_node_t);
-    yp_constant_id_t name_constant = yp_parser_constant_id_token(parser, name);
 
     *node = (yp_class_node_t) {
         {
@@ -1669,8 +1668,7 @@ yp_class_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const y
         .superclass = superclass,
         .body = body,
         .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword),
-        .name = name_constant,
-        .name_constant = name_constant
+        .name = yp_parser_constant_id_token(parser, name)
     };
 
     return node;
@@ -3305,7 +3303,6 @@ yp_match_required_node_create(yp_parser_t *parser, yp_node_t *value, yp_node_t *
 static yp_module_node_t *
 yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const yp_token_t *module_keyword, yp_node_t *constant_path, const yp_token_t *name, yp_node_t *body, const yp_token_t *end_keyword) {
     yp_module_node_t *node = YP_ALLOC_NODE(parser, yp_module_node_t);
-    yp_constant_id_t name_constant = yp_parser_constant_id_token(parser, name);
 
     *node = (yp_module_node_t) {
         {
@@ -3320,8 +3317,7 @@ yp_module_node_create(yp_parser_t *parser, yp_constant_id_list_t *locals, const
         .constant_path = constant_path,
         .body = body,
         .end_keyword_loc = YP_LOCATION_TOKEN_VALUE(end_keyword),
-        .name = name_constant,
-        .name_constant = name_constant
+        .name = yp_parser_constant_id_token(parser, name)
     };
 
     return node;

diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb
@@ -19,10 +19,9 @@ def test_module_name_recoverable
         Location(),
         ConstantReadNode(:Parent),
         StatementsNode(
-          [ModuleNode([], Location(), MissingNode(), nil, Location(), :"", :"")]
+          [ModuleNode([], Location(), MissingNode(), nil, Location(), :"")]
         ),
         Location(),
-        :Parent,
         :Parent
       )
 
@@ -394,7 +393,7 @@ def test_module_definition_in_method_body
         Location(),
         nil,
         nil,
-        StatementsNode([ModuleNode([], Location(), ConstantReadNode(:A), nil, Location(), :A, :A)]),
+        StatementsNode([ModuleNode([], Location(), ConstantReadNode(:A), nil, Location(), :A)]),
         [],
         Location(),
         nil,
@@ -425,7 +424,7 @@ def test_module_definition_in_method_body_within_block
             BlockNode(
               [],
               nil,
-              StatementsNode([ModuleNode([], Location(), ConstantReadNode(:Foo), nil, Location(), :Foo, :Foo)]),
+              StatementsNode([ModuleNode([], Location(), ConstantReadNode(:Foo), nil, Location(), :Foo)]),
               Location(),
               Location()
             ),
@@ -465,7 +464,6 @@ def test_class_definition_in_method_body
             nil,
             nil,
             Location(),
-            :A,
             :A
           )]
         ),
@@ -981,7 +979,6 @@ def test_dont_allow_return_inside_class_body
         nil,
         StatementsNode([ReturnNode(Location(), nil)]),
         Location(),
-        :A,
         :A
       )
 
@@ -997,7 +994,6 @@ def test_dont_allow_return_inside_module_body
         ConstantReadNode(:A),
         StatementsNode([ReturnNode(Location(), nil)]),
         Location(),
-        :A,
         :A
       )
 

diff --git a/test/yarp/snapshots/classes.txt b/test/yarp/snapshots/classes.txt
diff --git a/test/yarp/snapshots/method_calls.txt b/test/yarp/snapshots/method_calls.txt
diff --git a/test/yarp/snapshots/modules.txt b/test/yarp/snapshots/modules.txt
diff --git a/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt b/test/yarp/snapshots/seattlerb/TestRubyParserShared.txt
diff --git a/test/yarp/snapshots/seattlerb/class_comments.txt b/test/yarp/snapshots/seattlerb/class_comments.txt
diff --git a/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defn_oneliner_eq2.txt
diff --git a/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt b/test/yarp/snapshots/seattlerb/defs_oneliner_eq2.txt
diff --git a/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt b/test/yarp/snapshots/seattlerb/magic_encoding_comment.txt
diff --git a/test/yarp/snapshots/seattlerb/module_comments.txt b/test/yarp/snapshots/seattlerb/module_comments.txt
diff --git a/test/yarp/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt b/test/yarp/snapshots/seattlerb/parse_line_heredoc_hardnewline.txt
diff --git a/test/yarp/snapshots/unparser/corpus/literal/class.txt b/test/yarp/snapshots/unparser/corpus/literal/class.txt