RubyGems - prism - Versions diffs - 0.27.0 → 0.29.0 - Mend

prism 0.27.0 → 0.29.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +45 -1
data/config.yml +68 -44
data/docs/configuration.md +1 -0
data/ext/prism/api_node.c +854 -847
data/ext/prism/extconf.rb +27 -23
data/ext/prism/extension.c +5 -3
data/ext/prism/extension.h +1 -1
data/include/prism/ast.h +70 -48
data/include/prism/diagnostic.h +23 -6
data/include/prism/options.h +2 -2
data/include/prism/parser.h +10 -0
data/include/prism/static_literals.h +8 -6
data/include/prism/version.h +2 -2
data/lib/prism/desugar_compiler.rb +4 -4
data/lib/prism/dot_visitor.rb +54 -38
data/lib/prism/dsl.rb +24 -24
data/lib/prism/ffi.rb +4 -4
data/lib/prism/inspect_visitor.rb +2156 -0
data/lib/prism/lex_compat.rb +1 -1
data/lib/prism/mutation_compiler.rb +2 -2
data/lib/prism/node.rb +737 -1863
data/lib/prism/node_ext.rb +176 -5
data/lib/prism/parse_result/comments.rb +1 -1
data/lib/prism/parse_result/newlines.rb +1 -1
data/lib/prism/parse_result.rb +78 -0
data/lib/prism/pattern.rb +12 -6
data/lib/prism/polyfill/byteindex.rb +13 -0
data/lib/prism/polyfill/unpack1.rb +14 -0
data/lib/prism/reflection.rb +20 -20
data/lib/prism/serialize.rb +32 -15
data/lib/prism/translation/parser/compiler.rb +156 -26
data/lib/prism/translation/parser.rb +7 -7
data/lib/prism/translation/ripper.rb +29 -25
data/lib/prism/translation/ruby_parser.rb +13 -13
data/lib/prism.rb +2 -1
data/prism.gemspec +37 -38
data/rbi/prism/compiler.rbi +3 -5
data/rbi/prism/inspect_visitor.rbi +12 -0
data/rbi/prism/node.rbi +405 -370
data/rbi/prism/node_ext.rbi +5 -0
data/rbi/prism/parse_result.rbi +23 -0
data/rbi/prism/translation/ripper.rbi +1 -11
data/sig/prism/dsl.rbs +12 -12
data/sig/prism/inspect_visitor.rbs +22 -0
data/sig/prism/lex_compat.rbs +10 -0
data/sig/prism/node.rbs +108 -91
data/sig/prism/node_ext.rbs +4 -0
data/sig/prism/parse_result.rbs +12 -0
data/src/diagnostic.c +66 -33
data/src/node.c +89 -64
data/src/options.c +2 -2
data/src/prettyprint.c +109 -66
data/src/prism.c +862 -317
data/src/serialize.c +21 -18
data/src/static_literals.c +120 -34
data/src/token_type.c +6 -6
metadata +8 -9
data/lib/prism/node_inspector.rb +0 -68
data/lib/prism/polyfill/string.rb +0 -12
data/rbi/prism/desugar_compiler.rbi +0 -5
data/rbi/prism/mutation_compiler.rbi +0 -5
data/rbi/prism/translation/parser/compiler.rbi +0 -13
data/rbi/prism/translation/ripper/ripper_compiler.rbi +0 -5
data/rbi/prism/translation/ruby_parser.rbi +0 -11

data/src/node.c CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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;
             }