yarp 0.7.0 → 0.9.0

data/include/yarp/ast.h

@@ -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/include/yarp/ast.h.erb                                           */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
@@ -236,112 +236,119 @@ enum yp_node_type {
     YP_NODE_CAPTURE_PATTERN_NODE = 20,
     YP_NODE_CASE_NODE = 21,
     YP_NODE_CLASS_NODE = 22,
-    YP_NODE_CLASS_VARIABLE_OPERATOR_AND_WRITE_NODE = 23,
-    YP_NODE_CLASS_VARIABLE_OPERATOR_OR_WRITE_NODE = 24,
-    YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE = 25,
+    YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE = 23,
+    YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE = 24,
+    YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE = 25,
     YP_NODE_CLASS_VARIABLE_READ_NODE = 26,
-    YP_NODE_CLASS_VARIABLE_WRITE_NODE = 27,
-    YP_NODE_CONSTANT_OPERATOR_AND_WRITE_NODE = 28,
-    YP_NODE_CONSTANT_OPERATOR_OR_WRITE_NODE = 29,
+    YP_NODE_CLASS_VARIABLE_TARGET_NODE = 27,
+    YP_NODE_CLASS_VARIABLE_WRITE_NODE = 28,
+    YP_NODE_CONSTANT_AND_WRITE_NODE = 29,
     YP_NODE_CONSTANT_OPERATOR_WRITE_NODE = 30,
-    YP_NODE_CONSTANT_PATH_NODE = 31,
-    YP_NODE_CONSTANT_PATH_OPERATOR_AND_WRITE_NODE = 32,
-    YP_NODE_CONSTANT_PATH_OPERATOR_OR_WRITE_NODE = 33,
+    YP_NODE_CONSTANT_OR_WRITE_NODE = 31,
+    YP_NODE_CONSTANT_PATH_AND_WRITE_NODE = 32,
+    YP_NODE_CONSTANT_PATH_NODE = 33,
     YP_NODE_CONSTANT_PATH_OPERATOR_WRITE_NODE = 34,
-    YP_NODE_CONSTANT_PATH_WRITE_NODE = 35,
-    YP_NODE_CONSTANT_READ_NODE = 36,
-    YP_NODE_CONSTANT_WRITE_NODE = 37,
-    YP_NODE_DEF_NODE = 38,
-    YP_NODE_DEFINED_NODE = 39,
-    YP_NODE_ELSE_NODE = 40,
-    YP_NODE_EMBEDDED_STATEMENTS_NODE = 41,
-    YP_NODE_EMBEDDED_VARIABLE_NODE = 42,
-    YP_NODE_ENSURE_NODE = 43,
-    YP_NODE_FALSE_NODE = 44,
-    YP_NODE_FIND_PATTERN_NODE = 45,
-    YP_NODE_FLIP_FLOP_NODE = 46,
-    YP_NODE_FLOAT_NODE = 47,
-    YP_NODE_FOR_NODE = 48,
-    YP_NODE_FORWARDING_ARGUMENTS_NODE = 49,
-    YP_NODE_FORWARDING_PARAMETER_NODE = 50,
-    YP_NODE_FORWARDING_SUPER_NODE = 51,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_AND_WRITE_NODE = 52,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_OR_WRITE_NODE = 53,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE = 54,
-    YP_NODE_GLOBAL_VARIABLE_READ_NODE = 55,
-    YP_NODE_GLOBAL_VARIABLE_WRITE_NODE = 56,
-    YP_NODE_HASH_NODE = 57,
-    YP_NODE_HASH_PATTERN_NODE = 58,
-    YP_NODE_IF_NODE = 59,
-    YP_NODE_IMAGINARY_NODE = 60,
-    YP_NODE_IN_NODE = 61,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_AND_WRITE_NODE = 62,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_OR_WRITE_NODE = 63,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE = 64,
-    YP_NODE_INSTANCE_VARIABLE_READ_NODE = 65,
-    YP_NODE_INSTANCE_VARIABLE_WRITE_NODE = 66,
-    YP_NODE_INTEGER_NODE = 67,
-    YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE = 68,
-    YP_NODE_INTERPOLATED_STRING_NODE = 69,
-    YP_NODE_INTERPOLATED_SYMBOL_NODE = 70,
-    YP_NODE_INTERPOLATED_X_STRING_NODE = 71,
-    YP_NODE_KEYWORD_HASH_NODE = 72,
-    YP_NODE_KEYWORD_PARAMETER_NODE = 73,
-    YP_NODE_KEYWORD_REST_PARAMETER_NODE = 74,
-    YP_NODE_LAMBDA_NODE = 75,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_AND_WRITE_NODE = 76,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_OR_WRITE_NODE = 77,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE = 78,
-    YP_NODE_LOCAL_VARIABLE_READ_NODE = 79,
-    YP_NODE_LOCAL_VARIABLE_WRITE_NODE = 80,
-    YP_NODE_MATCH_PREDICATE_NODE = 81,
-    YP_NODE_MATCH_REQUIRED_NODE = 82,
-    YP_NODE_MISSING_NODE = 83,
-    YP_NODE_MODULE_NODE = 84,
-    YP_NODE_MULTI_WRITE_NODE = 85,
-    YP_NODE_NEXT_NODE = 86,
-    YP_NODE_NIL_NODE = 87,
-    YP_NODE_NO_KEYWORDS_PARAMETER_NODE = 88,
-    YP_NODE_NUMBERED_REFERENCE_READ_NODE = 89,
-    YP_NODE_OPTIONAL_PARAMETER_NODE = 90,
-    YP_NODE_OR_NODE = 91,
-    YP_NODE_PARAMETERS_NODE = 92,
-    YP_NODE_PARENTHESES_NODE = 93,
-    YP_NODE_PINNED_EXPRESSION_NODE = 94,
-    YP_NODE_PINNED_VARIABLE_NODE = 95,
-    YP_NODE_POST_EXECUTION_NODE = 96,
-    YP_NODE_PRE_EXECUTION_NODE = 97,
-    YP_NODE_PROGRAM_NODE = 98,
-    YP_NODE_RANGE_NODE = 99,
-    YP_NODE_RATIONAL_NODE = 100,
-    YP_NODE_REDO_NODE = 101,
-    YP_NODE_REGULAR_EXPRESSION_NODE = 102,
-    YP_NODE_REQUIRED_DESTRUCTURED_PARAMETER_NODE = 103,
-    YP_NODE_REQUIRED_PARAMETER_NODE = 104,
-    YP_NODE_RESCUE_MODIFIER_NODE = 105,
-    YP_NODE_RESCUE_NODE = 106,
-    YP_NODE_REST_PARAMETER_NODE = 107,
-    YP_NODE_RETRY_NODE = 108,
-    YP_NODE_RETURN_NODE = 109,
-    YP_NODE_SELF_NODE = 110,
-    YP_NODE_SINGLETON_CLASS_NODE = 111,
-    YP_NODE_SOURCE_ENCODING_NODE = 112,
-    YP_NODE_SOURCE_FILE_NODE = 113,
-    YP_NODE_SOURCE_LINE_NODE = 114,
-    YP_NODE_SPLAT_NODE = 115,
-    YP_NODE_STATEMENTS_NODE = 116,
-    YP_NODE_STRING_CONCAT_NODE = 117,
-    YP_NODE_STRING_NODE = 118,
-    YP_NODE_SUPER_NODE = 119,
-    YP_NODE_SYMBOL_NODE = 120,
-    YP_NODE_TRUE_NODE = 121,
-    YP_NODE_UNDEF_NODE = 122,
-    YP_NODE_UNLESS_NODE = 123,
-    YP_NODE_UNTIL_NODE = 124,
-    YP_NODE_WHEN_NODE = 125,
-    YP_NODE_WHILE_NODE = 126,
-    YP_NODE_X_STRING_NODE = 127,
-    YP_NODE_YIELD_NODE = 128,
+    YP_NODE_CONSTANT_PATH_OR_WRITE_NODE = 35,
+    YP_NODE_CONSTANT_PATH_TARGET_NODE = 36,
+    YP_NODE_CONSTANT_PATH_WRITE_NODE = 37,
+    YP_NODE_CONSTANT_READ_NODE = 38,
+    YP_NODE_CONSTANT_TARGET_NODE = 39,
+    YP_NODE_CONSTANT_WRITE_NODE = 40,
+    YP_NODE_DEF_NODE = 41,
+    YP_NODE_DEFINED_NODE = 42,
+    YP_NODE_ELSE_NODE = 43,
+    YP_NODE_EMBEDDED_STATEMENTS_NODE = 44,
+    YP_NODE_EMBEDDED_VARIABLE_NODE = 45,
+    YP_NODE_ENSURE_NODE = 46,
+    YP_NODE_FALSE_NODE = 47,
+    YP_NODE_FIND_PATTERN_NODE = 48,
+    YP_NODE_FLIP_FLOP_NODE = 49,
+    YP_NODE_FLOAT_NODE = 50,
+    YP_NODE_FOR_NODE = 51,
+    YP_NODE_FORWARDING_ARGUMENTS_NODE = 52,
+    YP_NODE_FORWARDING_PARAMETER_NODE = 53,
+    YP_NODE_FORWARDING_SUPER_NODE = 54,
+    YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE = 55,
+    YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE = 56,
+    YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE = 57,
+    YP_NODE_GLOBAL_VARIABLE_READ_NODE = 58,
+    YP_NODE_GLOBAL_VARIABLE_TARGET_NODE = 59,
+    YP_NODE_GLOBAL_VARIABLE_WRITE_NODE = 60,
+    YP_NODE_HASH_NODE = 61,
+    YP_NODE_HASH_PATTERN_NODE = 62,
+    YP_NODE_IF_NODE = 63,
+    YP_NODE_IMAGINARY_NODE = 64,
+    YP_NODE_IN_NODE = 65,
+    YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE = 66,
+    YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE = 67,
+    YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE = 68,
+    YP_NODE_INSTANCE_VARIABLE_READ_NODE = 69,
+    YP_NODE_INSTANCE_VARIABLE_TARGET_NODE = 70,
+    YP_NODE_INSTANCE_VARIABLE_WRITE_NODE = 71,
+    YP_NODE_INTEGER_NODE = 72,
+    YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE = 73,
+    YP_NODE_INTERPOLATED_STRING_NODE = 74,
+    YP_NODE_INTERPOLATED_SYMBOL_NODE = 75,
+    YP_NODE_INTERPOLATED_X_STRING_NODE = 76,
+    YP_NODE_KEYWORD_HASH_NODE = 77,
+    YP_NODE_KEYWORD_PARAMETER_NODE = 78,
+    YP_NODE_KEYWORD_REST_PARAMETER_NODE = 79,
+    YP_NODE_LAMBDA_NODE = 80,
+    YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE = 81,
+    YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE = 82,
+    YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE = 83,
+    YP_NODE_LOCAL_VARIABLE_READ_NODE = 84,
+    YP_NODE_LOCAL_VARIABLE_TARGET_NODE = 85,
+    YP_NODE_LOCAL_VARIABLE_WRITE_NODE = 86,
+    YP_NODE_MATCH_PREDICATE_NODE = 87,
+    YP_NODE_MATCH_REQUIRED_NODE = 88,
+    YP_NODE_MISSING_NODE = 89,
+    YP_NODE_MODULE_NODE = 90,
+    YP_NODE_MULTI_WRITE_NODE = 91,
+    YP_NODE_NEXT_NODE = 92,
+    YP_NODE_NIL_NODE = 93,
+    YP_NODE_NO_KEYWORDS_PARAMETER_NODE = 94,
+    YP_NODE_NUMBERED_REFERENCE_READ_NODE = 95,
+    YP_NODE_OPTIONAL_PARAMETER_NODE = 96,
+    YP_NODE_OR_NODE = 97,
+    YP_NODE_PARAMETERS_NODE = 98,
+    YP_NODE_PARENTHESES_NODE = 99,
+    YP_NODE_PINNED_EXPRESSION_NODE = 100,
+    YP_NODE_PINNED_VARIABLE_NODE = 101,
+    YP_NODE_POST_EXECUTION_NODE = 102,
+    YP_NODE_PRE_EXECUTION_NODE = 103,
+    YP_NODE_PROGRAM_NODE = 104,
+    YP_NODE_RANGE_NODE = 105,
+    YP_NODE_RATIONAL_NODE = 106,
+    YP_NODE_REDO_NODE = 107,
+    YP_NODE_REGULAR_EXPRESSION_NODE = 108,
+    YP_NODE_REQUIRED_DESTRUCTURED_PARAMETER_NODE = 109,
+    YP_NODE_REQUIRED_PARAMETER_NODE = 110,
+    YP_NODE_RESCUE_MODIFIER_NODE = 111,
+    YP_NODE_RESCUE_NODE = 112,
+    YP_NODE_REST_PARAMETER_NODE = 113,
+    YP_NODE_RETRY_NODE = 114,
+    YP_NODE_RETURN_NODE = 115,
+    YP_NODE_SELF_NODE = 116,
+    YP_NODE_SINGLETON_CLASS_NODE = 117,
+    YP_NODE_SOURCE_ENCODING_NODE = 118,
+    YP_NODE_SOURCE_FILE_NODE = 119,
+    YP_NODE_SOURCE_LINE_NODE = 120,
+    YP_NODE_SPLAT_NODE = 121,
+    YP_NODE_STATEMENTS_NODE = 122,
+    YP_NODE_STRING_CONCAT_NODE = 123,
+    YP_NODE_STRING_NODE = 124,
+    YP_NODE_SUPER_NODE = 125,
+    YP_NODE_SYMBOL_NODE = 126,
+    YP_NODE_TRUE_NODE = 127,
+    YP_NODE_UNDEF_NODE = 128,
+    YP_NODE_UNLESS_NODE = 129,
+    YP_NODE_UNTIL_NODE = 130,
+    YP_NODE_WHEN_NODE = 131,
+    YP_NODE_WHILE_NODE = 132,
+    YP_NODE_X_STRING_NODE = 133,
+    YP_NODE_YIELD_NODE = 134,
+    YP_NODE_SCOPE_NODE
 };
 
 typedef uint16_t yp_node_type_t;
