prism 0.29.0 → 1.3.0

data/src/serialize.c

@@ -1,10 +1,10 @@
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually. See                                                  */
 /* templates/src/serialize.c.erb                                              */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
-/******************************************************************************/
+/*----------------------------------------------------------------------------*/
 
 #include "prism.h"
 
@@ -82,6 +82,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
 
     size_t offset = buffer->length;
 
+    pm_buffer_append_varuint(buffer, node->node_id);
     pm_serialize_location(parser, &node->location, buffer);
 
     switch (PM_NODE_TYPE(node)) {
@@ -90,31 +91,35 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
         case PM_SCOPE_NODE:
             return;
         case PM_ALIAS_GLOBAL_VARIABLE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_alias_global_variable_node_t *)node)->new_name, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_alias_global_variable_node_t *)node)->old_name, buffer);
             pm_serialize_location(parser, &((pm_alias_global_variable_node_t *)node)->keyword_loc, buffer);
             break;
         }
         case PM_ALIAS_METHOD_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_alias_method_node_t *)node)->new_name, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_alias_method_node_t *)node)->old_name, buffer);
             pm_serialize_location(parser, &((pm_alias_method_node_t *)node)->keyword_loc, buffer);
             break;
         }
         case PM_ALTERNATION_PATTERN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_alternation_pattern_node_t *)node)->left, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_alternation_pattern_node_t *)node)->right, buffer);
             pm_serialize_location(parser, &((pm_alternation_pattern_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_AND_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_and_node_t *)node)->left, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_and_node_t *)node)->right, buffer);
             pm_serialize_location(parser, &((pm_and_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_ARGUMENTS_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t arguments_size = pm_sizet_to_u32(((pm_arguments_node_t *)node)->arguments.size);
             pm_buffer_append_varuint(buffer, arguments_size);
             for (uint32_t index = 0; index < arguments_size; index++) {
@@ -123,7 +128,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_ARRAY_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t elements_size = pm_sizet_to_u32(((pm_array_node_t *)node)->elements.size);
             pm_buffer_append_varuint(buffer, elements_size);
             for (uint32_t index = 0; index < elements_size; index++) {
@@ -144,6 +149,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_ARRAY_PATTERN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_array_pattern_node_t *)node)->constant == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -179,6 +185,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_ASSOC_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_assoc_node_t *)node)->key, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_assoc_node_t *)node)->value, buffer);
             if (((pm_assoc_node_t *)node)->operator_loc.start == NULL) {
@@ -190,6 +197,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_ASSOC_SPLAT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_assoc_splat_node_t *)node)->value == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -199,10 +207,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BACK_REFERENCE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_back_reference_read_node_t *)node)->name));
             break;
         }
         case PM_BEGIN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_begin_node_t *)node)->begin_keyword_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -238,6 +248,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BLOCK_ARGUMENT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_block_argument_node_t *)node)->expression == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -247,11 +258,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BLOCK_LOCAL_VARIABLE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_block_local_variable_node_t *)node)->name));
             break;
         }
         case PM_BLOCK_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_block_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -272,7 +284,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BLOCK_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_block_parameter_node_t *)node)->name));
             if (((pm_block_parameter_node_t *)node)->name_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -284,6 +296,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BLOCK_PARAMETERS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_block_parameters_node_t *)node)->parameters == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -309,6 +322,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_BREAK_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_break_node_t *)node)->arguments == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -318,7 +332,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CALL_AND_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_call_and_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -343,7 +357,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CALL_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_call_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -387,7 +401,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CALL_OPERATOR_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_call_operator_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -413,7 +427,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CALL_OR_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_call_or_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -438,7 +452,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CALL_TARGET_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_call_target_node_t *)node)->receiver, buffer);
             pm_serialize_location(parser, &((pm_call_target_node_t *)node)->call_operator_loc, buffer);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_call_target_node_t *)node)->name));
