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

prism 0.29.0 → 1.3.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 (92) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +115 -1
data/CONTRIBUTING.md +0 -4
data/Makefile +1 -1
data/README.md +4 -0
data/config.yml +920 -148
data/docs/build_system.md +8 -11
data/docs/fuzzing.md +1 -1
data/docs/parsing_rules.md +4 -1
data/docs/relocation.md +34 -0
data/docs/ripper_translation.md +22 -0
data/docs/serialization.md +3 -0
data/ext/prism/api_node.c +2863 -2079
data/ext/prism/extconf.rb +14 -37
data/ext/prism/extension.c +241 -391
data/ext/prism/extension.h +2 -2
data/include/prism/ast.h +2156 -453
data/include/prism/defines.h +58 -7
data/include/prism/diagnostic.h +24 -6
data/include/prism/node.h +0 -21
data/include/prism/options.h +94 -3
data/include/prism/parser.h +82 -40
data/include/prism/regexp.h +18 -8
data/include/prism/static_literals.h +3 -2
data/include/prism/util/pm_char.h +1 -2
data/include/prism/util/pm_constant_pool.h +0 -8
data/include/prism/util/pm_integer.h +22 -15
data/include/prism/util/pm_newline_list.h +11 -0
data/include/prism/util/pm_string.h +28 -12
data/include/prism/version.h +3 -3
data/include/prism.h +47 -11
data/lib/prism/compiler.rb +3 -0
data/lib/prism/desugar_compiler.rb +111 -74
data/lib/prism/dispatcher.rb +16 -1
data/lib/prism/dot_visitor.rb +55 -34
data/lib/prism/dsl.rb +660 -468
data/lib/prism/ffi.rb +113 -8
data/lib/prism/inspect_visitor.rb +296 -64
data/lib/prism/lex_compat.rb +1 -1
data/lib/prism/mutation_compiler.rb +11 -6
data/lib/prism/node.rb +4262 -5023
data/lib/prism/node_ext.rb +91 -14
data/lib/prism/parse_result/comments.rb +0 -7
data/lib/prism/parse_result/errors.rb +65 -0
data/lib/prism/parse_result/newlines.rb +101 -11
data/lib/prism/parse_result.rb +183 -6
data/lib/prism/reflection.rb +12 -10
data/lib/prism/relocation.rb +504 -0
data/lib/prism/serialize.rb +496 -609
data/lib/prism/string_query.rb +30 -0
data/lib/prism/translation/parser/compiler.rb +185 -155
data/lib/prism/translation/parser/lexer.rb +26 -4
data/lib/prism/translation/parser.rb +9 -4
data/lib/prism/translation/ripper.rb +23 -25
data/lib/prism/translation/ruby_parser.rb +86 -17
data/lib/prism/visitor.rb +3 -0
data/lib/prism.rb +6 -8
data/prism.gemspec +9 -5
data/rbi/prism/dsl.rbi +521 -0
data/rbi/prism/node.rbi +1115 -1120
data/rbi/prism/parse_result.rbi +29 -0
data/rbi/prism/string_query.rbi +12 -0
data/rbi/prism/visitor.rbi +3 -0
data/rbi/prism.rbi +36 -30
data/sig/prism/dsl.rbs +190 -303
data/sig/prism/mutation_compiler.rbs +1 -0
data/sig/prism/node.rbs +678 -632
data/sig/prism/parse_result.rbs +22 -0
data/sig/prism/relocation.rbs +185 -0
data/sig/prism/string_query.rbs +11 -0
data/sig/prism/visitor.rbs +1 -0
data/sig/prism.rbs +103 -64
data/src/diagnostic.c +64 -28
data/src/node.c +502 -1739
data/src/options.c +76 -27
data/src/prettyprint.c +188 -112
data/src/prism.c +3376 -2293
data/src/regexp.c +208 -71
data/src/serialize.c +182 -50
data/src/static_literals.c +64 -85
data/src/token_type.c +4 -4
data/src/util/pm_char.c +1 -1
data/src/util/pm_constant_pool.c +0 -8
data/src/util/pm_integer.c +53 -25
data/src/util/pm_newline_list.c +29 -0
data/src/util/pm_string.c +131 -80
data/src/util/pm_strpbrk.c +32 -6
metadata +11 -7
data/include/prism/util/pm_string_list.h +0 -44
data/lib/prism/debug.rb +0 -249
data/lib/prism/translation/parser/rubocop.rb +0 -73
data/src/util/pm_string_list.c +0 -28

