prism 0.30.0 → 1.0.0

data/src/node.c

@@ -1,12 +1,12 @@
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually. See                                                  */
 /* templates/src/node.c.erb                                                   */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 
-#line 2 "node.c.erb"
+#line 2 "prism/templates/src/node.c.erb"
 #include "prism/node.h"
 
 /**
@@ -113,47 +113,47 @@ pm_node_list_destroy(pm_parser_t *parser, pm_node_list_t *list) {
 PRISM_EXPORTED_FUNCTION void
 pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
     switch (PM_NODE_TYPE(node)) {
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ALIAS_GLOBAL_VARIABLE_NODE: {
             pm_alias_global_variable_node_t *cast = (pm_alias_global_variable_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->new_name);
             pm_node_destroy(parser, (pm_node_t *)cast->old_name);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ALIAS_METHOD_NODE: {
             pm_alias_method_node_t *cast = (pm_alias_method_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->new_name);
             pm_node_destroy(parser, (pm_node_t *)cast->old_name);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ALTERNATION_PATTERN_NODE: {
             pm_alternation_pattern_node_t *cast = (pm_alternation_pattern_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->left);
             pm_node_destroy(parser, (pm_node_t *)cast->right);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_AND_NODE: {
             pm_and_node_t *cast = (pm_and_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->left);
             pm_node_destroy(parser, (pm_node_t *)cast->right);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ARGUMENTS_NODE: {
             pm_arguments_node_t *cast = (pm_arguments_node_t *) node;
             pm_node_list_destroy(parser, &cast->arguments);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ARRAY_NODE: {
             pm_array_node_t *cast = (pm_array_node_t *) node;
             pm_node_list_destroy(parser, &cast->elements);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ARRAY_PATTERN_NODE: {
             pm_array_pattern_node_t *cast = (pm_array_pattern_node_t *) node;
             if (cast->constant != NULL) {
@@ -166,14 +166,14 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_list_destroy(parser, &cast->posts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ASSOC_NODE: {
             pm_assoc_node_t *cast = (pm_assoc_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->key);
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ASSOC_SPLAT_NODE: {
             pm_assoc_splat_node_t *cast = (pm_assoc_splat_node_t *) node;
             if (cast->value != NULL) {
@@ -181,11 +181,11 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BACK_REFERENCE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BEGIN_NODE: {
             pm_begin_node_t *cast = (pm_begin_node_t *) node;
             if (cast->statements != NULL) {
@@ -202,7 +202,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BLOCK_ARGUMENT_NODE: {
             pm_block_argument_node_t *cast = (pm_block_argument_node_t *) node;
             if (cast->expression != NULL) {
@@ -210,11 +210,11 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BLOCK_LOCAL_VARIABLE_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BLOCK_NODE: {
             pm_block_node_t *cast = (pm_block_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
@@ -226,11 +226,11 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BLOCK_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BLOCK_PARAMETERS_NODE: {
             pm_block_parameters_node_t *cast = (pm_block_parameters_node_t *) node;
             if (cast->parameters != NULL) {
@@ -239,7 +239,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_list_destroy(parser, &cast->locals);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_BREAK_NODE: {
             pm_break_node_t *cast = (pm_break_node_t *) node;
             if (cast->arguments != NULL) {
@@ -247,7 +247,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CALL_AND_WRITE_NODE: {
             pm_call_and_write_node_t *cast = (pm_call_and_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -256,7 +256,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CALL_NODE: {
             pm_call_node_t *cast = (pm_call_node_t *) node;
             if (cast->receiver != NULL) {
@@ -270,7 +270,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CALL_OPERATOR_WRITE_NODE: {
             pm_call_operator_write_node_t *cast = (pm_call_operator_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -279,7 +279,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CALL_OR_WRITE_NODE: {
             pm_call_or_write_node_t *cast = (pm_call_or_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -288,44 +288,44 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CALL_TARGET_NODE: {
             pm_call_target_node_t *cast = (pm_call_target_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->receiver);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CAPTURE_PATTERN_NODE: {
             pm_capture_pattern_node_t *cast = (pm_capture_pattern_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CASE_MATCH_NODE: {
             pm_case_match_node_t *cast = (pm_case_match_node_t *) node;
             if (cast->predicate != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->predicate);
             }
             pm_node_list_destroy(parser, &cast->conditions);
-            if (cast->consequent != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            if (cast->else_clause != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->else_clause);
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CASE_NODE: {
             pm_case_node_t *cast = (pm_case_node_t *) node;
             if (cast->predicate != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->predicate);
             }
             pm_node_list_destroy(parser, &cast->conditions);
-            if (cast->consequent != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            if (cast->else_clause != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->else_clause);
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_NODE: {
             pm_class_node_t *cast = (pm_class_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
@@ -338,64 +338,64 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_AND_WRITE_NODE: {
             pm_class_variable_and_write_node_t *cast = (pm_class_variable_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
             pm_class_variable_operator_write_node_t *cast = (pm_class_variable_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_OR_WRITE_NODE: {
             pm_class_variable_or_write_node_t *cast = (pm_class_variable_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_TARGET_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CLASS_VARIABLE_WRITE_NODE: {
             pm_class_variable_write_node_t *cast = (pm_class_variable_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_AND_WRITE_NODE: {
             pm_constant_and_write_node_t *cast = (pm_constant_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_OPERATOR_WRITE_NODE: {
             pm_constant_operator_write_node_t *cast = (pm_constant_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_OR_WRITE_NODE: {
             pm_constant_or_write_node_t *cast = (pm_constant_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_AND_WRITE_NODE: {
             pm_constant_path_and_write_node_t *cast = (pm_constant_path_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_NODE: {
             pm_constant_path_node_t *cast = (pm_constant_path_node_t *) node;
             if (cast->parent != NULL) {
@@ -403,21 +403,21 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
             pm_constant_path_operator_write_node_t *cast = (pm_constant_path_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_OR_WRITE_NODE: {
             pm_constant_path_or_write_node_t *cast = (pm_constant_path_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_TARGET_NODE: {
             pm_constant_path_target_node_t *cast = (pm_constant_path_target_node_t *) node;
             if (cast->parent != NULL) {
@@ -425,28 +425,28 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_PATH_WRITE_NODE: {
             pm_constant_path_write_node_t *cast = (pm_constant_path_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->target);
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_TARGET_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_CONSTANT_WRITE_NODE: {
             pm_constant_write_node_t *cast = (pm_constant_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_DEF_NODE: {
             pm_def_node_t *cast = (pm_def_node_t *) node;
             if (cast->receiver != NULL) {
@@ -461,13 +461,13 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_constant_id_list_free(&cast->locals);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_DEFINED_NODE: {
             pm_defined_node_t *cast = (pm_defined_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ELSE_NODE: {
             pm_else_node_t *cast = (pm_else_node_t *) node;
             if (cast->statements != NULL) {
@@ -475,7 +475,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_EMBEDDED_STATEMENTS_NODE: {
             pm_embedded_statements_node_t *cast = (pm_embedded_statements_node_t *) node;
             if (cast->statements != NULL) {
@@ -483,13 +483,13 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_EMBEDDED_VARIABLE_NODE: {
             pm_embedded_variable_node_t *cast = (pm_embedded_variable_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->variable);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_ENSURE_NODE: {
             pm_ensure_node_t *cast = (pm_ensure_node_t *) node;
             if (cast->statements != NULL) {
@@ -497,11 +497,11 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FALSE_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FIND_PATTERN_NODE: {
             pm_find_pattern_node_t *cast = (pm_find_pattern_node_t *) node;
             if (cast->constant != NULL) {
@@ -512,7 +512,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->right);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FLIP_FLOP_NODE: {
             pm_flip_flop_node_t *cast = (pm_flip_flop_node_t *) node;
             if (cast->left != NULL) {
@@ -523,11 +523,11 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FLOAT_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FOR_NODE: {
             pm_for_node_t *cast = (pm_for_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->index);
@@ -537,15 +537,15 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FORWARDING_ARGUMENTS_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FORWARDING_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_FORWARDING_SUPER_NODE: {
             pm_forwarding_super_node_t *cast = (pm_forwarding_super_node_t *) node;
             if (cast->block != NULL) {
@@ -553,45 +553,45 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_AND_WRITE_NODE: {
             pm_global_variable_and_write_node_t *cast = (pm_global_variable_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
             pm_global_variable_operator_write_node_t *cast = (pm_global_variable_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_OR_WRITE_NODE: {
             pm_global_variable_or_write_node_t *cast = (pm_global_variable_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_TARGET_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_GLOBAL_VARIABLE_WRITE_NODE: {
             pm_global_variable_write_node_t *cast = (pm_global_variable_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_HASH_NODE: {
             pm_hash_node_t *cast = (pm_hash_node_t *) node;
             pm_node_list_destroy(parser, &cast->elements);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_HASH_PATTERN_NODE: {
             pm_hash_pattern_node_t *cast = (pm_hash_pattern_node_t *) node;
             if (cast->constant != NULL) {
@@ -603,35 +603,35 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IF_NODE: {
             pm_if_node_t *cast = (pm_if_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->predicate);
             if (cast->statements != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->statements);
             }
-            if (cast->consequent != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            if (cast->subsequent != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->subsequent);
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IMAGINARY_NODE: {
             pm_imaginary_node_t *cast = (pm_imaginary_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->numeric);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IMPLICIT_NODE: {
             pm_implicit_node_t *cast = (pm_implicit_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IMPLICIT_REST_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IN_NODE: {
             pm_in_node_t *cast = (pm_in_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->pattern);
@@ -640,7 +640,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INDEX_AND_WRITE_NODE: {
             pm_index_and_write_node_t *cast = (pm_index_and_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -655,7 +655,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INDEX_OPERATOR_WRITE_NODE: {
             pm_index_operator_write_node_t *cast = (pm_index_operator_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -670,7 +670,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INDEX_OR_WRITE_NODE: {
             pm_index_or_write_node_t *cast = (pm_index_or_write_node_t *) node;
             if (cast->receiver != NULL) {
@@ -685,7 +685,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INDEX_TARGET_NODE: {
             pm_index_target_node_t *cast = (pm_index_target_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->receiver);
@@ -697,93 +697,93 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_AND_WRITE_NODE: {
             pm_instance_variable_and_write_node_t *cast = (pm_instance_variable_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
             pm_instance_variable_operator_write_node_t *cast = (pm_instance_variable_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_OR_WRITE_NODE: {
             pm_instance_variable_or_write_node_t *cast = (pm_instance_variable_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_TARGET_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INSTANCE_VARIABLE_WRITE_NODE: {
             pm_instance_variable_write_node_t *cast = (pm_instance_variable_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTEGER_NODE: {
             pm_integer_node_t *cast = (pm_integer_node_t *) node;
             pm_integer_free(&cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTERPOLATED_MATCH_LAST_LINE_NODE: {
             pm_interpolated_match_last_line_node_t *cast = (pm_interpolated_match_last_line_node_t *) node;
             pm_node_list_destroy(parser, &cast->parts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
             pm_interpolated_regular_expression_node_t *cast = (pm_interpolated_regular_expression_node_t *) node;
             pm_node_list_destroy(parser, &cast->parts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTERPOLATED_STRING_NODE: {
             pm_interpolated_string_node_t *cast = (pm_interpolated_string_node_t *) node;
             pm_node_list_destroy(parser, &cast->parts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTERPOLATED_SYMBOL_NODE: {
             pm_interpolated_symbol_node_t *cast = (pm_interpolated_symbol_node_t *) node;
             pm_node_list_destroy(parser, &cast->parts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_INTERPOLATED_X_STRING_NODE: {
             pm_interpolated_x_string_node_t *cast = (pm_interpolated_x_string_node_t *) node;
             pm_node_list_destroy(parser, &cast->parts);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IT_LOCAL_VARIABLE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_IT_PARAMETERS_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_KEYWORD_HASH_NODE: {
             pm_keyword_hash_node_t *cast = (pm_keyword_hash_node_t *) node;
             pm_node_list_destroy(parser, &cast->elements);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_KEYWORD_REST_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LAMBDA_NODE: {
             pm_lambda_node_t *cast = (pm_lambda_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
@@ -795,70 +795,70 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_AND_WRITE_NODE: {
             pm_local_variable_and_write_node_t *cast = (pm_local_variable_and_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
             pm_local_variable_operator_write_node_t *cast = (pm_local_variable_operator_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_OR_WRITE_NODE: {
             pm_local_variable_or_write_node_t *cast = (pm_local_variable_or_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_TARGET_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_LOCAL_VARIABLE_WRITE_NODE: {
             pm_local_variable_write_node_t *cast = (pm_local_variable_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MATCH_LAST_LINE_NODE: {
             pm_match_last_line_node_t *cast = (pm_match_last_line_node_t *) node;
             pm_string_free(&cast->unescaped);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MATCH_PREDICATE_NODE: {
             pm_match_predicate_node_t *cast = (pm_match_predicate_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             pm_node_destroy(parser, (pm_node_t *)cast->pattern);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MATCH_REQUIRED_NODE: {
             pm_match_required_node_t *cast = (pm_match_required_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             pm_node_destroy(parser, (pm_node_t *)cast->pattern);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MATCH_WRITE_NODE: {
             pm_match_write_node_t *cast = (pm_match_write_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->call);
             pm_node_list_destroy(parser, &cast->targets);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MISSING_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MODULE_NODE: {
             pm_module_node_t *cast = (pm_module_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
@@ -868,7 +868,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MULTI_TARGET_NODE: {
             pm_multi_target_node_t *cast = (pm_multi_target_node_t *) node;
             pm_node_list_destroy(parser, &cast->lefts);
@@ -878,7 +878,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_list_destroy(parser, &cast->rights);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_MULTI_WRITE_NODE: {
             pm_multi_write_node_t *cast = (pm_multi_write_node_t *) node;
             pm_node_list_destroy(parser, &cast->lefts);
@@ -889,7 +889,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_NEXT_NODE: {
             pm_next_node_t *cast = (pm_next_node_t *) node;
             if (cast->arguments != NULL) {
@@ -897,42 +897,42 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_NIL_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_NO_KEYWORDS_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_NUMBERED_PARAMETERS_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_NUMBERED_REFERENCE_READ_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_OPTIONAL_KEYWORD_PARAMETER_NODE: {
             pm_optional_keyword_parameter_node_t *cast = (pm_optional_keyword_parameter_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_OPTIONAL_PARAMETER_NODE: {
             pm_optional_parameter_node_t *cast = (pm_optional_parameter_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->value);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_OR_NODE: {
             pm_or_node_t *cast = (pm_or_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->left);
             pm_node_destroy(parser, (pm_node_t *)cast->right);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PARAMETERS_NODE: {
             pm_parameters_node_t *cast = (pm_parameters_node_t *) node;
             pm_node_list_destroy(parser, &cast->requireds);
@@ -950,7 +950,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PARENTHESES_NODE: {
             pm_parentheses_node_t *cast = (pm_parentheses_node_t *) node;
             if (cast->body != NULL) {
@@ -958,19 +958,19 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PINNED_EXPRESSION_NODE: {
             pm_pinned_expression_node_t *cast = (pm_pinned_expression_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->expression);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PINNED_VARIABLE_NODE: {
             pm_pinned_variable_node_t *cast = (pm_pinned_variable_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->variable);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_POST_EXECUTION_NODE: {
             pm_post_execution_node_t *cast = (pm_post_execution_node_t *) node;
             if (cast->statements != NULL) {
@@ -978,7 +978,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PRE_EXECUTION_NODE: {
             pm_pre_execution_node_t *cast = (pm_pre_execution_node_t *) node;
             if (cast->statements != NULL) {
@@ -986,14 +986,14 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_PROGRAM_NODE: {
             pm_program_node_t *cast = (pm_program_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
             pm_node_destroy(parser, (pm_node_t *)cast->statements);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RANGE_NODE: {
             pm_range_node_t *cast = (pm_range_node_t *) node;
             if (cast->left != NULL) {
@@ -1004,39 +1004,39 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RATIONAL_NODE: {
             pm_rational_node_t *cast = (pm_rational_node_t *) node;
             pm_integer_free(&cast->numerator);
             pm_integer_free(&cast->denominator);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_REDO_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_REGULAR_EXPRESSION_NODE: {
             pm_regular_expression_node_t *cast = (pm_regular_expression_node_t *) node;
             pm_string_free(&cast->unescaped);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_REQUIRED_KEYWORD_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_REQUIRED_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RESCUE_MODIFIER_NODE: {
             pm_rescue_modifier_node_t *cast = (pm_rescue_modifier_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->expression);
             pm_node_destroy(parser, (pm_node_t *)cast->rescue_expression);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RESCUE_NODE: {
             pm_rescue_node_t *cast = (pm_rescue_node_t *) node;
             pm_node_list_destroy(parser, &cast->exceptions);
@@ -1046,20 +1046,20 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             if (cast->statements != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->statements);
             }
-            if (cast->consequent != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            if (cast->subsequent != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->subsequent);
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_REST_PARAMETER_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RETRY_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_RETURN_NODE: {
             pm_return_node_t *cast = (pm_return_node_t *) node;
             if (cast->arguments != NULL) {
@@ -1067,17 +1067,17 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SELF_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SHAREABLE_CONSTANT_NODE: {
             pm_shareable_constant_node_t *cast = (pm_shareable_constant_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->write);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SINGLETON_CLASS_NODE: {
             pm_singleton_class_node_t *cast = (pm_singleton_class_node_t *) node;
             pm_constant_id_list_free(&cast->locals);
@@ -1087,21 +1087,21 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SOURCE_ENCODING_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SOURCE_FILE_NODE: {
             pm_source_file_node_t *cast = (pm_source_file_node_t *) node;
             pm_string_free(&cast->filepath);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SOURCE_LINE_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SPLAT_NODE: {
             pm_splat_node_t *cast = (pm_splat_node_t *) node;
             if (cast->expression != NULL) {
@@ -1109,19 +1109,19 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_STATEMENTS_NODE: {
             pm_statements_node_t *cast = (pm_statements_node_t *) node;
             pm_node_list_destroy(parser, &cast->body);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_STRING_NODE: {
             pm_string_node_t *cast = (pm_string_node_t *) node;
             pm_string_free(&cast->unescaped);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SUPER_NODE: {
             pm_super_node_t *cast = (pm_super_node_t *) node;
             if (cast->arguments != NULL) {
@@ -1132,35 +1132,35 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_SYMBOL_NODE: {
             pm_symbol_node_t *cast = (pm_symbol_node_t *) node;
             pm_string_free(&cast->unescaped);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_TRUE_NODE: {
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_UNDEF_NODE: {
             pm_undef_node_t *cast = (pm_undef_node_t *) node;
             pm_node_list_destroy(parser, &cast->names);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_UNLESS_NODE: {
             pm_unless_node_t *cast = (pm_unless_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->predicate);
             if (cast->statements != NULL) {
                 pm_node_destroy(parser, (pm_node_t *)cast->statements);
             }
-            if (cast->consequent != NULL) {
-                pm_node_destroy(parser, (pm_node_t *)cast->consequent);
+            if (cast->else_clause != NULL) {
+                pm_node_destroy(parser, (pm_node_t *)cast->else_clause);
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_UNTIL_NODE: {
             pm_until_node_t *cast = (pm_until_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->predicate);
@@ -1169,7 +1169,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_WHEN_NODE: {
             pm_when_node_t *cast = (pm_when_node_t *) node;
             pm_node_list_destroy(parser, &cast->conditions);
@@ -1178,7 +1178,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_WHILE_NODE: {
             pm_while_node_t *cast = (pm_while_node_t *) node;
             pm_node_destroy(parser, (pm_node_t *)cast->predicate);
@@ -1187,13 +1187,13 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_X_STRING_NODE: {
             pm_x_string_node_t *cast = (pm_x_string_node_t *) node;
             pm_string_free(&cast->unescaped);
             break;
         }
-#line 110 "node.c.erb"
+#line 110 "prism/templates/src/node.c.erb"
         case PM_YIELD_NODE: {
             pm_yield_node_t *cast = (pm_yield_node_t *) node;
             if (cast->arguments != NULL) {
@@ -1201,7 +1201,7 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
             }
             break;
         }
-#line 139 "node.c.erb"
+#line 139 "prism/templates/src/node.c.erb"
         default:
             assert(false && "unreachable");
             break;
@@ -1831,9 +1831,9 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node(conditions->nodes[index], visitor, data);
             }
 
-            // Visit the consequent field
-            if (cast->consequent != NULL) {
-                pm_visit_node((const pm_node_t *) cast->consequent, visitor, data);
+            // Visit the else_clause field
+            if (cast->else_clause != NULL) {
+                pm_visit_node((const pm_node_t *) cast->else_clause, visitor, data);
             }
 
             break;
@@ -1852,9 +1852,9 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node(conditions->nodes[index], visitor, data);
             }
 
-            // Visit the consequent field
-            if (cast->consequent != NULL) {
-                pm_visit_node((const pm_node_t *) cast->consequent, visitor, data);
+            // Visit the else_clause field
+            if (cast->else_clause != NULL) {
+                pm_visit_node((const pm_node_t *) cast->else_clause, visitor, data);
             }
 
             break;
@@ -2229,9 +2229,9 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node((const pm_node_t *) cast->statements, visitor, data);
             }
 
-            // Visit the consequent field
-            if (cast->consequent != NULL) {
-                pm_visit_node((const pm_node_t *) cast->consequent, visitor, data);
+            // Visit the subsequent field
+            if (cast->subsequent != NULL) {
+                pm_visit_node((const pm_node_t *) cast->subsequent, visitor, data);
             }
 
             break;
@@ -2813,9 +2813,9 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node((const pm_node_t *) cast->statements, visitor, data);
             }
 
-            // Visit the consequent field
-            if (cast->consequent != NULL) {
-                pm_visit_node((const pm_node_t *) cast->consequent, visitor, data);
+            // Visit the subsequent field
+            if (cast->subsequent != NULL) {
+                pm_visit_node((const pm_node_t *) cast->subsequent, visitor, data);
             }
 
             break;
@@ -2927,9 +2927,9 @@ pm_visit_child_nodes(const pm_node_t *node, bool (*visitor)(const pm_node_t *nod
                 pm_visit_node((const pm_node_t *) cast->statements, visitor, data);
             }
 
-            // Visit the consequent field
-            if (cast->consequent != NULL) {
-                pm_visit_node((const pm_node_t *) cast->consequent, visitor, data);
+            // Visit the else_clause field
+            if (cast->else_clause != NULL) {
+                pm_visit_node((const pm_node_t *) cast->else_clause, visitor, data);
             }
 
             break;
@@ -3120,9 +3120,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_arguments_node_t *cast = (const pm_arguments_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ArgumentsNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ArgumentsNodeFlags\":", 21);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_KEYWORDS)) {
@@ -3135,6 +3135,11 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
                 pm_buffer_append_string(buffer, "\"CONTAINS_KEYWORD_SPLAT\"", 24);
                 flags++;
             }
+            if (PM_NODE_FLAG_P(cast, PM_ARGUMENTS_NODE_FLAGS_CONTAINS_SPLAT)) {
+                if (flags != 0) pm_buffer_append_byte(buffer, ',');
+                pm_buffer_append_string(buffer, "\"CONTAINS_SPLAT\"", 16);
+                flags++;
+            }
             pm_buffer_append_byte(buffer, ']');
 
             // Dump the arguments field
@@ -3158,9 +3163,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_array_node_t *cast = (const pm_array_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ArrayNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ArrayNodeFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_ARRAY_NODE_FLAGS_CONTAINS_SPLAT)) {
@@ -3429,9 +3434,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_block_local_variable_node_t *cast = (const pm_block_local_variable_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -3504,9 +3509,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_block_parameter_node_t *cast = (const pm_block_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -3619,9 +3624,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_call_and_write_node_t *cast = (const pm_call_and_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -3702,9 +3707,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_call_node_t *cast = (const pm_call_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -3806,9 +3811,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_call_operator_write_node_t *cast = (const pm_call_operator_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -3894,9 +3899,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_call_or_write_node_t *cast = (const pm_call_or_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -3977,9 +3982,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_call_target_node_t *cast = (const pm_call_target_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -4078,11 +4083,11 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             }
             pm_buffer_append_byte(buffer, ']');
 
-            // Dump the consequent field
+            // Dump the else_clause field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"consequent\":", 13);
-            if (cast->consequent != NULL) {
-                pm_dump_json(buffer, parser, (const pm_node_t *) cast->consequent);
+            pm_buffer_append_string(buffer, "\"else_clause\":", 14);
+            if (cast->else_clause != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast->else_clause);
             } else {
                 pm_buffer_append_string(buffer, "null", 4);
             }
@@ -4127,11 +4132,11 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             }
             pm_buffer_append_byte(buffer, ']');
 
-            // Dump the consequent field
+            // Dump the else_clause field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"consequent\":", 13);
-            if (cast->consequent != NULL) {
-                pm_dump_json(buffer, parser, (const pm_node_t *) cast->consequent);
+            pm_buffer_append_string(buffer, "\"else_clause\":", 14);
+            if (cast->else_clause != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast->else_clause);
             } else {
                 pm_buffer_append_string(buffer, "null", 4);
             }
@@ -5015,9 +5020,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_flip_flop_node_t *cast = (const pm_flip_flop_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RangeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RangeFlags\":", 13);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_RANGE_FLAGS_EXCLUDE_END)) {
@@ -5430,11 +5435,11 @@ 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 consequent field
+            // Dump the subsequent field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"consequent\":", 13);
-            if (cast->consequent != NULL) {
-                pm_dump_json(buffer, parser, (const pm_node_t *) cast->consequent);
+            pm_buffer_append_string(buffer, "\"subsequent\":", 13);
+            if (cast->subsequent != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast->subsequent);
             } else {
                 pm_buffer_append_string(buffer, "null", 4);
             }
@@ -5531,9 +5536,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_index_and_write_node_t *cast = (const pm_index_and_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -5623,9 +5628,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_index_operator_write_node_t *cast = (const pm_index_operator_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -5720,9 +5725,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_index_or_write_node_t *cast = (const pm_index_or_write_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -5812,9 +5817,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_index_target_node_t *cast = (const pm_index_target_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the CallNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"CallNodeFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_CALL_NODE_FLAGS_SAFE_NAVIGATION)) {
@@ -6030,9 +6035,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_integer_node_t *cast = (const pm_integer_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the IntegerBaseFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"IntegerBaseFlags\":", 19);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_INTEGER_BASE_FLAGS_BINARY)) {
@@ -6071,9 +6076,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_interpolated_match_last_line_node_t *cast = (const pm_interpolated_match_last_line_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RegularExpressionFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RegularExpressionFlags\":", 25);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) {
@@ -6164,9 +6169,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_interpolated_regular_expression_node_t *cast = (const pm_interpolated_regular_expression_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RegularExpressionFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RegularExpressionFlags\":", 25);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) {
@@ -6257,9 +6262,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_interpolated_string_node_t *cast = (const pm_interpolated_string_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the InterpolatedStringNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"InterpolatedStringNodeFlags\":", 30);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN)) {
@@ -6401,9 +6406,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_keyword_hash_node_t *cast = (const pm_keyword_hash_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the KeywordHashNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"KeywordHashNodeFlags\":", 23);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS)) {
@@ -6434,9 +6439,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_keyword_rest_parameter_node_t *cast = (const pm_keyword_rest_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -6711,9 +6716,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_match_last_line_node_t *cast = (const pm_match_last_line_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RegularExpressionFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RegularExpressionFlags\":", 25);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) {
@@ -7147,9 +7152,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_optional_keyword_parameter_node_t *cast = (const pm_optional_keyword_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -7183,9 +7188,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_optional_parameter_node_t *cast = (const pm_optional_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -7500,9 +7505,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_range_node_t *cast = (const pm_range_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RangeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RangeFlags\":", 13);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_RANGE_FLAGS_EXCLUDE_END)) {
@@ -7544,9 +7549,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_rational_node_t *cast = (const pm_rational_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the IntegerBaseFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"IntegerBaseFlags\":", 19);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_INTEGER_BASE_FLAGS_BINARY)) {
@@ -7599,9 +7604,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_regular_expression_node_t *cast = (const pm_regular_expression_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the RegularExpressionFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"RegularExpressionFlags\":", 25);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE)) {
@@ -7693,9 +7698,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_required_keyword_parameter_node_t *cast = (const pm_required_keyword_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -7724,9 +7729,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_required_parameter_node_t *cast = (const pm_required_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -7818,11 +7823,11 @@ 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 consequent field
+            // Dump the subsequent field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"consequent\":", 13);
-            if (cast->consequent != NULL) {
-                pm_dump_json(buffer, parser, (const pm_node_t *) cast->consequent);
+            pm_buffer_append_string(buffer, "\"subsequent\":", 13);
+            if (cast->subsequent != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast->subsequent);
             } else {
                 pm_buffer_append_string(buffer, "null", 4);
             }
@@ -7836,9 +7841,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_rest_parameter_node_t *cast = (const pm_rest_parameter_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ParameterFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ParameterFlags\":", 17);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_PARAMETER_FLAGS_REPEATED_PARAMETER)) {
@@ -7889,18 +7894,6 @@ 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);
@@ -7933,9 +7926,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_shareable_constant_node_t *cast = (const pm_shareable_constant_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the ShareableConstantNodeFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"ShareableConstantNodeFlags\":", 29);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_SHAREABLE_CONSTANT_NODE_FLAGS_LITERAL)) {
@@ -8028,9 +8021,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_source_file_node_t *cast = (const pm_source_file_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the StringFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"StringFlags\":", 14);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_STRING_FLAGS_FORCED_UTF8_ENCODING)) {
@@ -8125,9 +8118,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_string_node_t *cast = (const pm_string_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the StringFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"StringFlags\":", 14);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_STRING_FLAGS_FORCED_UTF8_ENCODING)) {
@@ -8242,9 +8235,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_symbol_node_t *cast = (const pm_symbol_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the SymbolFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"SymbolFlags\":", 14);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_SYMBOL_FLAGS_FORCED_UTF8_ENCODING)) {
@@ -8371,11 +8364,11 @@ 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 consequent field
+            // Dump the else_clause field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"consequent\":", 13);
-            if (cast->consequent != NULL) {
-                pm_dump_json(buffer, parser, (const pm_node_t *) cast->consequent);
+            pm_buffer_append_string(buffer, "\"else_clause\":", 14);
+            if (cast->else_clause != NULL) {
+                pm_dump_json(buffer, parser, (const pm_node_t *) cast->else_clause);
             } else {
                 pm_buffer_append_string(buffer, "null", 4);
             }
@@ -8398,9 +8391,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_until_node_t *cast = (const pm_until_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the LoopFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"LoopFlags\":", 12);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_LOOP_FLAGS_BEGIN_MODIFIER)) {
@@ -8491,9 +8484,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_while_node_t *cast = (const pm_while_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the LoopFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"LoopFlags\":", 12);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_LOOP_FLAGS_BEGIN_MODIFIER)) {
@@ -8540,9 +8533,9 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             const pm_x_string_node_t *cast = (const pm_x_string_node_t *) node;
             pm_dump_json_location(buffer, parser, &cast->base.location);
 
-            // Dump the flags field
+            // Dump the EncodingFlags field
             pm_buffer_append_byte(buffer, ',');
-            pm_buffer_append_string(buffer, "\"flags\":", 8);
+            pm_buffer_append_string(buffer, "\"EncodingFlags\":", 16);
             size_t flags = 0;
             pm_buffer_append_byte(buffer, '[');
             if (PM_NODE_FLAG_P(cast, PM_ENCODING_FLAGS_FORCED_UTF8_ENCODING)) {