@@ -446,12 +460,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CAPTURE_PATTERN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_capture_pattern_node_t *)node)->value, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_capture_pattern_node_t *)node)->target, buffer);
             pm_serialize_location(parser, &((pm_capture_pattern_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_CASE_MATCH_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_case_match_node_t *)node)->predicate == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -462,16 +478,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             for (uint32_t index = 0; index < conditions_size; index++) {
                 pm_serialize_node(parser, (pm_node_t *) ((pm_case_match_node_t *)node)->conditions.nodes[index], buffer);
             }
-            if (((pm_case_match_node_t *)node)->consequent == NULL) {
+            if (((pm_case_match_node_t *)node)->else_clause == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_case_match_node_t *)node)->consequent, buffer);
+                pm_serialize_node(parser, (pm_node_t *)((pm_case_match_node_t *)node)->else_clause, buffer);
             }
             pm_serialize_location(parser, &((pm_case_match_node_t *)node)->case_keyword_loc, buffer);
             pm_serialize_location(parser, &((pm_case_match_node_t *)node)->end_keyword_loc, buffer);
             break;
         }
         case PM_CASE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_case_node_t *)node)->predicate == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -482,16 +499,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             for (uint32_t index = 0; index < conditions_size; index++) {
                 pm_serialize_node(parser, (pm_node_t *) ((pm_case_node_t *)node)->conditions.nodes[index], buffer);
             }
-            if (((pm_case_node_t *)node)->consequent == NULL) {
+            if (((pm_case_node_t *)node)->else_clause == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_case_node_t *)node)->consequent, buffer);
+                pm_serialize_node(parser, (pm_node_t *)((pm_case_node_t *)node)->else_clause, buffer);
             }
             pm_serialize_location(parser, &((pm_case_node_t *)node)->case_keyword_loc, buffer);
             pm_serialize_location(parser, &((pm_case_node_t *)node)->end_keyword_loc, buffer);
             break;
         }
         case PM_CLASS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_class_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -520,6 +538,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CLASS_VARIABLE_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_and_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_class_variable_and_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_class_variable_and_write_node_t *)node)->operator_loc, buffer);
@@ -527,6 +546,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_operator_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_class_variable_operator_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_class_variable_operator_write_node_t *)node)->binary_operator_loc, buffer);
@@ -535,6 +555,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CLASS_VARIABLE_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_or_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_class_variable_or_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_class_variable_or_write_node_t *)node)->operator_loc, buffer);
@@ -542,14 +563,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CLASS_VARIABLE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_read_node_t *)node)->name));
             break;
         }
         case PM_CLASS_VARIABLE_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_target_node_t *)node)->name));
             break;
         }
         case PM_CLASS_VARIABLE_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_class_variable_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_class_variable_write_node_t *)node)->name_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_class_variable_write_node_t *)node)->value, buffer);
@@ -557,6 +581,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_and_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_constant_and_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_constant_and_write_node_t *)node)->operator_loc, buffer);
@@ -564,6 +589,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_operator_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_constant_operator_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_constant_operator_write_node_t *)node)->binary_operator_loc, buffer);
@@ -572,6 +598,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_or_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_constant_or_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_constant_or_write_node_t *)node)->operator_loc, buffer);
@@ -579,12 +606,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_PATH_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_and_write_node_t *)node)->target, buffer);
             pm_serialize_location(parser, &((pm_constant_path_and_write_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_and_write_node_t *)node)->value, buffer);
             break;
         }
         case PM_CONSTANT_PATH_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_constant_path_node_t *)node)->parent == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -596,6 +625,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_operator_write_node_t *)node)->target, buffer);
             pm_serialize_location(parser, &((pm_constant_path_operator_write_node_t *)node)->binary_operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_operator_write_node_t *)node)->value, buffer);
@@ -603,12 +633,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_PATH_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_or_write_node_t *)node)->target, buffer);
             pm_serialize_location(parser, &((pm_constant_path_or_write_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_or_write_node_t *)node)->value, buffer);
             break;
         }
         case PM_CONSTANT_PATH_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_constant_path_target_node_t *)node)->parent == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -620,20 +652,24 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_CONSTANT_PATH_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_write_node_t *)node)->target, buffer);
             pm_serialize_location(parser, &((pm_constant_path_write_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_path_write_node_t *)node)->value, buffer);
             break;
         }
         case PM_CONSTANT_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_read_node_t *)node)->name));
             break;
         }
         case PM_CONSTANT_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_target_node_t *)node)->name));
             break;
         }
         case PM_CONSTANT_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_constant_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_constant_write_node_t *)node)->name_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_constant_write_node_t *)node)->value, buffer);
