yarp 0.8.0 → 0.10.0

data/ext/yarp/api_node.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/ext/yarp/api_node.c.erb                                          */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
@@ -17,7 +17,6 @@ extern VALUE rb_cYARPLocation;
 static VALUE rb_cYARPAliasNode;
 static VALUE rb_cYARPAlternationPatternNode;
 static VALUE rb_cYARPAndNode;
-static VALUE rb_cYARPAndWriteNode;
 static VALUE rb_cYARPArgumentsNode;
 static VALUE rb_cYARPArrayNode;
 static VALUE rb_cYARPArrayPatternNode;
@@ -37,11 +36,23 @@ static VALUE rb_cYARPCallOperatorWriteNode;
 static VALUE rb_cYARPCapturePatternNode;
 static VALUE rb_cYARPCaseNode;
 static VALUE rb_cYARPClassNode;
+static VALUE rb_cYARPClassVariableAndWriteNode;
+static VALUE rb_cYARPClassVariableOperatorWriteNode;
+static VALUE rb_cYARPClassVariableOrWriteNode;
 static VALUE rb_cYARPClassVariableReadNode;
+static VALUE rb_cYARPClassVariableTargetNode;
 static VALUE rb_cYARPClassVariableWriteNode;
+static VALUE rb_cYARPConstantAndWriteNode;
+static VALUE rb_cYARPConstantOperatorWriteNode;
+static VALUE rb_cYARPConstantOrWriteNode;
+static VALUE rb_cYARPConstantPathAndWriteNode;
 static VALUE rb_cYARPConstantPathNode;
+static VALUE rb_cYARPConstantPathOperatorWriteNode;
+static VALUE rb_cYARPConstantPathOrWriteNode;
+static VALUE rb_cYARPConstantPathTargetNode;
 static VALUE rb_cYARPConstantPathWriteNode;
 static VALUE rb_cYARPConstantReadNode;
+static VALUE rb_cYARPConstantTargetNode;
 static VALUE rb_cYARPConstantWriteNode;
 static VALUE rb_cYARPDefNode;
 static VALUE rb_cYARPDefinedNode;
@@ -57,14 +68,22 @@ static VALUE rb_cYARPForNode;
 static VALUE rb_cYARPForwardingArgumentsNode;
 static VALUE rb_cYARPForwardingParameterNode;
 static VALUE rb_cYARPForwardingSuperNode;
+static VALUE rb_cYARPGlobalVariableAndWriteNode;
+static VALUE rb_cYARPGlobalVariableOperatorWriteNode;
+static VALUE rb_cYARPGlobalVariableOrWriteNode;
 static VALUE rb_cYARPGlobalVariableReadNode;
+static VALUE rb_cYARPGlobalVariableTargetNode;
 static VALUE rb_cYARPGlobalVariableWriteNode;
 static VALUE rb_cYARPHashNode;
 static VALUE rb_cYARPHashPatternNode;
 static VALUE rb_cYARPIfNode;
 static VALUE rb_cYARPImaginaryNode;
 static VALUE rb_cYARPInNode;
+static VALUE rb_cYARPInstanceVariableAndWriteNode;
+static VALUE rb_cYARPInstanceVariableOperatorWriteNode;
+static VALUE rb_cYARPInstanceVariableOrWriteNode;
 static VALUE rb_cYARPInstanceVariableReadNode;
+static VALUE rb_cYARPInstanceVariableTargetNode;
 static VALUE rb_cYARPInstanceVariableWriteNode;
 static VALUE rb_cYARPIntegerNode;
 static VALUE rb_cYARPInterpolatedRegularExpressionNode;
@@ -75,7 +94,11 @@ static VALUE rb_cYARPKeywordHashNode;
 static VALUE rb_cYARPKeywordParameterNode;
 static VALUE rb_cYARPKeywordRestParameterNode;
 static VALUE rb_cYARPLambdaNode;
+static VALUE rb_cYARPLocalVariableAndWriteNode;
+static VALUE rb_cYARPLocalVariableOperatorWriteNode;
+static VALUE rb_cYARPLocalVariableOrWriteNode;
 static VALUE rb_cYARPLocalVariableReadNode;
+static VALUE rb_cYARPLocalVariableTargetNode;
 static VALUE rb_cYARPLocalVariableWriteNode;
 static VALUE rb_cYARPMatchPredicateNode;
 static VALUE rb_cYARPMatchRequiredNode;
@@ -86,10 +109,8 @@ static VALUE rb_cYARPNextNode;
 static VALUE rb_cYARPNilNode;
 static VALUE rb_cYARPNoKeywordsParameterNode;
 static VALUE rb_cYARPNumberedReferenceReadNode;
-static VALUE rb_cYARPOperatorWriteNode;
 static VALUE rb_cYARPOptionalParameterNode;
 static VALUE rb_cYARPOrNode;
-static VALUE rb_cYARPOrWriteNode;
 static VALUE rb_cYARPParametersNode;
 static VALUE rb_cYARPParenthesesNode;
 static VALUE rb_cYARPPinnedExpressionNode;
@@ -129,7 +150,7 @@ static VALUE rb_cYARPXStringNode;
 static VALUE rb_cYARPYieldNode;
 
 static VALUE