data/src/prettyprint.c CHANGED Viewed

@@ -1,10 +1,10 @@
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually. See                                                  */
 /* templates/src/prettyprint.c.erb                                            */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 #include "prism/prettyprint.h"
@@ -226,11 +226,16 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ArgumentsNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ArgumentsNodeFlags:", 23);
                 bool found = false;
+                if (cast->base.flags & PM_ARGUMENTS_NODE_FLAGS_CONTAINS_FORWARDING) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " contains_forwarding", 20);
+                    found = true;
+                }
                 if (cast->base.flags & PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
                     pm_buffer_append_string(output_buffer, " contains_keywords", 18);
@@ -241,6 +246,16 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     pm_buffer_append_string(output_buffer, " contains_keyword_splat", 23);
                     found = true;
                 }
+                if (cast->base.flags & PM_ARGUMENTS_NODE_FLAGS_CONTAINS_SPLAT) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " contains_splat", 15);
+                    found = true;
+                }
+                if (cast->base.flags & PM_ARGUMENTS_NODE_FLAGS_CONTAINS_MULTIPLE_SPLATS) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " contains_multiple_splats", 25);
+                    found = true;
+                }
                 if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
                 pm_buffer_append_byte(output_buffer, '\n');
             }
@@ -271,10 +286,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ArrayNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ArrayNodeFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_ARRAY_NODE_FLAGS_CONTAINS_SPLAT) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -702,10 +717,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -811,10 +826,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -986,10 +1001,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -1115,10 +1130,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -1276,10 +1291,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -1414,10 +1429,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -1543,10 +1558,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -1707,11 +1722,11 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 }
             }
-            // consequent
+            // else_clause
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- consequent:", 15);
-                if (cast->consequent == NULL) {
+                pm_buffer_append_string(output_buffer, "+-- else_clause:", 16);
+                if (cast->else_clause == NULL) {
                     pm_buffer_append_string(output_buffer, " nil\n", 5);
                 } else {
                     pm_buffer_append_byte(output_buffer, '\n');
@@ -1719,7 +1734,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     size_t prefix_length = prefix_buffer->length;
                     pm_buffer_append_string(prefix_buffer, "|   ", 4);
                     pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->consequent, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->else_clause, prefix_buffer);
                     prefix_buffer->length = prefix_length;
                 }
             }
@@ -1791,11 +1806,11 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 }
             }
-            // consequent
+            // else_clause
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- consequent:", 15);
-                if (cast->consequent == NULL) {
+                pm_buffer_append_string(output_buffer, "+-- else_clause:", 16);
+                if (cast->else_clause == NULL) {
                     pm_buffer_append_string(output_buffer, " nil\n", 5);
                 } else {
                     pm_buffer_append_byte(output_buffer, '\n');
@@ -1803,7 +1818,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     size_t prefix_length = prefix_buffer->length;
                     pm_buffer_append_string(prefix_buffer, "|   ", 4);
                     pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->consequent, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->else_clause, prefix_buffer);
                     prefix_buffer->length = prefix_length;
                 }
             }
@@ -3332,10 +3347,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RangeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RangeFlags:", 15);
                 bool found = false;
                 if (cast->base.flags & PM_RANGE_FLAGS_EXCLUDE_END) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -4020,11 +4035,11 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 }
             }
-            // consequent
+            // subsequent
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- consequent:", 15);
-                if (cast->consequent == NULL) {
+                pm_buffer_append_string(output_buffer, "+-- subsequent:", 15);
+                if (cast->subsequent == NULL) {
                     pm_buffer_append_string(output_buffer, " nil\n", 5);
                 } else {
                     pm_buffer_append_byte(output_buffer, '\n');
@@ -4032,7 +4047,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     size_t prefix_length = prefix_buffer->length;
                     pm_buffer_append_string(prefix_buffer, "|   ", 4);
                     pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->consequent, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->subsequent, prefix_buffer);
                     prefix_buffer->length = prefix_length;
                 }
             }