@@ -645,6 +681,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             // encoding of location u32s make us need to save this offset.
             size_t length_offset = buffer->length;
             pm_buffer_append_string(buffer, "\0\0\0\0", 4); /* consume 4 bytes, updated below */
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_def_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_def_node_t *)node)->name_loc, buffer);
             if (((pm_def_node_t *)node)->receiver == NULL) {
@@ -704,6 +741,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_DEFINED_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_defined_node_t *)node)->lparen_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -721,6 +759,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_ELSE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_else_node_t *)node)->else_keyword_loc, buffer);
             if (((pm_else_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -736,6 +775,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_EMBEDDED_STATEMENTS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_embedded_statements_node_t *)node)->opening_loc, buffer);
             if (((pm_embedded_statements_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -746,11 +786,13 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_EMBEDDED_VARIABLE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_embedded_variable_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_embedded_variable_node_t *)node)->variable, buffer);
             break;
         }
         case PM_ENSURE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_ensure_node_t *)node)->ensure_keyword_loc, buffer);
             if (((pm_ensure_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -761,9 +803,11 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_FALSE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_FIND_PATTERN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_find_pattern_node_t *)node)->constant == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -791,7 +835,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_FLIP_FLOP_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_flip_flop_node_t *)node)->left == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -806,10 +850,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_FLOAT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_double(buffer, ((pm_float_node_t *)node)->value);
             break;
         }
         case PM_FOR_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_for_node_t *)node)->index, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_for_node_t *)node)->collection, buffer);
             if (((pm_for_node_t *)node)->statements == NULL) {
@@ -829,12 +875,15 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_FORWARDING_ARGUMENTS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_FORWARDING_PARAMETER_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_FORWARDING_SUPER_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_forwarding_super_node_t *)node)->block == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -843,6 +892,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_GLOBAL_VARIABLE_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_and_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_global_variable_and_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_global_variable_and_write_node_t *)node)->operator_loc, buffer);
@@ -850,6 +900,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_operator_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_global_variable_operator_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_global_variable_operator_write_node_t *)node)->binary_operator_loc, buffer);
@@ -858,6 +909,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_GLOBAL_VARIABLE_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_or_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_global_variable_or_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_global_variable_or_write_node_t *)node)->operator_loc, buffer);
@@ -865,14 +917,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_GLOBAL_VARIABLE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_read_node_t *)node)->name));
             break;
         }
         case PM_GLOBAL_VARIABLE_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_target_node_t *)node)->name));
             break;
         }
         case PM_GLOBAL_VARIABLE_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_global_variable_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_global_variable_write_node_t *)node)->name_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_global_variable_write_node_t *)node)->value, buffer);
@@ -880,6 +935,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_HASH_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_hash_node_t *)node)->opening_loc, buffer);
             uint32_t elements_size = pm_sizet_to_u32(((pm_hash_node_t *)node)->elements.size);
             pm_buffer_append_varuint(buffer, elements_size);
@@ -890,6 +946,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_HASH_PATTERN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_hash_pattern_node_t *)node)->constant == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -920,6 +977,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_IF_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_if_node_t *)node)->if_keyword_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -938,10 +996,10 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             } else {
                 pm_serialize_node(parser, (pm_node_t *)((pm_if_node_t *)node)->statements, buffer);
             }
