yarp 0.7.0 → 0.9.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);
@@ -209,10 +213,10 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             } else {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_block_node_t *)node)->parameters);
             }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_block_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_block_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_block_node_t *)node)->statements);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_block_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_block_node_t *)node)->opening_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_block_node_t *)node)->closing_loc);
@@ -393,28 +397,23 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             } else {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_node_t *)node)->superclass);
             }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_class_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_class_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_node_t *)node)->statements);
+                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_str(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_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ClassVariableOperatorAndWriteNode(", 34);
-                        prettyprint_location(buffer, parser, &((yp_class_variable_operator_and_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_variable_operator_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_CLASS_VARIABLE_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ClassVariableOperatorOrWriteNode(", 33);
-                        prettyprint_location(buffer, parser, &((yp_class_variable_operator_or_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_class_variable_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_class_variable_operator_or_write_node_t *)node)->value);
+        case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableAndWriteNode(", 26);
+                        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;
         }
@@ -429,11 +428,24 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableOrWriteNode(", 25);
+                        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);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_CLASS_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "ClassVariableTargetNode(", 24);
+            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);
@@ -450,19 +462,11 @@ 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_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ConstantOperatorAndWriteNode(", 29);
-                        prettyprint_location(buffer, parser, &((yp_constant_operator_and_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_operator_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_CONSTANT_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ConstantOperatorOrWriteNode(", 28);
-                        prettyprint_location(buffer, parser, &((yp_constant_operator_or_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_operator_or_write_node_t *)node)->value);
+        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;
         }
@@ -477,6 +481,22 @@ 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_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) {
@@ -489,22 +509,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_CONSTANT_PATH_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ConstantPathOperatorAndWriteNode(", 33);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_and_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_CONSTANT_PATH_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "ConstantPathOperatorOrWriteNode(", 32);
-                        prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_or_write_node_t *)node)->target);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_constant_path_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_constant_path_operator_or_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
         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);
@@ -516,19 +520,31 @@ 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_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;
         }
@@ -537,19 +553,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;
         }
@@ -566,10 +579,10 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             } else {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_def_node_t *)node)->parameters);
             }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_def_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_def_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_def_node_t *)node)->statements);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_def_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            yp_buffer_append_str(buffer, "[", 1);
             for (uint32_t index = 0; index < ((yp_def_node_t *)node)->locals.size; index++) {
@@ -769,19 +782,11 @@ 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_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "GlobalVariableOperatorAndWriteNode(", 35);
-                        prettyprint_location(buffer, parser, &((yp_global_variable_operator_and_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_operator_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_GLOBAL_VARIABLE_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "GlobalVariableOperatorOrWriteNode(", 34);
-                        prettyprint_location(buffer, parser, &((yp_global_variable_operator_or_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_global_variable_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_global_variable_operator_or_write_node_t *)node)->value);
+        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;
         }
@@ -796,24 +801,29 @@ 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_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_location(buffer, parser, &((yp_global_variable_write_node_t *)node)->operator_loc);
+            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, ")", 1);
             break;
         }
@@ -910,19 +920,11 @@ 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_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "InstanceVariableOperatorAndWriteNode(", 37);
-                        prettyprint_location(buffer, parser, &((yp_instance_variable_operator_and_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_operator_and_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_INSTANCE_VARIABLE_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "InstanceVariableOperatorOrWriteNode(", 36);
-                        prettyprint_location(buffer, parser, &((yp_instance_variable_operator_or_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_instance_variable_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_instance_variable_operator_or_write_node_t *)node)->value);
+        case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableAndWriteNode(", 29);
+                        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;
         }
@@ -937,24 +939,29 @@ 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_OR_WRITE_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableOrWriteNode(", 28);
+                        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);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
+        case YP_NODE_INSTANCE_VARIABLE_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "InstanceVariableTargetNode(", 27);
+            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);
-            }
+            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;
         }
