yarp 0.8.0 → 0.10.0

data/src/prettyprint.c

@@ -1,6 +1,6 @@
 /******************************************************************************/
-/* This file is generated by the bin/template script and should not be        */
-/* modified manually. See                                                     */
+/* This file is generated by the templates/template.rb script and should not  */
+/* be modified manually. See                                                  */
 /* templates/src/prettyprint.c.erb                                            */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
@@ -23,6 +23,10 @@ prettyprint_location(yp_buffer_t *buffer, yp_parser_t *parser, yp_location_t *lo
 static void
 prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
     switch (YP_NODE_TYPE(node)) {
+        // We do not need to print a ScopeNode as it's not part
+        // of the AST
+        case YP_NODE_SCOPE_NODE:
+            return;
         case YP_NODE_ALIAS_NODE: {
             yp_buffer_append_str(buffer, "AliasNode(", 10);
                         prettyprint_node(buffer, parser, (yp_node_t *)((yp_alias_node_t *)node)->new_name);
@@ -47,14 +51,6 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
-        case YP_NODE_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "AndWriteNode(", 13);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_and_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
         case YP_NODE_ARGUMENTS_NODE: {
             yp_buffer_append_str(buffer, "ArgumentsNode(", 14);
                         yp_buffer_append_str(buffer, "[", 1);
@@ -316,7 +312,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             snprintf(flags_buffer, sizeof(flags_buffer), "+%d", node->flags >> 1);
             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_str(buffer, yp_string_source(&((yp_call_node_t *)node)->name), yp_string_length(&((yp_call_node_t *)node)->name));
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_call_node_t *)node)->name), yp_string_length(&((yp_call_node_t *)node)->name));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -342,9 +338,9 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                         prettyprint_node(buffer, parser, (yp_node_t *)((yp_call_operator_write_node_t *)node)->target);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_call_operator_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_call_operator_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ", ", 2);            char operator_id_buffer[12];
-            snprintf(operator_id_buffer, sizeof(operator_id_buffer), "%u", ((yp_call_operator_write_node_t *)node)->operator_id);
-            yp_buffer_append_str(buffer, operator_id_buffer, strlen(operator_id_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_call_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -407,17 +403,70 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_node_t *)node)->end_keyword_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_class_node_t *)node)->name), yp_string_length(&((yp_class_node_t *)node)->name));
+            yp_buffer_append_str(buffer, "\"", 1);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableAndWriteNode(", 26);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_and_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_and_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_variable_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableOperatorWriteNode(", 31);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_operator_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_operator_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_variable_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_class_variable_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableOrWriteNode(", 25);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_or_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_or_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_variable_or_write_node_t *)node)->value);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
         case YP_NODE_CLASS_VARIABLE_READ_NODE: {
             yp_buffer_append_str(buffer, "ClassVariableReadNode(", 22);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_read_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CLASS_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableTargetNode(", 24);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_target_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
         case YP_NODE_CLASS_VARIABLE_WRITE_NODE: {
             yp_buffer_append_str(buffer, "ClassVariableWriteNode(", 23);
-                        prettyprint_location(buffer, parser, &((yp_class_variable_write_node_t *)node)->name_loc);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_class_variable_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_write_node_t *)node)->name_loc);
             yp_buffer_append_str(buffer, ", ", 2);            if (((yp_class_variable_write_node_t *)node)->value == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
@@ -431,6 +480,41 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_CONSTANT_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantAndWriteNode(", 21);
+                        prettyprint_location(buffer, parser, &((yp_constant_and_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantOperatorWriteNode(", 26);
+                        prettyprint_location(buffer, parser, &((yp_constant_operator_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_constant_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantOrWriteNode(", 20);
+                        prettyprint_location(buffer, parser, &((yp_constant_or_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_or_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_PATH_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantPathAndWriteNode(", 25);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_and_write_node_t *)node)->target);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_CONSTANT_PATH_NODE: {
             yp_buffer_append_str(buffer, "ConstantPathNode(", 17);
                         if (((yp_constant_path_node_t *)node)->parent == NULL) {
@@ -443,19 +527,42 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
-        case YP_NODE_CONSTANT_PATH_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ConstantPathWriteNode(", 22);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_constant_path_write_node_t *)node)->operator_loc.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_constant_path_write_node_t *)node)->operator_loc);
-            }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_constant_path_write_node_t *)node)->value == NULL) {
+        case YP_NODE_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantPathOperatorWriteNode(", 30);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_write_node_t *)node)->target);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_constant_path_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_PATH_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantPathOrWriteNode(", 24);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_or_write_node_t *)node)->target);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_or_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_PATH_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "ConstantPathTargetNode(", 23);
+                        if (((yp_constant_path_target_node_t *)node)->parent == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_write_node_t *)node)->value);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_target_node_t *)node)->parent);
             }
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_target_node_t *)node)->child);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_target_node_t *)node)->delimiter_loc);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_CONSTANT_PATH_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ConstantPathWriteNode(", 22);
+                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_write_node_t *)node)->target);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_write_node_t *)node)->value);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -464,19 +571,16 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_CONSTANT_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "ConstantTargetNode(", 19);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_CONSTANT_WRITE_NODE: {
             yp_buffer_append_str(buffer, "ConstantWriteNode(", 18);
                         prettyprint_location(buffer, parser, &((yp_constant_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_constant_write_node_t *)node)->value == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_write_node_t *)node)->value);
