Constants on classes and modules

config.yml

@@ -779,7 +779,7 @@ nodes:
       - name: end_keyword_loc
         type: location
       - name: name
-        type: string
+        type: constant
       - name: name_constant
         type: constant
     comment: |
@@ -1739,7 +1739,7 @@ nodes:
       - name: end_keyword_loc
         type: location
       - name: name
-        type: string
+        type: constant
       - name: name_constant
         type: constant
     comment: |

src/yarp.c

@@ -1647,6 +1647,7 @@ 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) {
         {
@@ -1660,11 +1661,10 @@ 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 = YP_EMPTY_STRING,
-        .name_constant = yp_parser_constant_id_token(parser, name)
+        .name = name_constant,
+        .name_constant = name_constant
     };
 
-    yp_string_shared_init(&node->name, name->start, name->end);
     return node;
 }
 
@@ -3297,6 +3297,7 @@ 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) {
         {
@@ -3311,11 +3312,10 @@ 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 = YP_EMPTY_STRING,
-        .name_constant = yp_parser_constant_id_token(parser, name)
+        .name = name_constant,
+        .name_constant = name_constant
     };
 
-    yp_string_shared_init(&node->name, name->start, name->end);
     return node;
 }
 

test/yarp/errors_test.rb

@@ -19,10 +19,10 @@ def test_module_name_recoverable
         Location(),
         ConstantReadNode(:Parent),
         StatementsNode(
-          [ModuleNode([], Location(), MissingNode(), nil, Location(), "", :"")]
+          [ModuleNode([], Location(), MissingNode(), nil, Location(), :"", :"")]
         ),
         Location(),
-        "Parent",
+        :Parent,
         :Parent
       )
 
@@ -394,7 +394,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, :A)]),
         [],
         Location(),
         nil,
@@ -425,7 +425,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, :Foo)]),
               Location(),
               Location()
             ),
@@ -465,7 +465,7 @@ def test_class_definition_in_method_body
             nil,
             nil,
             Location(),
-            "A",
+            :A,
             :A
           )]
         ),
@@ -981,7 +981,7 @@ def test_dont_allow_return_inside_class_body
         nil,
         StatementsNode([ReturnNode(Location(), nil)]),
         Location(),
-        "A",
+        :A,
         :A
       )
 
@@ -997,7 +997,7 @@ def test_dont_allow_return_inside_module_body
         ConstantReadNode(:A),
         StatementsNode([ReturnNode(Location(), nil)]),
         Location(),
-        "A",
+        :A,
         :A
       )