-            if (((pm_if_node_t *)node)->consequent == NULL) {
+            if (((pm_if_node_t *)node)->subsequent == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_if_node_t *)node)->consequent, buffer);
+                pm_serialize_node(parser, (pm_node_t *)((pm_if_node_t *)node)->subsequent, buffer);
             }
             if (((pm_if_node_t *)node)->end_keyword_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -952,17 +1010,21 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_IMAGINARY_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_imaginary_node_t *)node)->numeric, buffer);
             break;
         }
         case PM_IMPLICIT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_implicit_node_t *)node)->value, buffer);
             break;
         }
         case PM_IMPLICIT_REST_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_IN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_in_node_t *)node)->pattern, buffer);
             if (((pm_in_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -979,7 +1041,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INDEX_AND_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_index_and_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1008,7 +1070,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INDEX_OPERATOR_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_index_operator_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1038,7 +1100,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INDEX_OR_WRITE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_index_or_write_node_t *)node)->receiver == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1067,7 +1129,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INDEX_TARGET_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_index_target_node_t *)node)->receiver, buffer);
             pm_serialize_location(parser, &((pm_index_target_node_t *)node)->opening_loc, buffer);
             if (((pm_index_target_node_t *)node)->arguments == NULL) {
@@ -1084,6 +1146,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_and_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_instance_variable_and_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_instance_variable_and_write_node_t *)node)->operator_loc, buffer);
@@ -1091,6 +1154,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_operator_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_instance_variable_operator_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_instance_variable_operator_write_node_t *)node)->binary_operator_loc, buffer);
@@ -1099,6 +1163,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INSTANCE_VARIABLE_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_or_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_instance_variable_or_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_instance_variable_or_write_node_t *)node)->operator_loc, buffer);
@@ -1106,14 +1171,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INSTANCE_VARIABLE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_read_node_t *)node)->name));
             break;
         }
         case PM_INSTANCE_VARIABLE_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_target_node_t *)node)->name));
             break;
         }
         case PM_INSTANCE_VARIABLE_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_instance_variable_write_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_instance_variable_write_node_t *)node)->name_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_instance_variable_write_node_t *)node)->value, buffer);
@@ -1121,12 +1189,12 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INTEGER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_integer(&((pm_integer_node_t *)node)->value, buffer);
             break;
         }
         case PM_INTERPOLATED_MATCH_LAST_LINE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_interpolated_match_last_line_node_t *)node)->opening_loc, buffer);
             uint32_t parts_size = pm_sizet_to_u32(((pm_interpolated_match_last_line_node_t *)node)->parts.size);
             pm_buffer_append_varuint(buffer, parts_size);
@@ -1137,7 +1205,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_interpolated_regular_expression_node_t *)node)->opening_loc, buffer);
             uint32_t parts_size = pm_sizet_to_u32(((pm_interpolated_regular_expression_node_t *)node)->parts.size);
             pm_buffer_append_varuint(buffer, parts_size);
@@ -1148,7 +1216,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INTERPOLATED_STRING_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_interpolated_string_node_t *)node)->opening_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1169,6 +1237,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INTERPOLATED_SYMBOL_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_interpolated_symbol_node_t *)node)->opening_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1189,6 +1258,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_INTERPOLATED_X_STRING_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_interpolated_x_string_node_t *)node)->opening_loc, buffer);
             uint32_t parts_size = pm_sizet_to_u32(((pm_interpolated_x_string_node_t *)node)->parts.size);
             pm_buffer_append_varuint(buffer, parts_size);
@@ -1198,11 +1268,16 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             pm_serialize_location(parser, &((pm_interpolated_x_string_node_t *)node)->closing_loc, buffer);
             break;
         }
+        case PM_IT_LOCAL_VARIABLE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
+            break;
+        }
         case PM_IT_PARAMETERS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_KEYWORD_HASH_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t elements_size = pm_sizet_to_u32(((pm_keyword_hash_node_t *)node)->elements.size);
             pm_buffer_append_varuint(buffer, elements_size);
             for (uint32_t index = 0; index < elements_size; index++) {
@@ -1211,7 +1286,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_KEYWORD_REST_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_keyword_rest_parameter_node_t *)node)->name));
             if (((pm_keyword_rest_parameter_node_t *)node)->name_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1223,6 +1298,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_LAMBDA_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_lambda_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -1244,6 +1320,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_LOCAL_VARIABLE_AND_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_local_variable_and_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_local_variable_and_write_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_local_variable_and_write_node_t *)node)->value, buffer);