-            }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_constant_write_node_t *)node)->operator_loc.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_constant_write_node_t *)node)->operator_loc);
-            }
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -696,24 +800,48 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "GlobalVariableAndWriteNode(", 27);
+                        prettyprint_location(buffer, parser, &((yp_global_variable_and_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "GlobalVariableOperatorWriteNode(", 32);
+                        prettyprint_location(buffer, parser, &((yp_global_variable_operator_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_global_variable_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "GlobalVariableOrWriteNode(", 26);
+                        prettyprint_location(buffer, parser, &((yp_global_variable_or_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_or_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_GLOBAL_VARIABLE_READ_NODE: {
             yp_buffer_append_str(buffer, "GlobalVariableReadNode(", 23);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_GLOBAL_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "GlobalVariableTargetNode(", 25);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_GLOBAL_VARIABLE_WRITE_NODE: {
             yp_buffer_append_str(buffer, "GlobalVariableWriteNode(", 24);
                         prettyprint_location(buffer, parser, &((yp_global_variable_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_global_variable_write_node_t *)node)->operator_loc.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_global_variable_write_node_t *)node)->operator_loc);
-            }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_global_variable_write_node_t *)node)->value == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_write_node_t *)node)->value);
-            }
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -810,24 +938,66 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableAndWriteNode(", 29);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_and_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_and_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableOperatorWriteNode(", 34);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_operator_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_operator_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_instance_variable_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableOrWriteNode(", 28);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_or_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_or_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_or_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_INSTANCE_VARIABLE_READ_NODE: {
             yp_buffer_append_str(buffer, "InstanceVariableReadNode(", 25);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_read_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_INSTANCE_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableTargetNode(", 27);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_target_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
         case YP_NODE_INSTANCE_VARIABLE_WRITE_NODE: {
             yp_buffer_append_str(buffer, "InstanceVariableWriteNode(", 26);
-                        prettyprint_location(buffer, parser, &((yp_instance_variable_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_instance_variable_write_node_t *)node)->value == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_write_node_t *)node)->value);
-            }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_instance_variable_write_node_t *)node)->operator_loc.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_instance_variable_write_node_t *)node)->operator_loc);
-            }
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_instance_variable_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -950,7 +1120,9 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 yp_buffer_append_str(buffer, locals_buffer, strlen(locals_buffer));
             }
             yp_buffer_append_str(buffer, "]", 1);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_lambda_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_lambda_node_t *)node)->opening_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_lambda_node_t *)node)->closing_loc);
             yp_buffer_append_str(buffer, ", ", 2);            if (((yp_lambda_node_t *)node)->parameters == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
@@ -964,36 +1136,84 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "LocalVariableAndWriteNode(", 26);
+                        prettyprint_location(buffer, parser, &((yp_local_variable_and_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_and_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_and_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_and_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
+            snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_and_write_node_t *)node)->depth);
+            yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "LocalVariableOperatorWriteNode(", 31);
+                        prettyprint_location(buffer, parser, &((yp_local_variable_operator_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_operator_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_operator_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_operator_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
+            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_local_variable_operator_write_node_t *)node)->operator);
+            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
+            snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_operator_write_node_t *)node)->depth);
+            yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
+        case YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "LocalVariableOrWriteNode(", 25);
+                        prettyprint_location(buffer, parser, &((yp_local_variable_or_write_node_t *)node)->name_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_or_write_node_t *)node)->operator_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_or_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_or_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
+            snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_or_write_node_t *)node)->depth);
+            yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_LOCAL_VARIABLE_READ_NODE: {
             yp_buffer_append_str(buffer, "LocalVariableReadNode(", 22);
-                        char constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_read_node_t *)node)->constant_id);
-            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_buffer));
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_read_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
             snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_read_node_t *)node)->depth);
             yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_LOCAL_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "LocalVariableTargetNode(", 24);
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_target_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
+            yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
+            snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_target_node_t *)node)->depth);
+            yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
+            yp_buffer_append_str(buffer, ")", 1);
+            break;
+        }
         case YP_NODE_LOCAL_VARIABLE_WRITE_NODE: {
             yp_buffer_append_str(buffer, "LocalVariableWriteNode(", 23);
-                        char constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_write_node_t *)node)->constant_id);
-            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_buffer));
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_local_variable_write_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            char depth_buffer[12];
             snprintf(depth_buffer, sizeof(depth_buffer), "+%d", ((yp_local_variable_write_node_t *)node)->depth);
             yp_buffer_append_str(buffer, depth_buffer, strlen(depth_buffer));
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_local_variable_write_node_t *)node)->value == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_write_node_t *)node)->value);
-            }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_local_variable_write_node_t *)node)->operator_loc.start == NULL) {
-                yp_buffer_append_str(buffer, "nil", 3);
-            } else {
-                prettyprint_location(buffer, parser, &((yp_local_variable_write_node_t *)node)->operator_loc);
-            }
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_write_node_t *)node)->value);
+            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -1036,6 +1256,9 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_module_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_module_node_t *)node)->end_keyword_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_module_node_t *)node)->name), yp_string_length(&((yp_module_node_t *)node)->name));
+            yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -1095,25 +1318,17 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         }
         case YP_NODE_NUMBERED_REFERENCE_READ_NODE: {
             yp_buffer_append_str(buffer, "NumberedReferenceReadNode(", 26);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_OPERATOR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "OperatorWriteNode(", 18);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_operator_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_operator_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            char operator_buffer[12];