@@ -1077,39 +1084,33 @@ 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 {
                 prettyprint_node(buffer, parser, (yp_node_t *)((yp_lambda_node_t *)node)->parameters);
             }
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_lambda_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_lambda_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_lambda_node_t *)node)->statements);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_lambda_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
-        case YP_NODE_LOCAL_VARIABLE_OPERATOR_AND_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "LocalVariableOperatorAndWriteNode(", 34);
-                        prettyprint_location(buffer, parser, &((yp_local_variable_operator_and_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_operator_and_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_operator_and_write_node_t *)node)->value);
+        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 constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_operator_and_write_node_t *)node)->constant_id);
-            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_buffer));
-            yp_buffer_append_str(buffer, ")", 1);
-            break;
-        }
-        case YP_NODE_LOCAL_VARIABLE_OPERATOR_OR_WRITE_NODE: {
-            yp_buffer_append_str(buffer, "LocalVariableOperatorOrWriteNode(", 33);
-                        prettyprint_location(buffer, parser, &((yp_local_variable_operator_or_write_node_t *)node)->name_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_local_variable_operator_or_write_node_t *)node)->operator_loc);
-            yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_local_variable_operator_or_write_node_t *)node)->value);
-            yp_buffer_append_str(buffer, ", ", 2);            char constant_id_buffer[12];
-            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_operator_or_write_node_t *)node)->constant_id);
+            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_and_write_node_t *)node)->constant_id);
             yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_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;
         }
@@ -1124,6 +1125,23 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             yp_buffer_append_str(buffer, ", ", 2);            char operator_id_buffer[12];
             snprintf(operator_id_buffer, sizeof(operator_id_buffer), "%u", ((yp_local_variable_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 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 constant_id_buffer[12];
+            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_or_write_node_t *)node)->constant_id);
+            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_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;
         }
@@ -1138,6 +1156,17 @@ 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_TARGET_NODE: {
+            yp_buffer_append_str(buffer, "LocalVariableTargetNode(", 24);
+                        char constant_id_buffer[12];
+            snprintf(constant_id_buffer, sizeof(constant_id_buffer), "%u", ((yp_local_variable_target_node_t *)node)->constant_id);
+            yp_buffer_append_str(buffer, constant_id_buffer, strlen(constant_id_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];
@@ -1146,17 +1175,9 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
             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_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_location(buffer, parser, &((yp_local_variable_write_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ")", 1);
             break;
         }
@@ -1193,12 +1214,15 @@ 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_module_node_t *)node)->module_keyword_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_module_node_t *)node)->constant_path);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_module_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_module_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_module_node_t *)node)->statements);
+                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_str(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;
         }
@@ -1326,10 +1350,10 @@ prettyprint_node(yp_buffer_t *buffer, yp_parser_t *parser, yp_node_t *node) {
         }
         case YP_NODE_PARENTHESES_NODE: {
             yp_buffer_append_str(buffer, "ParenthesesNode(", 16);
-                        if (((yp_parentheses_node_t *)node)->statements == NULL) {
+                        if (((yp_parentheses_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_parentheses_node_t *)node)->statements);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_parentheses_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_parentheses_node_t *)node)->opening_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_parentheses_node_t *)node)->closing_loc);
@@ -1542,10 +1566,10 @@ 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_singleton_class_node_t *)node)->class_keyword_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_singleton_class_node_t *)node)->operator_loc);
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_node(buffer, parser, (yp_node_t *)((yp_singleton_class_node_t *)node)->expression);
-            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_singleton_class_node_t *)node)->statements == NULL) {
+            yp_buffer_append_str(buffer, ", ", 2);            if (((yp_singleton_class_node_t *)node)->body == NULL) {
                 yp_buffer_append_str(buffer, "nil", 3);
             } else {
-                prettyprint_node(buffer, parser, (yp_node_t *)((yp_singleton_class_node_t *)node)->statements);
+                prettyprint_node(buffer, parser, (yp_node_t *)((yp_singleton_class_node_t *)node)->body);
             }
             yp_buffer_append_str(buffer, ", ", 2);            prettyprint_location(buffer, parser, &((yp_singleton_class_node_t *)node)->end_keyword_loc);
             yp_buffer_append_str(buffer, ")", 1);
@@ -1650,7 +1674,11 @@ 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 {
@@ -1704,6 +1732,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);
@@ -1736,6 +1769,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);