@@ -1252,6 +1329,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_local_variable_operator_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_local_variable_operator_write_node_t *)node)->binary_operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_local_variable_operator_write_node_t *)node)->value, buffer);
@@ -1261,6 +1339,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_LOCAL_VARIABLE_OR_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_local_variable_or_write_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_local_variable_or_write_node_t *)node)->operator_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_local_variable_or_write_node_t *)node)->value, buffer);
@@ -1269,16 +1348,19 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_LOCAL_VARIABLE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_local_variable_read_node_t *)node)->name));
             pm_buffer_append_varuint(buffer, ((pm_local_variable_read_node_t *)node)->depth);
             break;
         }
         case PM_LOCAL_VARIABLE_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_local_variable_target_node_t *)node)->name));
             pm_buffer_append_varuint(buffer, ((pm_local_variable_target_node_t *)node)->depth);
             break;
         }
         case PM_LOCAL_VARIABLE_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_local_variable_write_node_t *)node)->name));
             pm_buffer_append_varuint(buffer, ((pm_local_variable_write_node_t *)node)->depth);
             pm_serialize_location(parser, &((pm_local_variable_write_node_t *)node)->name_loc, buffer);
@@ -1287,7 +1369,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_MATCH_LAST_LINE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_match_last_line_node_t *)node)->opening_loc, buffer);
             pm_serialize_location(parser, &((pm_match_last_line_node_t *)node)->content_loc, buffer);
             pm_serialize_location(parser, &((pm_match_last_line_node_t *)node)->closing_loc, buffer);
@@ -1295,18 +1377,21 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_MATCH_PREDICATE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_match_predicate_node_t *)node)->value, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_match_predicate_node_t *)node)->pattern, buffer);
             pm_serialize_location(parser, &((pm_match_predicate_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_MATCH_REQUIRED_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_match_required_node_t *)node)->value, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_match_required_node_t *)node)->pattern, buffer);
             pm_serialize_location(parser, &((pm_match_required_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_MATCH_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_match_write_node_t *)node)->call, buffer);
             uint32_t targets_size = pm_sizet_to_u32(((pm_match_write_node_t *)node)->targets.size);
             pm_buffer_append_varuint(buffer, targets_size);
@@ -1316,9 +1401,11 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_MISSING_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_MODULE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_module_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -1336,6 +1423,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_MULTI_TARGET_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t lefts_size = pm_sizet_to_u32(((pm_multi_target_node_t *)node)->lefts.size);
             pm_buffer_append_varuint(buffer, lefts_size);
             for (uint32_t index = 0; index < lefts_size; index++) {
@@ -1366,6 +1454,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_MULTI_WRITE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t lefts_size = pm_sizet_to_u32(((pm_multi_write_node_t *)node)->lefts.size);
             pm_buffer_append_varuint(buffer, lefts_size);
             for (uint32_t index = 0; index < lefts_size; index++) {
@@ -1398,6 +1487,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_NEXT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_next_node_t *)node)->arguments == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1407,30 +1497,34 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_NIL_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_NO_KEYWORDS_PARAMETER_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_no_keywords_parameter_node_t *)node)->operator_loc, buffer);
             pm_serialize_location(parser, &((pm_no_keywords_parameter_node_t *)node)->keyword_loc, buffer);
             break;
         }
         case PM_NUMBERED_PARAMETERS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_byte(buffer, ((pm_numbered_parameters_node_t *)node)->maximum);
             break;
         }
         case PM_NUMBERED_REFERENCE_READ_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, ((pm_numbered_reference_read_node_t *)node)->number);
             break;
         }
         case PM_OPTIONAL_KEYWORD_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_optional_keyword_parameter_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_optional_keyword_parameter_node_t *)node)->name_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_optional_keyword_parameter_node_t *)node)->value, buffer);
             break;
         }
         case PM_OPTIONAL_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_optional_parameter_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_optional_parameter_node_t *)node)->name_loc, buffer);
             pm_serialize_location(parser, &((pm_optional_parameter_node_t *)node)->operator_loc, buffer);
@@ -1438,12 +1532,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_OR_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_or_node_t *)node)->left, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_or_node_t *)node)->right, buffer);
             pm_serialize_location(parser, &((pm_or_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_PARAMETERS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t requireds_size = pm_sizet_to_u32(((pm_parameters_node_t *)node)->requireds.size);
             pm_buffer_append_varuint(buffer, requireds_size);
             for (uint32_t index = 0; index < requireds_size; index++) {
@@ -1482,6 +1578,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_PARENTHESES_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_parentheses_node_t *)node)->body == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1492,6 +1589,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_PINNED_EXPRESSION_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_pinned_expression_node_t *)node)->expression, buffer);
             pm_serialize_location(parser, &((pm_pinned_expression_node_t *)node)->operator_loc, buffer);
             pm_serialize_location(parser, &((pm_pinned_expression_node_t *)node)->lparen_loc, buffer);