-            snprintf(operator_buffer, sizeof(operator_buffer), "%u", ((yp_operator_write_node_t *)node)->operator);
-            yp_buffer_append_str(buffer, operator_buffer, strlen(operator_buffer));
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_operator_write_node_t *)node)->value);
+                        char number_buffer[12];
+            snprintf(number_buffer, sizeof(number_buffer), "+%d", ((yp_numbered_reference_read_node_t *)node)->number);
+            yp_buffer_append_str(buffer, number_buffer, strlen(number_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
         case YP_NODE_OPTIONAL_PARAMETER_NODE: {
             yp_buffer_append_str(buffer, "OptionalParameterNode(", 22);
-                        char constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_optional_parameter_node_t *)node)->constant_id);
-            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_buffer));
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_optional_parameter_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_optional_parameter_node_t *)node)->name_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_optional_parameter_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_optional_parameter_node_t *)node)->value);
@@ -1128,14 +1343,6 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
-        case YP_NODE_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "OrWriteNode(", 12);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_or_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_or_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
         case YP_NODE_PARAMETERS_NODE: {
             yp_buffer_append_str(buffer, "ParametersNode(", 15);
                         yp_buffer_append_str(buffer, "[", 1);
@@ -1284,7 +1491,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_regular_expression_node_t *)node)->content_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_regular_expression_node_t *)node)->closing_loc);
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_str(buffer, yp_string_source(&((yp_regular_expression_node_t *)node)->unescaped), yp_string_length(&((yp_regular_expression_node_t *)node)->unescaped));
+            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);
@@ -1307,9 +1514,9 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         }
         case YP_NODE_REQUIRED_PARAMETER_NODE: {
             yp_buffer_append_str(buffer, "RequiredParameterNode(", 22);
-                        char constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_required_parameter_node_t *)node)->constant_id);
-            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_buffer));
+                        char name_buffer[12];
+            snprintf(name_buffer, sizeof(name_buffer), "%u", ((yp_required_parameter_node_t *)node)->name);
+            yp_buffer_append_str(buffer, name_buffer, strlen(name_buffer));
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -1415,7 +1622,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         case YP_NODE_SOURCE_FILE_NODE: {
             yp_buffer_append_str(buffer, "SourceFileNode(", 15);
                         yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_str(buffer, yp_string_source(&((yp_source_file_node_t *)node)->filepath), yp_string_length(&((yp_source_file_node_t *)node)->filepath));
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_source_file_node_t *)node)->filepath), yp_string_length(&((yp_source_file_node_t *)node)->filepath));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1468,7 +1675,7 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
                 prettyprint_location(buffer, parser, &((yp_string_node_t *)node)->closing_loc);
             }
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_str(buffer, yp_string_source(&((yp_string_node_t *)node)->unescaped), yp_string_length(&((yp_string_node_t *)node)->unescaped));
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_string_node_t *)node)->unescaped), yp_string_length(&((yp_string_node_t *)node)->unescaped));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1506,14 +1713,18 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             } else {
                 prettyprint_location(buffer, parser, &((yp_symbol_node_t *)node)->opening_loc);
             }
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_symbol_node_t *)node)->value_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_symbol_node_t *)node)->value_loc.start == NULL) {
+                yp_buffer_append_str(buffer, "nil", 3);
+            } else {
+                prettyprint_location(buffer, parser, &((yp_symbol_node_t *)node)->value_loc);
+            }
             yp_buffer_append_str(buffer, ", ", 2);            if (((yp_symbol_node_t *)node)->closing_loc.start == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
                 prettyprint_location(buffer, parser, &((yp_symbol_node_t *)node)->closing_loc);
             }
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_str(buffer, yp_string_source(&((yp_symbol_node_t *)node)->unescaped), yp_string_length(&((yp_symbol_node_t *)node)->unescaped));
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_symbol_node_t *)node)->unescaped), yp_string_length(&((yp_symbol_node_t *)node)->unescaped));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;
@@ -1560,6 +1771,11 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         case YP_NODE_UNTIL_NODE: {
             yp_buffer_append_str(buffer, "UntilNode(", 10);
                         prettyprint_location(buffer, parser, &((yp_until_node_t *)node)->keyword_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_until_node_t *)node)->closing_loc.start == NULL) {
+                yp_buffer_append_str(buffer, "nil", 3);
+            } else {
+                prettyprint_location(buffer, parser, &((yp_until_node_t *)node)->closing_loc);
+            }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_until_node_t *)node)->predicate);
             yp_buffer_append_str(buffer, ", ", 2);            if (((yp_until_node_t *)node)->statements == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
@@ -1592,6 +1808,11 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         case YP_NODE_WHILE_NODE: {
             yp_buffer_append_str(buffer, "WhileNode(", 10);
                         prettyprint_location(buffer, parser, &((yp_while_node_t *)node)->keyword_loc);
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_while_node_t *)node)->closing_loc.start == NULL) {
+                yp_buffer_append_str(buffer, "nil", 3);
+            } else {
+                prettyprint_location(buffer, parser, &((yp_while_node_t *)node)->closing_loc);
+            }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_while_node_t *)node)->predicate);
             yp_buffer_append_str(buffer, ", ", 2);            if (((yp_while_node_t *)node)->statements == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
@@ -1610,7 +1831,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_x_string_node_t *)node)->content_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_x_string_node_t *)node)->closing_loc);
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "\"", 1);
-            yp_buffer_append_str(buffer, yp_string_source(&((yp_x_string_node_t *)node)->unescaped), yp_string_length(&((yp_x_string_node_t *)node)->unescaped));
+            yp_buffer_append_bytes(buffer, yp_string_source(&((yp_x_string_node_t *)node)->unescaped), yp_string_length(&((yp_x_string_node_t *)node)->unescaped));
             yp_buffer_append_str(buffer, "\"", 1);
             yp_buffer_append_str(buffer, ")", 1);
             break;