-yp_location_new(yp_parser_t *parser, const char *start, const char *end, VALUE source) {
+yp_location_new(yp_parser_t *parser, const uint8_t *start, const uint8_t *end, VALUE source) {
     VALUE argv[] = { source, LONG2FIX(start - parser->start), LONG2FIX(end - start) };
     return rb_class_new_instance(3, argv, rb_cYARPLocation);
 }
@@ -141,7 +162,7 @@ yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALU
 
     VALUE argv[] = {
         ID2SYM(type),
-        rb_enc_str_new(token->start, token->end - token->start, encoding),
+        rb_enc_str_new((const char *) token->start, token->end - token->start, encoding),
         location
     };
 
@@ -150,13 +171,13 @@ yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALU
 
 static VALUE
 yp_string_new(yp_string_t *string, rb_encoding *encoding) {
-    return rb_enc_str_new(yp_string_source(string), yp_string_length(string), encoding);
+    return rb_enc_str_new((const char *) yp_string_source(string), yp_string_length(string), encoding);
 }
 
 // Create a YARP::Source object from the given parser.
 VALUE
 yp_source_new(yp_parser_t *parser) {
-    VALUE source = rb_str_new(parser->start, parser->end - parser->start);
+    VALUE source = rb_str_new((const char *) parser->start, parser->end - parser->start);
     VALUE offsets = rb_ary_new_capa(parser->newline_list.size);
 
     for (size_t index = 0; index < parser->newline_list.size; index++) {
@@ -202,7 +223,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
         yp_constant_t constant = parser->constant_pool.constants[index];
 
         if (constant.id != 0) {
-            constants[constant.id - 1] = rb_intern3(constant.start, constant.length, encoding);
+            constants[constant.id - 1] = rb_intern3((const char *) constant.start, constant.length, encoding);
         }
     }
 
@@ -243,13 +264,6 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->right);
                     break;
                 }