@@ -1499,11 +1597,13 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_PINNED_VARIABLE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_pinned_variable_node_t *)node)->variable, buffer);
             pm_serialize_location(parser, &((pm_pinned_variable_node_t *)node)->operator_loc, buffer);
             break;
         }
         case PM_POST_EXECUTION_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_post_execution_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1515,6 +1615,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_PRE_EXECUTION_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_pre_execution_node_t *)node)->statements == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1526,6 +1627,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_PROGRAM_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_program_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -1535,7 +1637,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_RANGE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_range_node_t *)node)->left == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1550,14 +1652,17 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_RATIONAL_NODE: {
-            pm_serialize_node(parser, (pm_node_t *)((pm_rational_node_t *)node)->numeric, buffer);
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
+            pm_serialize_integer(&((pm_rational_node_t *)node)->numerator, buffer);
+            pm_serialize_integer(&((pm_rational_node_t *)node)->denominator, buffer);
             break;
         }
         case PM_REDO_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_REGULAR_EXPRESSION_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_regular_expression_node_t *)node)->opening_loc, buffer);
             pm_serialize_location(parser, &((pm_regular_expression_node_t *)node)->content_loc, buffer);
             pm_serialize_location(parser, &((pm_regular_expression_node_t *)node)->closing_loc, buffer);
@@ -1565,23 +1670,25 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_REQUIRED_KEYWORD_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_required_keyword_parameter_node_t *)node)->name));
             pm_serialize_location(parser, &((pm_required_keyword_parameter_node_t *)node)->name_loc, buffer);
             break;
         }
         case PM_REQUIRED_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_required_parameter_node_t *)node)->name));
             break;
         }
         case PM_RESCUE_MODIFIER_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_rescue_modifier_node_t *)node)->expression, buffer);
             pm_serialize_location(parser, &((pm_rescue_modifier_node_t *)node)->keyword_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_rescue_modifier_node_t *)node)->rescue_expression, buffer);
             break;
         }
         case PM_RESCUE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_rescue_node_t *)node)->keyword_loc, buffer);
             uint32_t exceptions_size = pm_sizet_to_u32(((pm_rescue_node_t *)node)->exceptions.size);
             pm_buffer_append_varuint(buffer, exceptions_size);
@@ -1604,15 +1711,15 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             } else {
                 pm_serialize_node(parser, (pm_node_t *)((pm_rescue_node_t *)node)->statements, buffer);
             }
-            if (((pm_rescue_node_t *)node)->consequent == NULL) {
+            if (((pm_rescue_node_t *)node)->subsequent == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_rescue_node_t *)node)->consequent, buffer);
+                pm_serialize_node(parser, (pm_node_t *)((pm_rescue_node_t *)node)->subsequent, buffer);
             }
             break;
         }
         case PM_REST_PARAMETER_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_buffer_append_varuint(buffer, pm_sizet_to_u32(((pm_rest_parameter_node_t *)node)->name));
             if (((pm_rest_parameter_node_t *)node)->name_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1624,10 +1731,11 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_RETRY_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_RETURN_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_return_node_t *)node)->keyword_loc, buffer);
             if (((pm_return_node_t *)node)->arguments == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1637,14 +1745,16 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_SELF_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_SHAREABLE_CONSTANT_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_node(parser, (pm_node_t *)((pm_shareable_constant_node_t *)node)->write, buffer);
             break;
         }
         case PM_SINGLETON_CLASS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t locals_size = pm_sizet_to_u32(((pm_singleton_class_node_t *)node)->locals.size);
             pm_buffer_append_varuint(buffer, locals_size);
             for (uint32_t index = 0; index < locals_size; index++) {
@@ -1662,17 +1772,20 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_SOURCE_ENCODING_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_SOURCE_FILE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_string(parser, &((pm_source_file_node_t *)node)->filepath, buffer);
             break;
         }
         case PM_SOURCE_LINE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_SPLAT_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_splat_node_t *)node)->operator_loc, buffer);
             if (((pm_splat_node_t *)node)->expression == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1682,6 +1795,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_STATEMENTS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t body_size = pm_sizet_to_u32(((pm_statements_node_t *)node)->body.size);
             pm_buffer_append_varuint(buffer, body_size);
             for (uint32_t index = 0; index < body_size; index++) {
@@ -1690,7 +1804,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_STRING_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_string_node_t *)node)->opening_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1708,6 +1822,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_SUPER_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_super_node_t *)node)->keyword_loc, buffer);
             if (((pm_super_node_t *)node)->lparen_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1734,7 +1849,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_SYMBOL_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             if (((pm_symbol_node_t *)node)->opening_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1757,9 +1872,11 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_TRUE_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             break;
         }
         case PM_UNDEF_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             uint32_t names_size = pm_sizet_to_u32(((pm_undef_node_t *)node)->names.size);
             pm_buffer_append_varuint(buffer, names_size);
             for (uint32_t index = 0; index < names_size; index++) {
@@ -1769,6 +1886,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_UNLESS_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_unless_node_t *)node)->keyword_loc, buffer);
             pm_serialize_node(parser, (pm_node_t *)((pm_unless_node_t *)node)->predicate, buffer);
             if (((pm_unless_node_t *)node)->then_keyword_loc.start == NULL) {
@@ -1782,10 +1900,10 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             } else {
                 pm_serialize_node(parser, (pm_node_t *)((pm_unless_node_t *)node)->statements, buffer);
             }