@@ -462,7 +469,7 @@ typedef struct yp_block_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
     struct yp_block_parameters_node *parameters;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_location_t opening_loc;
     yp_location_t closing_loc;
 } yp_block_node_t;
@@ -554,40 +561,46 @@ typedef struct yp_class_node {
     struct yp_node *constant_path;
     yp_location_t inheritance_operator_loc;
     struct yp_node *superclass;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_location_t end_keyword_loc;
+    yp_string_t name;
 } yp_class_node_t;
 
-// ClassVariableOperatorAndWriteNode
-typedef struct yp_class_variable_operator_and_write_node {
+// ClassVariableAndWriteNode
+typedef struct yp_class_variable_and_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_class_variable_operator_and_write_node_t;
+} yp_class_variable_and_write_node_t;
 
-// ClassVariableOperatorOrWriteNode
-typedef struct yp_class_variable_operator_or_write_node {
+// ClassVariableOperatorWriteNode
+typedef struct yp_class_variable_operator_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_class_variable_operator_or_write_node_t;
+    yp_constant_id_t operator;
+} yp_class_variable_operator_write_node_t;
 
-// ClassVariableOperatorWriteNode
-typedef struct yp_class_variable_operator_write_node {
+// ClassVariableOrWriteNode
+typedef struct yp_class_variable_or_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-    yp_constant_id_t operator;
-} yp_class_variable_operator_write_node_t;
+} yp_class_variable_or_write_node_t;
 
 // ClassVariableReadNode
 typedef struct yp_class_variable_read_node {
     yp_node_t base;
 } yp_class_variable_read_node_t;
 