@@ -4176,10 +4191,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -4329,10 +4344,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -4491,10 +4506,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -4644,10 +4659,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // CallNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- CallNodeFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_CALL_NODE_FLAGS_SAFE_NAVIGATION) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5011,10 +5026,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // IntegerBaseFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- IntegerBaseFlags:", 21);
                 bool found = false;
                 if (cast->base.flags & PM_INTEGER_BASE_FLAGS_BINARY) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5058,10 +5073,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RegularExpressionFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RegularExpressionFlags:", 27);
                 bool found = false;
                 if (cast->base.flags & PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5172,10 +5187,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RegularExpressionFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RegularExpressionFlags:", 27);
                 bool found = false;
                 if (cast->base.flags & PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5286,10 +5301,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // InterpolatedStringNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- InterpolatedStringNodeFlags:", 32);
                 bool found = false;
                 if (cast->base.flags & PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5465,6 +5480,13 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             break;
         }
+        case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+            pm_buffer_append_string(output_buffer, "@ ItLocalVariableReadNode (location: ", 37);
+            prettyprint_location(output_buffer, parser, &node->location);
+            pm_buffer_append_string(output_buffer, ")\n", 2);
+            break;
+        }
         case PM_IT_PARAMETERS_NODE: {
             pm_buffer_append_string(output_buffer, "@ ItParametersNode (location: ", 30);
             prettyprint_location(output_buffer, parser, &node->location);
@@ -5478,10 +5500,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // KeywordHashNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- KeywordHashNodeFlags:", 25);
                 bool found = false;
                 if (cast->base.flags & PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5518,10 +5540,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -5972,10 +5994,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RegularExpressionFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RegularExpressionFlags:", 27);
                 bool found = false;
                 if (cast->base.flags & PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -6627,10 +6649,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -6683,10 +6705,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7222,10 +7244,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RangeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RangeFlags:", 15);
                 bool found = false;
                 if (cast->base.flags & PM_RANGE_FLAGS_EXCLUDE_END) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7290,17 +7312,53 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // numeric
+            // IntegerBaseFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- numeric:", 12);
+                pm_buffer_append_string(output_buffer, "+-- IntegerBaseFlags:", 21);
+                bool found = false;
+                if (cast->base.flags & PM_INTEGER_BASE_FLAGS_BINARY) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " binary", 7);
+                    found = true;
+                }
+                if (cast->base.flags & PM_INTEGER_BASE_FLAGS_DECIMAL) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " decimal", 8);
+                    found = true;
+                }
+                if (cast->base.flags & PM_INTEGER_BASE_FLAGS_OCTAL) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " octal", 6);
+                    found = true;
+                }
+                if (cast->base.flags & PM_INTEGER_BASE_FLAGS_HEXADECIMAL) {
+                    if (found) pm_buffer_append_byte(output_buffer, ',');
+                    pm_buffer_append_string(output_buffer, " hexadecimal", 12);
+                    found = true;
+                }
+                if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
                 pm_buffer_append_byte(output_buffer, '\n');
+            }
-                size_t prefix_length = prefix_buffer->length;
-                pm_buffer_append_string(prefix_buffer, "    ", 4);
+            // numerator
+            {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                prettyprint_node(output_buffer, parser, (pm_node_t *) cast->numeric, prefix_buffer);
-                prefix_buffer->length = prefix_length;
+                pm_buffer_append_string(output_buffer, "+-- numerator:", 14);
+                const pm_integer_t *integer = &cast->numerator;
+                pm_buffer_append_byte(output_buffer, ' ');
+                pm_integer_string(output_buffer, integer);
+                pm_buffer_append_byte(output_buffer, '\n');
+            }
+            // denominator
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- denominator:", 16);
+                const pm_integer_t *integer = &cast->denominator;
+                pm_buffer_append_byte(output_buffer, ' ');
+                pm_integer_string(output_buffer, integer);
+                pm_buffer_append_byte(output_buffer, '\n');
             }
             break;
@@ -7318,10 +7376,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // RegularExpressionFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- RegularExpressionFlags:", 27);
                 bool found = false;
                 if (cast->base.flags & PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7435,10 +7493,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7478,10 +7536,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7635,11 +7693,11 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 }
             }
-            // consequent
+            // subsequent
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- consequent:", 15);
-                if (cast->consequent == NULL) {
+                pm_buffer_append_string(output_buffer, "+-- subsequent:", 15);
+                if (cast->subsequent == NULL) {
                     pm_buffer_append_string(output_buffer, " nil\n", 5);
                 } else {
                     pm_buffer_append_byte(output_buffer, '\n');
@@ -7647,7 +7705,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     size_t prefix_length = prefix_buffer->length;
                     pm_buffer_append_string(prefix_buffer, "    ", 4);
                     pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->consequent, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->subsequent, prefix_buffer);
                     prefix_buffer->length = prefix_length;
                 }
             }
