yarp 0.11.0 → 0.12.0

data/src/enc/yp_unicode.c

@@ -10,7 +10,7 @@ typedef uint32_t yp_unicode_codepoint_t;
 // this table is different from other encodings where we used a lookup table
 // because the indices of those tables are the byte representations, not the
 // codepoints themselves.
-uint8_t yp_encoding_unicode_table[256] = {
+const uint8_t yp_encoding_unicode_table[256] = {
 //  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1x
@@ -31,7 +31,7 @@ uint8_t yp_encoding_unicode_table[256] = {
 };
 
 #define UNICODE_ALPHA_CODEPOINTS_LENGTH 1450
-static yp_unicode_codepoint_t unicode_alpha_codepoints[UNICODE_ALPHA_CODEPOINTS_LENGTH] = {
+static const yp_unicode_codepoint_t unicode_alpha_codepoints[UNICODE_ALPHA_CODEPOINTS_LENGTH] = {
     0x100, 0x2C1,
     0x2C6, 0x2D1,
     0x2E0, 0x2E4,
@@ -760,7 +760,7 @@ static yp_unicode_codepoint_t unicode_alpha_codepoints[UNICODE_ALPHA_CODEPOINTS_
 };
 
 #define UNICODE_ALNUM_CODEPOINTS_LENGTH 1528
-static yp_unicode_codepoint_t unicode_alnum_codepoints[UNICODE_ALNUM_CODEPOINTS_LENGTH] = {
+static const yp_unicode_codepoint_t unicode_alnum_codepoints[UNICODE_ALNUM_CODEPOINTS_LENGTH] = {
     0x100, 0x2C1,
     0x2C6, 0x2D1,
     0x2E0, 0x2E4,
@@ -1528,7 +1528,7 @@ static yp_unicode_codepoint_t unicode_alnum_codepoints[UNICODE_ALNUM_CODEPOINTS_
 };
 
 #define UNICODE_ISUPPER_CODEPOINTS_LENGTH 1296
-static yp_unicode_codepoint_t unicode_isupper_codepoints[UNICODE_ISUPPER_CODEPOINTS_LENGTH] = {
+static const yp_unicode_codepoint_t unicode_isupper_codepoints[UNICODE_ISUPPER_CODEPOINTS_LENGTH] = {
     0x100, 0x100,
     0x102, 0x102,
     0x104, 0x104,
@@ -2180,7 +2180,7 @@ static yp_unicode_codepoint_t unicode_isupper_codepoints[UNICODE_ISUPPER_CODEPOI
 };
 
 static bool
-yp_unicode_codepoint_match(yp_unicode_codepoint_t codepoint, yp_unicode_codepoint_t *codepoints, size_t size) {
+yp_unicode_codepoint_match(yp_unicode_codepoint_t codepoint, const yp_unicode_codepoint_t *codepoints, size_t size) {
     size_t start = 0;
     size_t end = size;
 

data/src/node.c

@@ -60,8 +60,15 @@ YP_EXPORTED_FUNCTION void
 yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
     switch (YP_NODE_TYPE(node)) {
 #line 57 "node.c.erb"
-        case YP_ALIAS_NODE: {
-            yp_alias_node_t *cast = (yp_alias_node_t *) node;
+        case YP_ALIAS_GLOBAL_VARIABLE_NODE: {
+            yp_alias_global_variable_node_t *cast = (yp_alias_global_variable_node_t *) node;
+            yp_node_destroy(parser, (yp_node_t *)cast->new_name);
+            yp_node_destroy(parser, (yp_node_t *)cast->old_name);
+            break;
+        }
+#line 57 "node.c.erb"
+        case YP_ALIAS_METHOD_NODE: {
+            yp_alias_method_node_t *cast = (yp_alias_method_node_t *) node;
             yp_node_destroy(parser, (yp_node_t *)cast->new_name);
             yp_node_destroy(parser, (yp_node_t *)cast->old_name);
             break;
@@ -562,6 +569,12 @@ yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
             yp_node_destroy(parser, (yp_node_t *)cast->numeric);
             break;
         }
+#line 57 "node.c.erb"
+        case YP_IMPLICIT_NODE: {
+            yp_implicit_node_t *cast = (yp_implicit_node_t *) node;
+            yp_node_destroy(parser, (yp_node_t *)cast->value);
+            break;
+        }
 #line 57 "node.c.erb"
         case YP_IN_NODE: {
             yp_in_node_t *cast = (yp_in_node_t *) node;
@@ -607,6 +620,12 @@ yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
         case YP_INTEGER_NODE: {
             break;
         }
+#line 57 "node.c.erb"
+        case YP_INTERPOLATED_MATCH_LAST_LINE_NODE: {
+            yp_interpolated_match_last_line_node_t *cast = (yp_interpolated_match_last_line_node_t *) node;
+            yp_node_list_free(parser, &cast->parts);
+            break;
+        }
 #line 57 "node.c.erb"
         case YP_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
             yp_interpolated_regular_expression_node_t *cast = (yp_interpolated_regular_expression_node_t *) node;
@@ -693,6 +712,12 @@ yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
             yp_node_destroy(parser, (yp_node_t *)cast->value);
             break;
         }
+#line 57 "node.c.erb"
+        case YP_MATCH_LAST_LINE_NODE: {
+            yp_match_last_line_node_t *cast = (yp_match_last_line_node_t *) node;
+            yp_string_free(&cast->unescaped);
+            break;
+        }
 #line 57 "node.c.erb"
         case YP_MATCH_PREDICATE_NODE: {
             yp_match_predicate_node_t *cast = (yp_match_predicate_node_t *) node;
@@ -707,6 +732,13 @@ yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
             yp_node_destroy(parser, (yp_node_t *)cast->pattern);
             break;
         }
+#line 57 "node.c.erb"
+        case YP_MATCH_WRITE_NODE: {
+            yp_match_write_node_t *cast = (yp_match_write_node_t *) node;
+            yp_node_destroy(parser, (yp_node_t *)cast->call);
+            yp_constant_id_list_free(&cast->locals);
+            break;
+        }
 #line 57 "node.c.erb"
         case YP_MISSING_NODE: {
             break;
@@ -772,10 +804,10 @@ yp_node_destroy(yp_parser_t *parser, yp_node_t *node) {
             yp_parameters_node_t *cast = (yp_parameters_node_t *) node;
             yp_node_list_free(parser, &cast->requireds);
             yp_node_list_free(parser, &cast->optionals);
-            yp_node_list_free(parser, &cast->posts);
             if (cast->rest != NULL) {
                 yp_node_destroy(parser, (yp_node_t *)cast->rest);
             }
+            yp_node_list_free(parser, &cast->posts);
             yp_node_list_free(parser, &cast->keywords);
             if (cast->keyword_rest != NULL) {
                 yp_node_destroy(parser, (yp_node_t *)cast->keyword_rest);
@@ -1056,8 +1088,16 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
         case YP_SCOPE_NODE:
             return;
 #line 102 "node.c.erb"
-        case YP_ALIAS_NODE: {
-            yp_alias_node_t *cast = (yp_alias_node_t *) node;
+        case YP_ALIAS_GLOBAL_VARIABLE_NODE: {
+            yp_alias_global_variable_node_t *cast = (yp_alias_global_variable_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            yp_node_memsize_node((yp_node_t *)cast->new_name, memsize);
+            yp_node_memsize_node((yp_node_t *)cast->old_name, memsize);
+            break;
+        }
+#line 102 "node.c.erb"
+        case YP_ALIAS_METHOD_NODE: {
+            yp_alias_method_node_t *cast = (yp_alias_method_node_t *) node;
             memsize->memsize += sizeof(*cast);
             yp_node_memsize_node((yp_node_t *)cast->new_name, memsize);
             yp_node_memsize_node((yp_node_t *)cast->old_name, memsize);
@@ -1636,6 +1676,13 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
             yp_node_memsize_node((yp_node_t *)cast->numeric, memsize);
             break;
         }
+#line 102 "node.c.erb"
+        case YP_IMPLICIT_NODE: {
+            yp_implicit_node_t *cast = (yp_implicit_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            yp_node_memsize_node((yp_node_t *)cast->value, memsize);
+            break;
+        }
 #line 102 "node.c.erb"
         case YP_IN_NODE: {
             yp_in_node_t *cast = (yp_in_node_t *) node;
@@ -1692,6 +1739,13 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
             memsize->memsize += sizeof(*cast);
             break;
         }
+#line 102 "node.c.erb"
+        case YP_INTERPOLATED_MATCH_LAST_LINE_NODE: {
+            yp_interpolated_match_last_line_node_t *cast = (yp_interpolated_match_last_line_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            yp_node_list_memsize(&cast->parts, memsize);
+            break;
+        }
 #line 102 "node.c.erb"
         case YP_INTERPOLATED_REGULAR_EXPRESSION_NODE: {
             yp_interpolated_regular_expression_node_t *cast = (yp_interpolated_regular_expression_node_t *) node;
@@ -1795,6 +1849,13 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
             yp_node_memsize_node((yp_node_t *)cast->value, memsize);
             break;
         }
+#line 102 "node.c.erb"
+        case YP_MATCH_LAST_LINE_NODE: {
+            yp_match_last_line_node_t *cast = (yp_match_last_line_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            memsize->memsize += yp_string_memsize(&cast->unescaped);
+            break;
+        }
 #line 102 "node.c.erb"
         case YP_MATCH_PREDICATE_NODE: {
             yp_match_predicate_node_t *cast = (yp_match_predicate_node_t *) node;
@@ -1811,6 +1872,14 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
             yp_node_memsize_node((yp_node_t *)cast->pattern, memsize);
             break;
         }
+#line 102 "node.c.erb"
+        case YP_MATCH_WRITE_NODE: {
+            yp_match_write_node_t *cast = (yp_match_write_node_t *) node;
+            memsize->memsize += sizeof(*cast);
+            yp_node_memsize_node((yp_node_t *)cast->call, memsize);
+            memsize->memsize += yp_constant_id_list_memsize(&cast->locals);
+            break;
+        }
 #line 102 "node.c.erb"
         case YP_MISSING_NODE: {
             yp_missing_node_t *cast = (yp_missing_node_t *) node;
@@ -1891,10 +1960,10 @@ yp_node_memsize_node(yp_node_t *node, yp_memsize_t *memsize) {
             memsize->memsize += sizeof(*cast);
             yp_node_list_memsize(&cast->requireds, memsize);
             yp_node_list_memsize(&cast->optionals, memsize);
-            yp_node_list_memsize(&cast->posts, memsize);
             if (cast->rest != NULL) {
                 yp_node_memsize_node((yp_node_t *)cast->rest, memsize);
             }
+            yp_node_list_memsize(&cast->posts, memsize);
             yp_node_list_memsize(&cast->keywords, memsize);
             if (cast->keyword_rest != NULL) {
                 yp_node_memsize_node((yp_node_t *)cast->keyword_rest, memsize);
@@ -2217,8 +2286,10 @@ YP_EXPORTED_FUNCTION const char *
 yp_node_type_to_str(yp_node_type_t node_type)
 {
     switch (node_type) {
-        case YP_ALIAS_NODE:
-            return "YP_ALIAS_NODE";
+        case YP_ALIAS_GLOBAL_VARIABLE_NODE:
+            return "YP_ALIAS_GLOBAL_VARIABLE_NODE";
+        case YP_ALIAS_METHOD_NODE:
+            return "YP_ALIAS_METHOD_NODE";
         case YP_ALTERNATION_PATTERN_NODE:
             return "YP_ALTERNATION_PATTERN_NODE";
         case YP_AND_NODE:
@@ -2347,6 +2418,8 @@ yp_node_type_to_str(yp_node_type_t node_type)
             return "YP_IF_NODE";
         case YP_IMAGINARY_NODE:
             return "YP_IMAGINARY_NODE";
+        case YP_IMPLICIT_NODE:
+            return "YP_IMPLICIT_NODE";
         case YP_IN_NODE:
             return "YP_IN_NODE";
         case YP_INSTANCE_VARIABLE_AND_WRITE_NODE:
@@ -2363,6 +2436,8 @@ yp_node_type_to_str(yp_node_type_t node_type)
             return "YP_INSTANCE_VARIABLE_WRITE_NODE";
         case YP_INTEGER_NODE:
             return "YP_INTEGER_NODE";
+        case YP_INTERPOLATED_MATCH_LAST_LINE_NODE:
+            return "YP_INTERPOLATED_MATCH_LAST_LINE_NODE";
         case YP_INTERPOLATED_REGULAR_EXPRESSION_NODE:
             return "YP_INTERPOLATED_REGULAR_EXPRESSION_NODE";
         case YP_INTERPOLATED_STRING_NODE:
@@ -2391,10 +2466,14 @@ yp_node_type_to_str(yp_node_type_t node_type)
             return "YP_LOCAL_VARIABLE_TARGET_NODE";
         case YP_LOCAL_VARIABLE_WRITE_NODE:
             return "YP_LOCAL_VARIABLE_WRITE_NODE";
+        case YP_MATCH_LAST_LINE_NODE:
+            return "YP_MATCH_LAST_LINE_NODE";
         case YP_MATCH_PREDICATE_NODE:
             return "YP_MATCH_PREDICATE_NODE";
         case YP_MATCH_REQUIRED_NODE:
             return "YP_MATCH_REQUIRED_NODE";
+        case YP_MATCH_WRITE_NODE:
+            return "YP_MATCH_WRITE_NODE";
         case YP_MISSING_NODE:
             return "YP_MISSING_NODE";
         case YP_MODULE_NODE:

data/src/prettyprint.c

@@ -27,11 +27,19 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         // of the AST
         case YP_SCOPE_NODE:
             return;
-        case YP_ALIAS_NODE: {
-            yp_buffer_append_str(buffer, "AliasNode(", 10);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_node_t *)node)->new_name);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_node_t *)node)->old_name);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_alias_node_t *)node)->keyword_loc);
+        case YP_ALIAS_GLOBAL_VARIABLE_NODE: {
+            yp_buffer_append_str(buffer, "AliasGlobalVariableNode(", 24);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_global_variable_node_t *)node)->new_name);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_global_variable_node_t *)node)->old_name);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_alias_global_variable_node_t *)node)->keyword_loc);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_ALIAS_METHOD_NODE: {
+            yp_buffer_append_str(buffer, "AliasMethodNode(", 16);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_method_node_t *)node)->new_name);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_method_node_t *)node)->old_name);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_alias_method_node_t *)node)->keyword_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -319,7 +327,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_location(buffer, parser, &((yp_call_and_write_node_t *)node)->closing_loc);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_bytes(buffer, yp_string_source(&((yp_call_and_write_node_t *)node)->read_name), yp_string_length(&((yp_call_and_write_node_t *)node)->read_name));
@@ -370,7 +378,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_call_node_t *)node)->block);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_bytes(buffer, yp_string_source(&((yp_call_node_t *)node)->name), yp_string_length(&((yp_call_node_t *)node)->name));
@@ -411,7 +419,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_location(buffer, parser, &((yp_call_operator_write_node_t *)node)->closing_loc);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_bytes(buffer, yp_string_source(&((yp_call_operator_write_node_t *)node)->read_name), yp_string_length(&((yp_call_operator_write_node_t *)node)->read_name));
@@ -460,7 +468,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_location(buffer, parser, &((yp_call_or_write_node_t *)node)->closing_loc);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_bytes(buffer, yp_string_source(&((yp_call_or_write_node_t *)node)->read_name), yp_string_length(&((yp_call_or_write_node_t *)node)->read_name));
@@ -896,7 +904,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_flip_flop_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1085,6 +1093,12 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_IMPLICIT_NODE: {
+            yp_buffer_append_str(buffer, "ImplicitNode(", 13);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_implicit_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_IN_NODE: {
             yp_buffer_append_str(buffer, "InNode(", 7);
                         prettyprint_node(buffer, parser, (yp_node_t *)((yp_in_node_t *)node)->pattern);
@@ -1167,6 +1181,25 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         }
         case YP_INTEGER_NODE: {
             yp_buffer_append_str(buffer, "IntegerNode(", 12);
+                        char flags_buffer[12];
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
+            yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_INTERPOLATED_MATCH_LAST_LINE_NODE: {
+            yp_buffer_append_str(buffer, "InterpolatedMatchLastLineNode(", 30);
+                        prettyprint_location(buffer, parser, &((yp_interpolated_match_last_line_node_t *)node)->opening_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "[", 1);
+            for (uint32_t index = 0; index < ((yp_interpolated_match_last_line_node_t *)node)->parts.size; index++) {
+                if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
+                prettyprint_node(buffer, parser, (yp_node_t *) ((yp_interpolated_match_last_line_node_t *) node)->parts.nodes[index]);
+            }
+            yp_buffer_append_str(buffer, "]", 1);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_interpolated_match_last_line_node_t *)node)->closing_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
+            yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -1181,7 +1214,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, "]", 1);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_interpolated_regular_expression_node_t *)node)->closing_loc);
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1391,6 +1424,20 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_MATCH_LAST_LINE_NODE: {
+            yp_buffer_append_str(buffer, "MatchLastLineNode(", 18);
+                        prettyprint_location(buffer, parser, &((yp_match_last_line_node_t *)node)->opening_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_match_last_line_node_t *)node)->content_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_match_last_line_node_t *)node)->closing_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_match_last_line_node_t *)node)->unescaped), yp_string_length(&((yp_match_last_line_node_t *)node)->unescaped));
+            yp_buffer_append_str(buffer, "\"", 1);
+            yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
+            yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_MATCH_PREDICATE_NODE: {
             yp_buffer_append_str(buffer, "MatchPredicateNode(", 19);
                         prettyprint_node(buffer, parser, (yp_node_t *)((yp_match_predicate_node_t *)node)->value);
@@ -1407,6 +1454,20 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_MATCH_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "MatchWriteNode(", 15);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_match_write_node_t *)node)->call);
+            yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "[", 1);
+            for (uint32_t index = 0; index < ((yp_match_write_node_t *)node)->locals.size; index++) {
+                if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
+                char locals_buffer[12];
+                snprintf(locals_buffer, sizeof(locals_buffer), "%u", ((yp_match_write_node_t *)node)->locals.ids[index]);
+                yp_buffer_append_str(buffer, locals_buffer, strlen(locals_buffer));
+            }
+            yp_buffer_append_str(buffer, "]", 1);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_MISSING_NODE: {
             yp_buffer_append_str(buffer, "MissingNode(", 12);
             yp_buffer_append_str(buffer, ")", 1);
@@ -1544,17 +1605,17 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *) ((yp_parameters_node_t *) node)->optionals.nodes[index]);
             }
             yp_buffer_append_str(buffer, "]", 1);
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_parameters_node_t *)node)->rest == NULL) {
+                yp_buffer_append_str(buffer, "nil", 3);
+            } else {
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_parameters_node_t *)node)->rest);
+            }
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "[", 1);
             for (uint32_t index = 0; index < ((yp_parameters_node_t *)node)->posts.size; index++) {
                 if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
                 prettyprint_node(buffer, parser, (yp_node_t *) ((yp_parameters_node_t *) node)->posts.nodes[index]);
             }
             yp_buffer_append_str(buffer, "]", 1);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_parameters_node_t *)node)->rest == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_parameters_node_t *)node)->rest);
-            }
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "[", 1);
             for (uint32_t index = 0; index < ((yp_parameters_node_t *)node)->keywords.size; index++) {
                 if (index != 0) yp_buffer_append_str(buffer, ", ", 2);
@@ -1656,7 +1717,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_range_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1681,7 +1742,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_bytes(buffer, yp_string_source(&((yp_regular_expression_node_t *)node)->unescaped), yp_string_length(&((yp_regular_expression_node_t *)node)->unescaped));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1857,7 +1918,10 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         }
         case YP_STRING_NODE: {
             yp_buffer_append_str(buffer, "StringNode(", 11);
-                        if (((yp_string_node_t *)node)->opening_loc.start == NULL) {
+                        char flags_buffer[12];
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
+            yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_string_node_t *)node)->opening_loc.start == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
                 prettyprint_location(buffer, parser, &((yp_string_node_t *)node)->opening_loc);
@@ -1977,7 +2041,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_until_node_t *)node)->statements);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -2014,7 +2078,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_while_node_t *)node)->statements);
             }
             yp_buffer_append_str(buffer, ", ", 2);            char flags_buffer[12];
-            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
+            snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 2);
             yp_buffer_append_str(buffer, flags_buffer, strlen(flags_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;