+// ClassVariableTargetNode
+typedef struct yp_class_variable_target_node {
+    yp_node_t base;
+} yp_class_variable_target_node_t;
+
 // ClassVariableWriteNode
 typedef struct yp_class_variable_write_node {
     yp_node_t base;
@@ -596,30 +609,38 @@ typedef struct yp_class_variable_write_node {
     yp_location_t operator_loc;
 } yp_class_variable_write_node_t;
 
-// ConstantOperatorAndWriteNode
-typedef struct yp_constant_operator_and_write_node {
+// ConstantAndWriteNode
+typedef struct yp_constant_and_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_constant_operator_and_write_node_t;
+} yp_constant_and_write_node_t;
 
-// ConstantOperatorOrWriteNode
-typedef struct yp_constant_operator_or_write_node {
+// ConstantOperatorWriteNode
+typedef struct yp_constant_operator_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_constant_operator_or_write_node_t;
+    yp_constant_id_t operator;
+} yp_constant_operator_write_node_t;
 
-// ConstantOperatorWriteNode
-typedef struct yp_constant_operator_write_node {
+// ConstantOrWriteNode
+typedef struct yp_constant_or_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-    yp_constant_id_t operator;
-} yp_constant_operator_write_node_t;
+} yp_constant_or_write_node_t;
+
+// ConstantPathAndWriteNode
+typedef struct yp_constant_path_and_write_node {
+    yp_node_t base;
+    struct yp_constant_path_node *target;
+    yp_location_t operator_loc;
+    struct yp_node *value;
+} yp_constant_path_and_write_node_t;
 
 // ConstantPathNode
 typedef struct yp_constant_path_node {
@@ -629,30 +650,30 @@ typedef struct yp_constant_path_node {
     yp_location_t delimiter_loc;
 } yp_constant_path_node_t;
 
-// ConstantPathOperatorAndWriteNode
-typedef struct yp_constant_path_operator_and_write_node {
+// ConstantPathOperatorWriteNode
+typedef struct yp_constant_path_operator_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_constant_path_operator_and_write_node_t;
+    yp_constant_id_t operator;
+} yp_constant_path_operator_write_node_t;
 
-// ConstantPathOperatorOrWriteNode
-typedef struct yp_constant_path_operator_or_write_node {
+// ConstantPathOrWriteNode
+typedef struct yp_constant_path_or_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_constant_path_operator_or_write_node_t;
+} yp_constant_path_or_write_node_t;
 
-// ConstantPathOperatorWriteNode
-typedef struct yp_constant_path_operator_write_node {
+// ConstantPathTargetNode
+typedef struct yp_constant_path_target_node {
     yp_node_t base;
-    struct yp_constant_path_node *target;
-    yp_location_t operator_loc;
-    struct yp_node *value;
-    yp_constant_id_t operator;
-} yp_constant_path_operator_write_node_t;
+    struct yp_node *parent;
+    struct yp_node *child;
+    yp_location_t delimiter_loc;
+} yp_constant_path_target_node_t;
 
 // ConstantPathWriteNode
 typedef struct yp_constant_path_write_node {
@@ -667,6 +688,11 @@ typedef struct yp_constant_read_node {
     yp_node_t base;
 } yp_constant_read_node_t;
 
+// ConstantTargetNode
+typedef struct yp_constant_target_node {
+    yp_node_t base;
+} yp_constant_target_node_t;
+
 // ConstantWriteNode
 typedef struct yp_constant_write_node {
     yp_node_t base;
@@ -681,7 +707,7 @@ typedef struct yp_def_node {
     yp_location_t name_loc;
     struct yp_node *receiver;
     struct yp_parameters_node *parameters;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_constant_id_list_t locals;
     yp_location_t def_keyword_loc;
     yp_location_t operator_loc;
@@ -788,36 +814,41 @@ typedef struct yp_forwarding_super_node {
     struct yp_block_node *block;
 } yp_forwarding_super_node_t;
 
-// GlobalVariableOperatorAndWriteNode
-typedef struct yp_global_variable_operator_and_write_node {
+// GlobalVariableAndWriteNode
+typedef struct yp_global_variable_and_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_global_variable_operator_and_write_node_t;
+} yp_global_variable_and_write_node_t;
 
-// GlobalVariableOperatorOrWriteNode
-typedef struct yp_global_variable_operator_or_write_node {
+// GlobalVariableOperatorWriteNode
+typedef struct yp_global_variable_operator_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_global_variable_operator_or_write_node_t;
+    yp_constant_id_t operator;
+} yp_global_variable_operator_write_node_t;
 
-// GlobalVariableOperatorWriteNode
-typedef struct yp_global_variable_operator_write_node {
+// GlobalVariableOrWriteNode
+typedef struct yp_global_variable_or_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-    yp_constant_id_t operator;
-} yp_global_variable_operator_write_node_t;
+} yp_global_variable_or_write_node_t;
 
 // GlobalVariableReadNode
 typedef struct yp_global_variable_read_node {
     yp_node_t base;
 } yp_global_variable_read_node_t;
 
+// GlobalVariableTargetNode
+typedef struct yp_global_variable_target_node {
+    yp_node_t base;
+} yp_global_variable_target_node_t;
+
 // GlobalVariableWriteNode
 typedef struct yp_global_variable_write_node {
     yp_node_t base;
@@ -869,36 +900,41 @@ typedef struct yp_in_node {
     yp_location_t then_loc;
 } yp_in_node_t;
 
-// InstanceVariableOperatorAndWriteNode
-typedef struct yp_instance_variable_operator_and_write_node {
+// InstanceVariableAndWriteNode
+typedef struct yp_instance_variable_and_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_instance_variable_operator_and_write_node_t;
+} yp_instance_variable_and_write_node_t;
 
-// InstanceVariableOperatorOrWriteNode
-typedef struct yp_instance_variable_operator_or_write_node {
+// InstanceVariableOperatorWriteNode
+typedef struct yp_instance_variable_operator_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_instance_variable_operator_or_write_node_t;
+    yp_constant_id_t operator;
+} yp_instance_variable_operator_write_node_t;
 
-// InstanceVariableOperatorWriteNode
-typedef struct yp_instance_variable_operator_write_node {
+// InstanceVariableOrWriteNode
+typedef struct yp_instance_variable_or_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
-    yp_constant_id_t operator;
-} yp_instance_variable_operator_write_node_t;
+} yp_instance_variable_or_write_node_t;
 
 // InstanceVariableReadNode
 typedef struct yp_instance_variable_read_node {
     yp_node_t base;
 } yp_instance_variable_read_node_t;
 
+// InstanceVariableTargetNode
+typedef struct yp_instance_variable_target_node {
+    yp_node_t base;
+} yp_instance_variable_target_node_t;
+
 // InstanceVariableWriteNode
 typedef struct yp_instance_variable_write_node {
     yp_node_t base;
@@ -968,38 +1004,43 @@ typedef struct yp_keyword_rest_parameter_node {
 typedef struct yp_lambda_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
+    yp_location_t operator_loc;
     yp_location_t opening_loc;
+    yp_location_t closing_loc;
     struct yp_block_parameters_node *parameters;
-    struct yp_node *statements;
+    struct yp_node *body;
 } yp_lambda_node_t;
 
-// LocalVariableOperatorAndWriteNode
-typedef struct yp_local_variable_operator_and_write_node {
+// LocalVariableAndWriteNode
+typedef struct yp_local_variable_and_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
     yp_constant_id_t constant_id;
-} yp_local_variable_operator_and_write_node_t;
+    uint32_t depth;
+} yp_local_variable_and_write_node_t;
 
-// LocalVariableOperatorOrWriteNode
-typedef struct yp_local_variable_operator_or_write_node {
+// LocalVariableOperatorWriteNode
+typedef struct yp_local_variable_operator_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
     yp_constant_id_t constant_id;
-} yp_local_variable_operator_or_write_node_t;
+    yp_constant_id_t operator_id;
+    uint32_t depth;
+} yp_local_variable_operator_write_node_t;
 
-// LocalVariableOperatorWriteNode
-typedef struct yp_local_variable_operator_write_node {
+// LocalVariableOrWriteNode
+typedef struct yp_local_variable_or_write_node {
     yp_node_t base;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
     yp_constant_id_t constant_id;
-    yp_constant_id_t operator_id;
-} yp_local_variable_operator_write_node_t;
+    uint32_t depth;
+} yp_local_variable_or_write_node_t;
 
 // LocalVariableReadNode
 typedef struct yp_local_variable_read_node {
@@ -1008,6 +1049,13 @@ typedef struct yp_local_variable_read_node {
     uint32_t depth;
 } yp_local_variable_read_node_t;
 
+// LocalVariableTargetNode
+typedef struct yp_local_variable_target_node {
+    yp_node_t base;
+    yp_constant_id_t constant_id;
+    uint32_t depth;
+} yp_local_variable_target_node_t;
+
 // LocalVariableWriteNode
 typedef struct yp_local_variable_write_node {
     yp_node_t base;
@@ -1045,8 +1093,9 @@ typedef struct yp_module_node {
     yp_constant_id_list_t locals;
     yp_location_t module_keyword_loc;
     struct yp_node *constant_path;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_location_t end_keyword_loc;
+    yp_string_t name;
 } yp_module_node_t;
 
 // MultiWriteNode
@@ -1115,7 +1164,7 @@ typedef struct yp_parameters_node {
 // ParenthesesNode
 typedef struct yp_parentheses_node {
     yp_node_t base;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_location_t opening_loc;
     yp_location_t closing_loc;
 } yp_parentheses_node_t;
@@ -1253,7 +1302,7 @@ typedef struct yp_singleton_class_node {
     yp_location_t class_keyword_loc;
     yp_location_t operator_loc;
     struct yp_node *expression;
-    struct yp_node *statements;
+    struct yp_node *body;
     yp_location_t end_keyword_loc;
 } yp_singleton_class_node_t;
 
@@ -1347,6 +1396,7 @@ typedef struct yp_unless_node {
 typedef struct yp_until_node {
     yp_node_t base;
     yp_location_t keyword_loc;
+    yp_location_t closing_loc;
     struct yp_node *predicate;
     struct yp_statements_node *statements;
 } yp_until_node_t;
@@ -1363,6 +1413,7 @@ typedef struct yp_when_node {
 typedef struct yp_while_node {
     yp_node_t base;
     yp_location_t keyword_loc;
+    yp_location_t closing_loc;
     struct yp_node *predicate;
     struct yp_statements_node *statements;
 } yp_while_node_t;

data/include/yarp/defines.h

@@ -34,6 +34,11 @@
 #   define inline __inline
 #endif
 
+// Windows versions before 2015 use _snprintf
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#   define snprintf _snprintf
+#endif
+
 int yp_strncasecmp(const char *string1, const char *string2, size_t length);
 
 #endif

data/include/yarp/node.h

@@ -34,3 +34,13 @@ YP_EXPORTED_FUNCTION const char * yp_node_type_to_str(yp_node_type_t node_type);
 #define YP_EMPTY_LOCATION_LIST ((yp_location_list_t) { .locations = NULL, .size = 0, .capacity = 0 })
 
 #endif // YARP_NODE_H
+
+// ScopeNodes are helper nodes, and will never
+// be part of the AST. We manually declare them
+// here to avoid generating them
+typedef struct yp_scope_node {
+    yp_node_t base;
+    struct yp_parameters_node *parameters;
+    yp_node_t *body;
+    yp_constant_id_list_t locals;
+} yp_scope_node_t;

data/include/yarp/unescape.h

@@ -31,12 +31,14 @@ typedef enum {
 
 // Unescape the contents of the given token into the given string using the
 // given unescape mode.
-YP_EXPORTED_FUNCTION void yp_unescape_manipulate_string(yp_parser_t *parser, const char *value, size_t length, yp_string_t *string, yp_unescape_type_t unescape_type, yp_list_t *error_list);
+YP_EXPORTED_FUNCTION void yp_unescape_manipulate_string(yp_parser_t *parser, yp_string_t *string, yp_unescape_type_t unescape_type);
 
 // Accepts a source string and a type of unescaping and returns the unescaped version.
 // The caller must yp_string_free(result); after calling this function.
 YP_EXPORTED_FUNCTION bool yp_unescape_string(const char *start, size_t length, yp_unescape_type_t unescape_type, yp_string_t *result);
 
-YP_EXPORTED_FUNCTION size_t yp_unescape_calculate_difference(const char *value, const char *end, yp_unescape_type_t unescape_type, bool expect_single_codepoint, yp_list_t *error_list);
+// Returns the number of bytes that encompass the first escape sequence in the
+// given string.
+size_t yp_unescape_calculate_difference(yp_parser_t *parser, const char *value, yp_unescape_type_t unescape_type, bool expect_single_codepoint);
 
 #endif