prism 0.27.0 → 0.29.0

data/src/node.c

@@ -414,7 +414,6 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             if (cast->parent != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->parent);
             }
-            pm_node_destroy(parser, (pm_node_t *)cast->child);
             break;
         }
 #line 123 "node.c.erb"
@@ -437,7 +436,6 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             if (cast->parent != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->parent);
             }
-            pm_node_destroy(parser, (pm_node_t *)cast->child);
             break;
         }
 #line 123 "node.c.erb"
@@ -1558,7 +1556,6 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             if (cast->parent != NULL) {
                 pm_node_memsize_node((pm_node_t *)cast->parent, memsize);
             }
-            pm_node_memsize_node((pm_node_t *)cast->child, memsize);
             break;
         }
 #line 170 "node.c.erb"
@@ -1584,7 +1581,6 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             if (cast->parent != NULL) {
                 pm_node_memsize_node((pm_node_t *)cast->parent, memsize);
             }
-            pm_node_memsize_node((pm_node_t *)cast->child, memsize);
             break;
         }
 #line 170 "node.c.erb"
@@ -3255,9 +3251,6 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node((const pm_node_t *) cast->parent, visitor, data);
             }
 
-            // Visit the child field
-            pm_visit_node((const pm_node_t *) cast->child, visitor, data);
-
             break;
         }
         case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
@@ -3290,9 +3283,6 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node((const pm_node_t *) cast->parent, visitor, data);
             }
 
-            // Visit the child field
-            pm_visit_node((const pm_node_t *) cast->child, visitor, data);
-
             break;
         }
         case PM_CONSTANT_PATH_WRITE_NODE: {
@@ -4434,6 +4424,11 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"flags\":", 8);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
+            if (PM_NODE_FLAG_P(cast, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS)) {
+                if (flags != 0) pm_buffer_append_byte(buffer, ',');
+                pm_buffer_append_string(buffer, "\"CONTAINS_KEYWORDS\"", 19);
+                flags++;
+            }
             if (PM_NODE_FLAG_P(cast, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORD_SPLAT)) {
                 if (flags != 0) pm_buffer_append_byte(buffer, ',');
                 pm_buffer_append_string(buffer, "\"CONTAINS_KEYWORD_SPLAT\"", 24);
@@ -5174,15 +5169,15 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"write_name\":", 13);
             pm_dump_json_constant(buffer, parser, cast->write_name);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
@@ -5566,20 +5561,20 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name_loc\":", 11);
             pm_dump_json_location(buffer, parser, &cast->name_loc);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"value\":", 8);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->value);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             pm_buffer_append_byte(buffer, '}');
             break;
@@ -5715,20 +5710,20 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name_loc\":", 11);
             pm_dump_json_location(buffer, parser, &cast->name_loc);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"value\":", 8);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->value);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             pm_buffer_append_byte(buffer, '}');
             break;
@@ -5801,16 +5796,25 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
                 pm_buffer_append_string(buffer, "null", 4);
             }
 
-            // Dump the child field
+            // Dump the name field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"child\":", 8);
-            pm_dump_json(buffer, parser, (const pm_node_t *) cast->child);
+            pm_buffer_append_string(buffer, "\"name\":", 7);
+            if (cast->name != PM_CONSTANT_ID_UNSET) {
+                pm_dump_json_constant(buffer, parser, cast->name);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
 
             // Dump the delimiter_loc field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"delimiter_loc\":", 16);
             pm_dump_json_location(buffer, parser, &cast->delimiter_loc);
 
+            // Dump the name_loc field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"name_loc\":", 11);
+            pm_dump_json_location(buffer, parser, &cast->name_loc);
+
             pm_buffer_append_byte(buffer, '}');
             break;
         }
@@ -5825,20 +5829,20 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"target\":", 9);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->target);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"value\":", 8);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->value);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             pm_buffer_append_byte(buffer, '}');
             break;
@@ -5882,16 +5886,25 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
                 pm_buffer_append_string(buffer, "null", 4);
             }
 
-            // Dump the child field
+            // Dump the name field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"child\":", 8);
-            pm_dump_json(buffer, parser, (const pm_node_t *) cast->child);
+            pm_buffer_append_string(buffer, "\"name\":", 7);
+            if (cast->name != PM_CONSTANT_ID_UNSET) {
+                pm_dump_json_constant(buffer, parser, cast->name);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
 
             // Dump the delimiter_loc field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"delimiter_loc\":", 16);
             pm_dump_json_location(buffer, parser, &cast->delimiter_loc);
 
+            // Dump the name_loc field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"name_loc\":", 11);
+            pm_dump_json_location(buffer, parser, &cast->name_loc);
+
             pm_buffer_append_byte(buffer, '}');
             break;
         }
@@ -6486,20 +6499,20 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name_loc\":", 11);
             pm_dump_json_location(buffer, parser, &cast->name_loc);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"value\":", 8);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->value);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             pm_buffer_append_byte(buffer, '}');
             break;
@@ -6982,15 +6995,15 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
                 pm_buffer_append_string(buffer, "null", 4);
             }
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
@@ -7206,20 +7219,20 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name_loc\":", 11);
             pm_dump_json_location(buffer, parser, &cast->name_loc);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"value\":", 8);
             pm_dump_json(buffer, parser, (const pm_node_t *) cast->value);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             pm_buffer_append_byte(buffer, '}');
             break;
@@ -7848,10 +7861,10 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name_loc\":", 11);
             pm_dump_json_location(buffer, parser, &cast->name_loc);
 
-            // Dump the operator_loc field
+            // Dump the binary_operator_loc field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator_loc\":", 15);
-            pm_dump_json_location(buffer, parser, &cast->operator_loc);
+            pm_buffer_append_string(buffer, "\"binary_operator_loc\":", 22);
+            pm_dump_json_location(buffer, parser, &cast->binary_operator_loc);
 
             // Dump the value field
             pm_buffer_append_byte(buffer, ',');
@@ -7863,10 +7876,10 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"name\":", 7);
             pm_dump_json_constant(buffer, parser, cast->name);
 
-            // Dump the operator field
+            // Dump the binary_operator field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"operator\":", 11);
-            pm_dump_json_constant(buffer, parser, cast->operator);
+            pm_buffer_append_string(buffer, "\"binary_operator\":", 18);
+            pm_dump_json_constant(buffer, parser, cast->binary_operator);
 
             // Dump the depth field
             pm_buffer_append_byte(buffer, ',');
@@ -9134,6 +9147,18 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_return_node_t *cast = (const pm_return_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
+            // Dump the flags field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            size_t flags = 0;
+            pm_buffer_append_byte(buffer, '[');
+            if (PM_NODE_FLAG_P(cast, PM_RETURN_NODE_FLAGS_REDUNDANT)) {
+                if (flags != 0) pm_buffer_append_byte(buffer, ',');
+                pm_buffer_append_string(buffer, "\"REDUNDANT\"", 11);
+                flags++;
+            }
+            pm_buffer_append_byte(buffer, ']');
+
             // Dump the keyword_loc field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"keyword_loc\":", 14);

data/src/options.c

@@ -58,8 +58,8 @@ pm_options_version_set(pm_options_t *options, const char *version, size_t length
         case 5:
             assert(version != NULL);
 
-            if (strncmp(version, "3.3.0", length) == 0) {
-                options->version = PM_OPTIONS_VERSION_CRUBY_3_3_0;
+            if ((strncmp(version, "3.3.0", length) == 0) || (strncmp(version, "3.3.1", length) == 0)) {
+                options->version = PM_OPTIONS_VERSION_CRUBY_3_3;
                 return true;
             }