-#line 111 "api_node.c.erb"
-                case YP_NODE_AND_WRITE_NODE: {
-                    yp_and_write_node_t *cast = (yp_and_write_node_t *) node;
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
-                    break;
-                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_ARGUMENTS_NODE: {
                     yp_arguments_node_t *cast = (yp_arguments_node_t *) node;
@@ -380,12 +394,55 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->body);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
+                    yp_class_variable_and_write_node_t *cast = (yp_class_variable_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_class_variable_operator_write_node_t *cast = (yp_class_variable_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
+                    yp_class_variable_or_write_node_t *cast = (yp_class_variable_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_WRITE_NODE: {
                     yp_class_variable_write_node_t *cast = (yp_class_variable_write_node_t *) node;
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_AND_WRITE_NODE: {
+                    yp_constant_and_write_node_t *cast = (yp_constant_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_OPERATOR_WRITE_NODE: {
+                    yp_constant_operator_write_node_t *cast = (yp_constant_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_OR_WRITE_NODE: {
+                    yp_constant_or_write_node_t *cast = (yp_constant_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_AND_WRITE_NODE: {
+                    yp_constant_path_and_write_node_t *cast = (yp_constant_path_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_CONSTANT_PATH_NODE: {
                     yp_constant_path_node_t *cast = (yp_constant_path_node_t *) node;
@@ -393,6 +450,27 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->child);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
+                    yp_constant_path_operator_write_node_t *cast = (yp_constant_path_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_OR_WRITE_NODE: {
+                    yp_constant_path_or_write_node_t *cast = (yp_constant_path_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_TARGET_NODE: {
+                    yp_constant_path_target_node_t *cast = (yp_constant_path_target_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->parent);
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->child);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_CONSTANT_PATH_WRITE_NODE: {
                     yp_constant_path_write_node_t *cast = (yp_constant_path_write_node_t *) node;
@@ -476,6 +554,24 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->block);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE: {
+                    yp_global_variable_and_write_node_t *cast = (yp_global_variable_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_global_variable_operator_write_node_t *cast = (yp_global_variable_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE: {
+                    yp_global_variable_or_write_node_t *cast = (yp_global_variable_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_GLOBAL_VARIABLE_WRITE_NODE: {
                     yp_global_variable_write_node_t *cast = (yp_global_variable_write_node_t *) node;
@@ -521,6 +617,24 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->statements);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+                    yp_instance_variable_and_write_node_t *cast = (yp_instance_variable_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_instance_variable_operator_write_node_t *cast = (yp_instance_variable_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE: {
+                    yp_instance_variable_or_write_node_t *cast = (yp_instance_variable_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_WRITE_NODE: {
                     yp_instance_variable_write_node_t *cast = (yp_instance_variable_write_node_t *) node;
@@ -580,6 +694,24 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->body);
                     break;
                 }
+#line 111 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE: {
+                    yp_local_variable_and_write_node_t *cast = (yp_local_variable_and_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_local_variable_operator_write_node_t *cast = (yp_local_variable_operator_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
+#line 111 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE: {
+                    yp_local_variable_or_write_node_t *cast = (yp_local_variable_or_write_node_t *) node;
+                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
+                    break;
+                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_LOCAL_VARIABLE_WRITE_NODE: {
                     yp_local_variable_write_node_t *cast = (yp_local_variable_write_node_t *) node;
@@ -622,13 +754,6 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->arguments);
                     break;
                 }
-#line 111 "api_node.c.erb"
-                case YP_NODE_OPERATOR_WRITE_NODE: {
-                    yp_operator_write_node_t *cast = (yp_operator_write_node_t *) node;
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
-                    break;
-                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_OPTIONAL_PARAMETER_NODE: {
                     yp_optional_parameter_node_t *cast = (yp_optional_parameter_node_t *) node;
@@ -642,13 +767,6 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_node_stack_push(&node_stack, (yp_node_t *) cast->right);
                     break;
                 }
-#line 111 "api_node.c.erb"
-                case YP_NODE_OR_WRITE_NODE: {
-                    yp_or_write_node_t *cast = (yp_or_write_node_t *) node;
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->target);
-                    yp_node_stack_push(&node_stack, (yp_node_t *) cast->value);
-                    break;
-                }
 #line 111 "api_node.c.erb"
                 case YP_NODE_PARAMETERS_NODE: {
                     yp_parameters_node_t *cast = (yp_parameters_node_t *) node;
@@ -898,26 +1016,6 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPAndNode));
                     break;
                 }
-#line 137 "api_node.c.erb"
-                case YP_NODE_AND_WRITE_NODE: {
-                    yp_and_write_node_t *cast = (yp_and_write_node_t *) node;
-                    VALUE argv[4];
-
-                    // target
-                    argv[0] = rb_ary_pop(value_stack);
-
-                    // value
-                    argv[1] = rb_ary_pop(value_stack);
-
-                    // operator_loc
-                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
-
-                    // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
-
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPAndWriteNode));
-                    break;
-                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_ARGUMENTS_NODE: {
                     yp_arguments_node_t *cast = (yp_arguments_node_t *) node;
@@ -1268,8 +1366,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // value
                     argv[2] = rb_ary_pop(value_stack);
 
-                    // operator_id
-                    argv[3] = rb_id2sym(constants[cast->operator_id - 1]);
+                    // operator
+                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
 
                     // location
                     argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -1329,7 +1427,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_NODE: {
                     yp_class_node_t *cast = (yp_class_node_t *) node;
-                    VALUE argv[8];
+                    VALUE argv[9];
 
                     // locals
                     argv[0] = rb_ary_new_capa(cast->locals.size);
@@ -1355,40 +1453,219 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // end_keyword_loc
                     argv[6] = yp_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
 
+                    // name
+                    argv[7] = yp_string_new(&cast->name, encoding);
+
                     // location
-                    argv[7] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[8] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(8, argv, rb_cYARPClassNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(9, argv, rb_cYARPClassNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
+                    yp_class_variable_and_write_node_t *cast = (yp_class_variable_and_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableAndWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_class_variable_operator_write_node_t *cast = (yp_class_variable_operator_write_node_t *) node;
+                    VALUE argv[6];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
+
+                    // operator
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
+
+                    // location
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPClassVariableOperatorWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
+                    yp_class_variable_or_write_node_t *cast = (yp_class_variable_or_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableOrWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_READ_NODE: {
-                    VALUE argv[1];
+                    yp_class_variable_read_node_t *cast = (yp_class_variable_read_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPClassVariableReadNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPClassVariableReadNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CLASS_VARIABLE_TARGET_NODE: {
+                    yp_class_variable_target_node_t *cast = (yp_class_variable_target_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // location
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPClassVariableTargetNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_WRITE_NODE: {
                     yp_class_variable_write_node_t *cast = (yp_class_variable_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[3] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_AND_WRITE_NODE: {
+                    yp_constant_and_write_node_t *cast = (yp_constant_and_write_node_t *) node;
                     VALUE argv[4];
 
                     // name_loc
                     argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
                     // value
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantAndWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_OPERATOR_WRITE_NODE: {
+                    yp_constant_operator_write_node_t *cast = (yp_constant_operator_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[2] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // operator
+                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPConstantOperatorWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_OR_WRITE_NODE: {
+                    yp_constant_or_write_node_t *cast = (yp_constant_or_write_node_t *) node;
+                    VALUE argv[4];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // location
                     argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPClassVariableWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantOrWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_AND_WRITE_NODE: {
+                    yp_constant_path_and_write_node_t *cast = (yp_constant_path_and_write_node_t *) node;
+                    VALUE argv[4];
+
+                    // target
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantPathAndWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -1411,6 +1688,69 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantPathNode));
                     break;
                 }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_OPERATOR_WRITE_NODE: {
+                    yp_constant_path_operator_write_node_t *cast = (yp_constant_path_operator_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // target
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // operator
+                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPConstantPathOperatorWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_OR_WRITE_NODE: {
+                    yp_constant_path_or_write_node_t *cast = (yp_constant_path_or_write_node_t *) node;
+                    VALUE argv[4];
+
+                    // target
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantPathOrWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_PATH_TARGET_NODE: {
+                    yp_constant_path_target_node_t *cast = (yp_constant_path_target_node_t *) node;
+                    VALUE argv[4];
+
+                    // parent
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // child
+                    argv[1] = rb_ary_pop(value_stack);
+
+                    // delimiter_loc
+                    argv[2] = yp_location_new(parser, cast->delimiter_loc.start, cast->delimiter_loc.end, source);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPConstantPathTargetNode));
+                    break;
+                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CONSTANT_PATH_WRITE_NODE: {
                     yp_constant_path_write_node_t *cast = (yp_constant_path_write_node_t *) node;
@@ -1420,7 +1760,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     argv[0] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[1] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
                     argv[2] = rb_ary_pop(value_stack);
@@ -1441,6 +1781,16 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPConstantReadNode));
                     break;
                 }
+#line 137 "api_node.c.erb"
+                case YP_NODE_CONSTANT_TARGET_NODE: {
+                    VALUE argv[1];
+
+                    // location
+                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPConstantTargetNode));
+                    break;
+                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CONSTANT_WRITE_NODE: {
                     yp_constant_write_node_t *cast = (yp_constant_write_node_t *) node;
@@ -1453,7 +1803,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     argv[1] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[2] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
                     argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -1748,6 +2098,69 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPForwardingSuperNode));
                     break;
                 }
+#line 137 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE: {
+                    yp_global_variable_and_write_node_t *cast = (yp_global_variable_and_write_node_t *) node;
+                    VALUE argv[4];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPGlobalVariableAndWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_global_variable_operator_write_node_t *cast = (yp_global_variable_operator_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // operator
+                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPGlobalVariableOperatorWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE: {
+                    yp_global_variable_or_write_node_t *cast = (yp_global_variable_or_write_node_t *) node;
+                    VALUE argv[4];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPGlobalVariableOrWriteNode));
+                    break;
+                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_GLOBAL_VARIABLE_READ_NODE: {
                     VALUE argv[1];
@@ -1758,6 +2171,16 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPGlobalVariableReadNode));
                     break;
                 }
+#line 137 "api_node.c.erb"
+                case YP_NODE_GLOBAL_VARIABLE_TARGET_NODE: {
+                    VALUE argv[1];
+
+                    // location
+                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPGlobalVariableTargetNode));
+                    break;
+                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_GLOBAL_VARIABLE_WRITE_NODE: {
                     yp_global_variable_write_node_t *cast = (yp_global_variable_write_node_t *) node;
@@ -1766,11 +2189,11 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // name_loc
                     argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
-                    // operator_loc
-                    argv[1] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
-
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[1] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
                     argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -1821,105 +2244,198 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // opening_loc
                     argv[3] = cast->opening_loc.start == NULL ? Qnil : yp_location_new(parser, cast->opening_loc.start, cast->opening_loc.end, source);
 
-                    // closing_loc
-                    argv[4] = cast->closing_loc.start == NULL ? Qnil : yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
+                    // closing_loc
+                    argv[4] = cast->closing_loc.start == NULL ? Qnil : yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
+
+                    // location
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPHashPatternNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_IF_NODE: {
+                    yp_if_node_t *cast = (yp_if_node_t *) node;
+                    VALUE argv[6];
+
+                    // if_keyword_loc
+                    argv[0] = cast->if_keyword_loc.start == NULL ? Qnil : yp_location_new(parser, cast->if_keyword_loc.start, cast->if_keyword_loc.end, source);
+
+                    // predicate
+                    argv[1] = rb_ary_pop(value_stack);
+
+                    // statements
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // consequent
+                    argv[3] = rb_ary_pop(value_stack);
+
+                    // end_keyword_loc
+                    argv[4] = cast->end_keyword_loc.start == NULL ? Qnil : yp_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
+
+                    // location
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPIfNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_IMAGINARY_NODE: {
+                    VALUE argv[2];
+
+                    // numeric
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // location
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPImaginaryNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_IN_NODE: {
+                    yp_in_node_t *cast = (yp_in_node_t *) node;
+                    VALUE argv[5];
+
+                    // pattern
+                    argv[0] = rb_ary_pop(value_stack);
+
+                    // statements
+                    argv[1] = rb_ary_pop(value_stack);
+
+                    // in_loc
+                    argv[2] = yp_location_new(parser, cast->in_loc.start, cast->in_loc.end, source);
+
+                    // then_loc
+                    argv[3] = cast->then_loc.start == NULL ? Qnil : yp_location_new(parser, cast->then_loc.start, cast->then_loc.end, source);
+
+                    // location
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
+                    yp_instance_variable_and_write_node_t *cast = (yp_instance_variable_and_write_node_t *) node;
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPHashPatternNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableAndWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
-                case YP_NODE_IF_NODE: {
-                    yp_if_node_t *cast = (yp_if_node_t *) node;
+                case YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_instance_variable_operator_write_node_t *cast = (yp_instance_variable_operator_write_node_t *) node;
                     VALUE argv[6];
 
-                    // if_keyword_loc
-                    argv[0] = cast->if_keyword_loc.start == NULL ? Qnil : yp_location_new(parser, cast->if_keyword_loc.start, cast->if_keyword_loc.end, source);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
-                    // predicate
-                    argv[1] = rb_ary_pop(value_stack);
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
-                    // statements
-                    argv[2] = rb_ary_pop(value_stack);
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
-                    // consequent
+                    // value
                     argv[3] = rb_ary_pop(value_stack);
 
-                    // end_keyword_loc
-                    argv[4] = cast->end_keyword_loc.start == NULL ? Qnil : yp_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
+                    // operator
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
 
                     // location
                     argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPIfNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPInstanceVariableOperatorWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
-                case YP_NODE_IMAGINARY_NODE: {
-                    VALUE argv[2];
+                case YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE: {
+                    yp_instance_variable_or_write_node_t *cast = (yp_instance_variable_or_write_node_t *) node;
+                    VALUE argv[5];
 
-                    // numeric
-                    argv[0] = rb_ary_pop(value_stack);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // name_loc
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPImaginaryNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableOrWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
-                case YP_NODE_IN_NODE: {
-                    yp_in_node_t *cast = (yp_in_node_t *) node;
-                    VALUE argv[5];
-
-                    // pattern
-                    argv[0] = rb_ary_pop(value_stack);
-
-                    // statements
-                    argv[1] = rb_ary_pop(value_stack);
-
-                    // in_loc
-                    argv[2] = yp_location_new(parser, cast->in_loc.start, cast->in_loc.end, source);
+                case YP_NODE_INSTANCE_VARIABLE_READ_NODE: {
+                    yp_instance_variable_read_node_t *cast = (yp_instance_variable_read_node_t *) node;
+                    VALUE argv[2];
 
-                    // then_loc
-                    argv[3] = cast->then_loc.start == NULL ? Qnil : yp_location_new(parser, cast->then_loc.start, cast->then_loc.end, source);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPInstanceVariableReadNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
-                case YP_NODE_INSTANCE_VARIABLE_READ_NODE: {
-                    VALUE argv[1];
+                case YP_NODE_INSTANCE_VARIABLE_TARGET_NODE: {
+                    yp_instance_variable_target_node_t *cast = (yp_instance_variable_target_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPInstanceVariableReadNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPInstanceVariableTargetNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_WRITE_NODE: {
                     yp_instance_variable_write_node_t *cast = (yp_instance_variable_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // value
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[2] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[3] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPInstanceVariableWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2081,7 +2597,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_LAMBDA_NODE: {
                     yp_lambda_node_t *cast = (yp_lambda_node_t *) node;
-                    VALUE argv[5];
+                    VALUE argv[7];
 
                     // locals
                     argv[0] = rb_ary_new_capa(cast->locals.size);
@@ -2089,19 +2605,106 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                         rb_ary_push(argv[0], rb_id2sym(constants[cast->locals.ids[index] - 1]));
                     }
 
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
                     // opening_loc
-                    argv[1] = yp_location_new(parser, cast->opening_loc.start, cast->opening_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->opening_loc.start, cast->opening_loc.end, source);
+
+                    // closing_loc
+                    argv[3] = yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
 
                     // parameters
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[4] = rb_ary_pop(value_stack);
 
                     // body
-                    argv[3] = rb_ary_pop(value_stack);
+                    argv[5] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[6] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(7, argv, rb_cYARPLambdaNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE: {
+                    yp_local_variable_and_write_node_t *cast = (yp_local_variable_and_write_node_t *) node;
+                    VALUE argv[6];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
+
+                    // depth
+                    argv[4] = ULONG2NUM(cast->depth);
+
+                    // location
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPLocalVariableAndWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE: {
+                    yp_local_variable_operator_write_node_t *cast = (yp_local_variable_operator_write_node_t *) node;
+                    VALUE argv[7];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPLambdaNode));
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
+
+                    // operator
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
+
+                    // depth
+                    argv[5] = ULONG2NUM(cast->depth);
+
+                    // location
+                    argv[6] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(7, argv, rb_cYARPLocalVariableOperatorWriteNode));
+                    break;
+                }
+#line 137 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE: {
+                    yp_local_variable_or_write_node_t *cast = (yp_local_variable_or_write_node_t *) node;
+                    VALUE argv[6];
+
+                    // name_loc
+                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // operator_loc
+                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+
+                    // value
+                    argv[2] = rb_ary_pop(value_stack);
+
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
+
+                    // depth
+                    argv[4] = ULONG2NUM(cast->depth);
+
+                    // location
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPLocalVariableOrWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2109,8 +2712,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_local_variable_read_node_t *cast = (yp_local_variable_read_node_t *) node;
                     VALUE argv[3];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[1] = ULONG2NUM(cast->depth);
@@ -2121,25 +2724,42 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(3, argv, rb_cYARPLocalVariableReadNode));
                     break;
                 }
+#line 137 "api_node.c.erb"
+                case YP_NODE_LOCAL_VARIABLE_TARGET_NODE: {
+                    yp_local_variable_target_node_t *cast = (yp_local_variable_target_node_t *) node;
+                    VALUE argv[3];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
+
+                    // depth
+                    argv[1] = ULONG2NUM(cast->depth);
+
+                    // location
+                    argv[2] = yp_location_new(parser, node->location.start, node->location.end, source);
+
+                    rb_ary_push(value_stack, rb_class_new_instance(3, argv, rb_cYARPLocalVariableTargetNode));
+                    break;
+                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_LOCAL_VARIABLE_WRITE_NODE: {
                     yp_local_variable_write_node_t *cast = (yp_local_variable_write_node_t *) node;
                     VALUE argv[6];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[1] = ULONG2NUM(cast->depth);
 
-                    // value
-                    argv[2] = rb_ary_pop(value_stack);
-
                     // name_loc
-                    argv[3] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[4] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[4] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
                     argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -2200,7 +2820,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_MODULE_NODE: {
                     yp_module_node_t *cast = (yp_module_node_t *) node;
-                    VALUE argv[6];
+                    VALUE argv[7];
 
                     // locals
                     argv[0] = rb_ary_new_capa(cast->locals.size);
@@ -2220,10 +2840,13 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // end_keyword_loc
                     argv[4] = yp_location_new(parser, cast->end_keyword_loc.start, cast->end_keyword_loc.end, source);
 
+                    // name
+                    argv[5] = yp_string_new(&cast->name, encoding);
+
                     // location
-                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[6] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPModuleNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(7, argv, rb_cYARPModuleNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2301,35 +2924,16 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_NUMBERED_REFERENCE_READ_NODE: {
-                    VALUE argv[1];
-
-                    // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
-
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPNumberedReferenceReadNode));
-                    break;
-                }
-#line 137 "api_node.c.erb"
-                case YP_NODE_OPERATOR_WRITE_NODE: {
-                    yp_operator_write_node_t *cast = (yp_operator_write_node_t *) node;
-                    VALUE argv[5];
-
-                    // target
-                    argv[0] = rb_ary_pop(value_stack);
-
-                    // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
-
-                    // operator
-                    argv[2] = rb_id2sym(constants[cast->operator - 1]);
+                    yp_numbered_reference_read_node_t *cast = (yp_numbered_reference_read_node_t *) node;
+                    VALUE argv[2];
 
-                    // value
-                    argv[3] = rb_ary_pop(value_stack);
+                    // number
+                    argv[0] = ULONG2NUM(cast->number);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPOperatorWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPNumberedReferenceReadNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2337,8 +2941,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_optional_parameter_node_t *cast = (yp_optional_parameter_node_t *) node;
                     VALUE argv[5];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
                     argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
@@ -2375,26 +2979,6 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPOrNode));
                     break;
                 }
-#line 137 "api_node.c.erb"
-                case YP_NODE_OR_WRITE_NODE: {
-                    yp_or_write_node_t *cast = (yp_or_write_node_t *) node;
-                    VALUE argv[4];
-
-                    // target
-                    argv[0] = rb_ary_pop(value_stack);
-
-                    // value
-                    argv[1] = rb_ary_pop(value_stack);
-
-                    // operator_loc
-                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
-
-                    // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
-
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPOrWriteNode));
-                    break;
-                }
 #line 137 "api_node.c.erb"
                 case YP_NODE_PARAMETERS_NODE: {
                     yp_parameters_node_t *cast = (yp_parameters_node_t *) node;
@@ -2665,8 +3249,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_required_parameter_node_t *cast = (yp_required_parameter_node_t *) node;
                     VALUE argv[2];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
                     argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -2954,7 +3538,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     argv[0] = cast->opening_loc.start == NULL ? Qnil : yp_location_new(parser, cast->opening_loc.start, cast->opening_loc.end, source);
 
                     // value_loc
-                    argv[1] = yp_location_new(parser, cast->value_loc.start, cast->value_loc.end, source);
+                    argv[1] = cast->value_loc.start == NULL ? Qnil : yp_location_new(parser, cast->value_loc.start, cast->value_loc.end, source);
 
                     // closing_loc
                     argv[2] = cast->closing_loc.start == NULL ? Qnil : yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
@@ -3027,24 +3611,27 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_UNTIL_NODE: {
                     yp_until_node_t *cast = (yp_until_node_t *) node;
-                    VALUE argv[5];
+                    VALUE argv[6];
 
                     // keyword_loc
                     argv[0] = yp_location_new(parser, cast->keyword_loc.start, cast->keyword_loc.end, source);
 
+                    // closing_loc
+                    argv[1] = cast->closing_loc.start == NULL ? Qnil : yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
+
                     // predicate
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // statements
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // flags
-                    argv[3] = ULONG2NUM(node->flags >> 1);
+                    argv[4] = ULONG2NUM(node->flags >> 1);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPUntilNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPUntilNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -3073,24 +3660,27 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_WHILE_NODE: {
                     yp_while_node_t *cast = (yp_while_node_t *) node;
-                    VALUE argv[5];
+                    VALUE argv[6];
 
                     // keyword_loc
                     argv[0] = yp_location_new(parser, cast->keyword_loc.start, cast->keyword_loc.end, source);
 
+                    // closing_loc
+                    argv[1] = cast->closing_loc.start == NULL ? Qnil : yp_location_new(parser, cast->closing_loc.start, cast->closing_loc.end, source);
+
                     // predicate
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // statements
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // flags
-                    argv[3] = ULONG2NUM(node->flags >> 1);
+                    argv[4] = ULONG2NUM(node->flags >> 1);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPWhileNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPWhileNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -3155,7 +3745,6 @@ Init_yarp_api_node(void) {
     rb_cYARPAliasNode = rb_define_class_under(rb_cYARP, "AliasNode", rb_cYARPNode);
     rb_cYARPAlternationPatternNode = rb_define_class_under(rb_cYARP, "AlternationPatternNode", rb_cYARPNode);
     rb_cYARPAndNode = rb_define_class_under(rb_cYARP, "AndNode", rb_cYARPNode);
-    rb_cYARPAndWriteNode = rb_define_class_under(rb_cYARP, "AndWriteNode", rb_cYARPNode);
     rb_cYARPArgumentsNode = rb_define_class_under(rb_cYARP, "ArgumentsNode", rb_cYARPNode);
     rb_cYARPArrayNode = rb_define_class_under(rb_cYARP, "ArrayNode", rb_cYARPNode);
     rb_cYARPArrayPatternNode = rb_define_class_under(rb_cYARP, "ArrayPatternNode", rb_cYARPNode);
@@ -3175,11 +3764,23 @@ Init_yarp_api_node(void) {
     rb_cYARPCapturePatternNode = rb_define_class_under(rb_cYARP, "CapturePatternNode", rb_cYARPNode);
     rb_cYARPCaseNode = rb_define_class_under(rb_cYARP, "CaseNode", rb_cYARPNode);
     rb_cYARPClassNode = rb_define_class_under(rb_cYARP, "ClassNode", rb_cYARPNode);
+    rb_cYARPClassVariableAndWriteNode = rb_define_class_under(rb_cYARP, "ClassVariableAndWriteNode", rb_cYARPNode);
+    rb_cYARPClassVariableOperatorWriteNode = rb_define_class_under(rb_cYARP, "ClassVariableOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPClassVariableOrWriteNode = rb_define_class_under(rb_cYARP, "ClassVariableOrWriteNode", rb_cYARPNode);
     rb_cYARPClassVariableReadNode = rb_define_class_under(rb_cYARP, "ClassVariableReadNode", rb_cYARPNode);
+    rb_cYARPClassVariableTargetNode = rb_define_class_under(rb_cYARP, "ClassVariableTargetNode", rb_cYARPNode);
     rb_cYARPClassVariableWriteNode = rb_define_class_under(rb_cYARP, "ClassVariableWriteNode", rb_cYARPNode);
+    rb_cYARPConstantAndWriteNode = rb_define_class_under(rb_cYARP, "ConstantAndWriteNode", rb_cYARPNode);
+    rb_cYARPConstantOperatorWriteNode = rb_define_class_under(rb_cYARP, "ConstantOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPConstantOrWriteNode = rb_define_class_under(rb_cYARP, "ConstantOrWriteNode", rb_cYARPNode);
+    rb_cYARPConstantPathAndWriteNode = rb_define_class_under(rb_cYARP, "ConstantPathAndWriteNode", rb_cYARPNode);
     rb_cYARPConstantPathNode = rb_define_class_under(rb_cYARP, "ConstantPathNode", rb_cYARPNode);
+    rb_cYARPConstantPathOperatorWriteNode = rb_define_class_under(rb_cYARP, "ConstantPathOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPConstantPathOrWriteNode = rb_define_class_under(rb_cYARP, "ConstantPathOrWriteNode", rb_cYARPNode);
+    rb_cYARPConstantPathTargetNode = rb_define_class_under(rb_cYARP, "ConstantPathTargetNode", rb_cYARPNode);
     rb_cYARPConstantPathWriteNode = rb_define_class_under(rb_cYARP, "ConstantPathWriteNode", rb_cYARPNode);
     rb_cYARPConstantReadNode = rb_define_class_under(rb_cYARP, "ConstantReadNode", rb_cYARPNode);
+    rb_cYARPConstantTargetNode = rb_define_class_under(rb_cYARP, "ConstantTargetNode", rb_cYARPNode);
     rb_cYARPConstantWriteNode = rb_define_class_under(rb_cYARP, "ConstantWriteNode", rb_cYARPNode);
     rb_cYARPDefNode = rb_define_class_under(rb_cYARP, "DefNode", rb_cYARPNode);
     rb_cYARPDefinedNode = rb_define_class_under(rb_cYARP, "DefinedNode", rb_cYARPNode);
@@ -3195,14 +3796,22 @@ Init_yarp_api_node(void) {
     rb_cYARPForwardingArgumentsNode = rb_define_class_under(rb_cYARP, "ForwardingArgumentsNode", rb_cYARPNode);
     rb_cYARPForwardingParameterNode = rb_define_class_under(rb_cYARP, "ForwardingParameterNode", rb_cYARPNode);
     rb_cYARPForwardingSuperNode = rb_define_class_under(rb_cYARP, "ForwardingSuperNode", rb_cYARPNode);
+    rb_cYARPGlobalVariableAndWriteNode = rb_define_class_under(rb_cYARP, "GlobalVariableAndWriteNode", rb_cYARPNode);
+    rb_cYARPGlobalVariableOperatorWriteNode = rb_define_class_under(rb_cYARP, "GlobalVariableOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPGlobalVariableOrWriteNode = rb_define_class_under(rb_cYARP, "GlobalVariableOrWriteNode", rb_cYARPNode);
     rb_cYARPGlobalVariableReadNode = rb_define_class_under(rb_cYARP, "GlobalVariableReadNode", rb_cYARPNode);
+    rb_cYARPGlobalVariableTargetNode = rb_define_class_under(rb_cYARP, "GlobalVariableTargetNode", rb_cYARPNode);
     rb_cYARPGlobalVariableWriteNode = rb_define_class_under(rb_cYARP, "GlobalVariableWriteNode", rb_cYARPNode);
     rb_cYARPHashNode = rb_define_class_under(rb_cYARP, "HashNode", rb_cYARPNode);
     rb_cYARPHashPatternNode = rb_define_class_under(rb_cYARP, "HashPatternNode", rb_cYARPNode);
     rb_cYARPIfNode = rb_define_class_under(rb_cYARP, "IfNode", rb_cYARPNode);
     rb_cYARPImaginaryNode = rb_define_class_under(rb_cYARP, "ImaginaryNode", rb_cYARPNode);
     rb_cYARPInNode = rb_define_class_under(rb_cYARP, "InNode", rb_cYARPNode);
+    rb_cYARPInstanceVariableAndWriteNode = rb_define_class_under(rb_cYARP, "InstanceVariableAndWriteNode", rb_cYARPNode);
+    rb_cYARPInstanceVariableOperatorWriteNode = rb_define_class_under(rb_cYARP, "InstanceVariableOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPInstanceVariableOrWriteNode = rb_define_class_under(rb_cYARP, "InstanceVariableOrWriteNode", rb_cYARPNode);
     rb_cYARPInstanceVariableReadNode = rb_define_class_under(rb_cYARP, "InstanceVariableReadNode", rb_cYARPNode);
+    rb_cYARPInstanceVariableTargetNode = rb_define_class_under(rb_cYARP, "InstanceVariableTargetNode", rb_cYARPNode);
     rb_cYARPInstanceVariableWriteNode = rb_define_class_under(rb_cYARP, "InstanceVariableWriteNode", rb_cYARPNode);
     rb_cYARPIntegerNode = rb_define_class_under(rb_cYARP, "IntegerNode", rb_cYARPNode);
     rb_cYARPInterpolatedRegularExpressionNode = rb_define_class_under(rb_cYARP, "InterpolatedRegularExpressionNode", rb_cYARPNode);
@@ -3213,7 +3822,11 @@ Init_yarp_api_node(void) {
     rb_cYARPKeywordParameterNode = rb_define_class_under(rb_cYARP, "KeywordParameterNode", rb_cYARPNode);
     rb_cYARPKeywordRestParameterNode = rb_define_class_under(rb_cYARP, "KeywordRestParameterNode", rb_cYARPNode);
     rb_cYARPLambdaNode = rb_define_class_under(rb_cYARP, "LambdaNode", rb_cYARPNode);
+    rb_cYARPLocalVariableAndWriteNode = rb_define_class_under(rb_cYARP, "LocalVariableAndWriteNode", rb_cYARPNode);
+    rb_cYARPLocalVariableOperatorWriteNode = rb_define_class_under(rb_cYARP, "LocalVariableOperatorWriteNode", rb_cYARPNode);
+    rb_cYARPLocalVariableOrWriteNode = rb_define_class_under(rb_cYARP, "LocalVariableOrWriteNode", rb_cYARPNode);
     rb_cYARPLocalVariableReadNode = rb_define_class_under(rb_cYARP, "LocalVariableReadNode", rb_cYARPNode);
+    rb_cYARPLocalVariableTargetNode = rb_define_class_under(rb_cYARP, "LocalVariableTargetNode", rb_cYARPNode);
     rb_cYARPLocalVariableWriteNode = rb_define_class_under(rb_cYARP, "LocalVariableWriteNode", rb_cYARPNode);
     rb_cYARPMatchPredicateNode = rb_define_class_under(rb_cYARP, "MatchPredicateNode", rb_cYARPNode);
     rb_cYARPMatchRequiredNode = rb_define_class_under(rb_cYARP, "MatchRequiredNode", rb_cYARPNode);
@@ -3224,10 +3837,8 @@ Init_yarp_api_node(void) {
     rb_cYARPNilNode = rb_define_class_under(rb_cYARP, "NilNode", rb_cYARPNode);
     rb_cYARPNoKeywordsParameterNode = rb_define_class_under(rb_cYARP, "NoKeywordsParameterNode", rb_cYARPNode);
     rb_cYARPNumberedReferenceReadNode = rb_define_class_under(rb_cYARP, "NumberedReferenceReadNode", rb_cYARPNode);
-    rb_cYARPOperatorWriteNode = rb_define_class_under(rb_cYARP, "OperatorWriteNode", rb_cYARPNode);
     rb_cYARPOptionalParameterNode = rb_define_class_under(rb_cYARP, "OptionalParameterNode", rb_cYARPNode);
     rb_cYARPOrNode = rb_define_class_under(rb_cYARP, "OrNode", rb_cYARPNode);
-    rb_cYARPOrWriteNode = rb_define_class_under(rb_cYARP, "OrWriteNode", rb_cYARPNode);
     rb_cYARPParametersNode = rb_define_class_under(rb_cYARP, "ParametersNode", rb_cYARPNode);
     rb_cYARPParenthesesNode = rb_define_class_under(rb_cYARP, "ParenthesesNode", rb_cYARPNode);
     rb_cYARPPinnedExpressionNode = rb_define_class_under(rb_cYARP, "PinnedExpressionNode", rb_cYARPNode);