@@ -7660,10 +7718,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ParameterFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ParameterFlags:", 19);
                 bool found = false;
                 if (cast->base.flags & PM_PARAMETER_FLAGS_REPEATED_PARAMETER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7730,20 +7788,6 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
-            {
-                pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
-                bool found = false;
-                if (cast->base.flags & PM_RETURN_NODE_FLAGS_REDUNDANT) {
-                    if (found) pm_buffer_append_byte(output_buffer, ',');
-                    pm_buffer_append_string(output_buffer, " redundant", 10);
-                    found = true;
-                }
-                if (!found) pm_buffer_append_string(output_buffer, " nil", 4);
-                pm_buffer_append_byte(output_buffer, '\n');
-            }
             // keyword_loc
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
@@ -7788,10 +7832,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // ShareableConstantNodeFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- ShareableConstantNodeFlags:", 31);
                 bool found = false;
                 if (cast->base.flags & PM_SHAREABLE_CONSTANT_NODE_FLAGS_LITERAL) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -7926,10 +7970,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // StringFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- StringFlags:", 16);
                 bool found = false;
                 if (cast->base.flags & PM_STRING_FLAGS_FORCED_UTF8_ENCODING) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -8042,10 +8086,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // StringFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- StringFlags:", 16);
                 bool found = false;
                 if (cast->base.flags & PM_STRING_FLAGS_FORCED_UTF8_ENCODING) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -8218,10 +8262,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // SymbolFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- SymbolFlags:", 16);
                 bool found = false;
                 if (cast->base.flags & PM_SYMBOL_FLAGS_FORCED_UTF8_ENCODING) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -8410,11 +8454,11 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 }
             }
-            // consequent
+            // else_clause
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- consequent:", 15);
-                if (cast->consequent == NULL) {
+                pm_buffer_append_string(output_buffer, "+-- else_clause:", 16);
+                if (cast->else_clause == NULL) {
                     pm_buffer_append_string(output_buffer, " nil\n", 5);
                 } else {
                     pm_buffer_append_byte(output_buffer, '\n');
@@ -8422,7 +8466,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     size_t prefix_length = prefix_buffer->length;
                     pm_buffer_append_string(prefix_buffer, "|   ", 4);
                     pm_buffer_concat(output_buffer, prefix_buffer);
-                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->consequent, prefix_buffer);
+                    prettyprint_node(output_buffer, parser, (pm_node_t *) cast->else_clause, prefix_buffer);
                     prefix_buffer->length = prefix_length;
                 }
             }
@@ -8451,10 +8495,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // LoopFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- LoopFlags:", 14);
                 bool found = false;
                 if (cast->base.flags & PM_LOOP_FLAGS_BEGIN_MODIFIER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -8477,6 +8521,22 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 pm_buffer_append_string(output_buffer, "\"\n", 2);
             }
+            // do_keyword_loc
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- do_keyword_loc:", 19);
+                pm_location_t *location = &cast->do_keyword_loc;
+                if (location->start == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_location(output_buffer, parser, location);
+                    pm_buffer_append_string(output_buffer, " = \"", 4);
+                    pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                    pm_buffer_append_string(output_buffer, "\"\n", 2);
+                }
+            }
             // closing_loc
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
@@ -8602,10 +8662,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // LoopFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- LoopFlags:", 14);
                 bool found = false;
                 if (cast->base.flags & PM_LOOP_FLAGS_BEGIN_MODIFIER) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');
@@ -8628,6 +8688,22 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 pm_buffer_append_string(output_buffer, "\"\n", 2);
             }
+            // do_keyword_loc
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- do_keyword_loc:", 19);
+                pm_location_t *location = &cast->do_keyword_loc;
+                if (location->start == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_location(output_buffer, parser, location);
+                    pm_buffer_append_string(output_buffer, " = \"", 4);
+                    pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                    pm_buffer_append_string(output_buffer, "\"\n", 2);
+                }
+            }
             // closing_loc
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
@@ -8682,10 +8758,10 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
             prettyprint_location(output_buffer, parser, &node->location);
             pm_buffer_append_string(output_buffer, ")\n", 2);
-            // flags
+            // EncodingFlags
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
-                pm_buffer_append_string(output_buffer, "+-- flags:", 10);
+                pm_buffer_append_string(output_buffer, "+-- EncodingFlags:", 18);
                 bool found = false;
                 if (cast->base.flags & PM_ENCODING_FLAGS_FORCED_UTF8_ENCODING) {
                     if (found) pm_buffer_append_byte(output_buffer, ',');