-            if (((pm_unless_node_t *)node)->consequent == NULL) {
+            if (((pm_unless_node_t *)node)->else_clause == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
-                pm_serialize_node(parser, (pm_node_t *)((pm_unless_node_t *)node)->consequent, buffer);
+                pm_serialize_node(parser, (pm_node_t *)((pm_unless_node_t *)node)->else_clause, buffer);
             }
             if (((pm_unless_node_t *)node)->end_keyword_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1796,8 +1914,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_UNTIL_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_until_node_t *)node)->keyword_loc, buffer);
+            if (((pm_until_node_t *)node)->do_keyword_loc.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_until_node_t *)node)->do_keyword_loc, buffer);
+            }
             if (((pm_until_node_t *)node)->closing_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1813,6 +1937,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_WHEN_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_when_node_t *)node)->keyword_loc, buffer);
             uint32_t conditions_size = pm_sizet_to_u32(((pm_when_node_t *)node)->conditions.size);
             pm_buffer_append_varuint(buffer, conditions_size);
@@ -1833,8 +1958,14 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_WHILE_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_while_node_t *)node)->keyword_loc, buffer);
+            if (((pm_while_node_t *)node)->do_keyword_loc.start == NULL) {
+                pm_buffer_append_byte(buffer, 0);
+            } else {
+                pm_buffer_append_byte(buffer, 1);
+                pm_serialize_location(parser, &((pm_while_node_t *)node)->do_keyword_loc, buffer);
+            }
             if (((pm_while_node_t *)node)->closing_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
             } else {
@@ -1850,7 +1981,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_X_STRING_NODE: {
-            pm_buffer_append_varuint(buffer, (uint32_t)(node->flags & ~PM_NODE_FLAG_COMMON_MASK));
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_x_string_node_t *)node)->opening_loc, buffer);
             pm_serialize_location(parser, &((pm_x_string_node_t *)node)->content_loc, buffer);
             pm_serialize_location(parser, &((pm_x_string_node_t *)node)->closing_loc, buffer);
@@ -1858,6 +1989,7 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
             break;
         }
         case PM_YIELD_NODE: {
+            pm_buffer_append_varuint(buffer, (uint32_t) node->flags);
             pm_serialize_location(parser, &((pm_yield_node_t *)node)->keyword_loc, buffer);
             if (((pm_yield_node_t *)node)->lparen_loc.start == NULL) {
                 pm_buffer_append_byte(buffer, 0);
@@ -1993,7 +2125,7 @@ pm_serialize_metadata(pm_parser_t *parser, pm_buffer_t *buffer) {
     pm_serialize_diagnostic_list(parser, &parser->warning_list, buffer);
 }
 
-#line 271 "serialize.c.erb"
+#line 275 "prism/templates/src/serialize.c.erb"
 /**
  * Serialize the metadata, nodes, and constant pool.
  */