yarp 0.6.0 → 0.8.0

data/include/yarp/ast.h

@@ -217,137 +217,124 @@ enum yp_node_type {
     YP_NODE_ALIAS_NODE = 1,
     YP_NODE_ALTERNATION_PATTERN_NODE = 2,
     YP_NODE_AND_NODE = 3,
-    YP_NODE_ARGUMENTS_NODE = 4,
-    YP_NODE_ARRAY_NODE = 5,
-    YP_NODE_ARRAY_PATTERN_NODE = 6,
-    YP_NODE_ASSOC_NODE = 7,
-    YP_NODE_ASSOC_SPLAT_NODE = 8,
-    YP_NODE_BACK_REFERENCE_READ_NODE = 9,
-    YP_NODE_BEGIN_NODE = 10,
-    YP_NODE_BLOCK_ARGUMENT_NODE = 11,
-    YP_NODE_BLOCK_NODE = 12,
-    YP_NODE_BLOCK_PARAMETER_NODE = 13,
-    YP_NODE_BLOCK_PARAMETERS_NODE = 14,
-    YP_NODE_BREAK_NODE = 15,
-    YP_NODE_CALL_NODE = 16,
-    YP_NODE_CALL_OPERATOR_AND_WRITE_NODE = 17,
-    YP_NODE_CALL_OPERATOR_OR_WRITE_NODE = 18,
-    YP_NODE_CALL_OPERATOR_WRITE_NODE = 19,
-    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_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_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_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_FLOAT_NODE = 46,
-    YP_NODE_FOR_NODE = 47,
-    YP_NODE_FORWARDING_ARGUMENTS_NODE = 48,
-    YP_NODE_FORWARDING_PARAMETER_NODE = 49,
-    YP_NODE_FORWARDING_SUPER_NODE = 50,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_AND_WRITE_NODE = 51,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_OR_WRITE_NODE = 52,
-    YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE = 53,
-    YP_NODE_GLOBAL_VARIABLE_READ_NODE = 54,
-    YP_NODE_GLOBAL_VARIABLE_WRITE_NODE = 55,
-    YP_NODE_HASH_NODE = 56,
-    YP_NODE_HASH_PATTERN_NODE = 57,
-    YP_NODE_IF_NODE = 58,
-    YP_NODE_IMAGINARY_NODE = 59,
-    YP_NODE_IN_NODE = 60,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_AND_WRITE_NODE = 61,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_OR_WRITE_NODE = 62,
-    YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE = 63,
-    YP_NODE_INSTANCE_VARIABLE_READ_NODE = 64,
-    YP_NODE_INSTANCE_VARIABLE_WRITE_NODE = 65,
-    YP_NODE_INTEGER_NODE = 66,
-    YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE = 67,
-    YP_NODE_INTERPOLATED_STRING_NODE = 68,
-    YP_NODE_INTERPOLATED_SYMBOL_NODE = 69,
-    YP_NODE_INTERPOLATED_X_STRING_NODE = 70,
-    YP_NODE_KEYWORD_HASH_NODE = 71,
-    YP_NODE_KEYWORD_PARAMETER_NODE = 72,
-    YP_NODE_KEYWORD_REST_PARAMETER_NODE = 73,
-    YP_NODE_LAMBDA_NODE = 74,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_AND_WRITE_NODE = 75,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_OR_WRITE_NODE = 76,
-    YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE = 77,
-    YP_NODE_LOCAL_VARIABLE_READ_NODE = 78,
-    YP_NODE_LOCAL_VARIABLE_WRITE_NODE = 79,
-    YP_NODE_MATCH_PREDICATE_NODE = 80,
-    YP_NODE_MATCH_REQUIRED_NODE = 81,
-    YP_NODE_MISSING_NODE = 82,
-    YP_NODE_MODULE_NODE = 83,
-    YP_NODE_MULTI_WRITE_NODE = 84,
-    YP_NODE_NEXT_NODE = 85,
-    YP_NODE_NIL_NODE = 86,
-    YP_NODE_NO_KEYWORDS_PARAMETER_NODE = 87,
-    YP_NODE_NUMBERED_REFERENCE_READ_NODE = 88,
-    YP_NODE_OPTIONAL_PARAMETER_NODE = 89,
-    YP_NODE_OR_NODE = 90,
-    YP_NODE_PARAMETERS_NODE = 91,
-    YP_NODE_PARENTHESES_NODE = 92,
-    YP_NODE_PINNED_EXPRESSION_NODE = 93,
-    YP_NODE_PINNED_VARIABLE_NODE = 94,
-    YP_NODE_POST_EXECUTION_NODE = 95,
-    YP_NODE_PRE_EXECUTION_NODE = 96,
-    YP_NODE_PROGRAM_NODE = 97,
-    YP_NODE_RANGE_NODE = 98,
-    YP_NODE_RATIONAL_NODE = 99,
-    YP_NODE_REDO_NODE = 100,
-    YP_NODE_REGULAR_EXPRESSION_NODE = 101,
-    YP_NODE_REQUIRED_DESTRUCTURED_PARAMETER_NODE = 102,
-    YP_NODE_REQUIRED_PARAMETER_NODE = 103,
-    YP_NODE_RESCUE_MODIFIER_NODE = 104,
-    YP_NODE_RESCUE_NODE = 105,
-    YP_NODE_REST_PARAMETER_NODE = 106,
-    YP_NODE_RETRY_NODE = 107,
-    YP_NODE_RETURN_NODE = 108,
-    YP_NODE_SELF_NODE = 109,
-    YP_NODE_SINGLETON_CLASS_NODE = 110,
-    YP_NODE_SOURCE_ENCODING_NODE = 111,
-    YP_NODE_SOURCE_FILE_NODE = 112,
-    YP_NODE_SOURCE_LINE_NODE = 113,
-    YP_NODE_SPLAT_NODE = 114,
-    YP_NODE_STATEMENTS_NODE = 115,
-    YP_NODE_STRING_CONCAT_NODE = 116,
-    YP_NODE_STRING_NODE = 117,
-    YP_NODE_SUPER_NODE = 118,
-    YP_NODE_SYMBOL_NODE = 119,
-    YP_NODE_TRUE_NODE = 120,
-    YP_NODE_UNDEF_NODE = 121,
-    YP_NODE_UNLESS_NODE = 122,
-    YP_NODE_UNTIL_NODE = 123,
-    YP_NODE_WHEN_NODE = 124,
-    YP_NODE_WHILE_NODE = 125,
-    YP_NODE_X_STRING_NODE = 126,
-    YP_NODE_YIELD_NODE = 127,
+    YP_NODE_AND_WRITE_NODE = 4,
+    YP_NODE_ARGUMENTS_NODE = 5,
+    YP_NODE_ARRAY_NODE = 6,
+    YP_NODE_ARRAY_PATTERN_NODE = 7,
+    YP_NODE_ASSOC_NODE = 8,
+    YP_NODE_ASSOC_SPLAT_NODE = 9,
+    YP_NODE_BACK_REFERENCE_READ_NODE = 10,
+    YP_NODE_BEGIN_NODE = 11,
+    YP_NODE_BLOCK_ARGUMENT_NODE = 12,
+    YP_NODE_BLOCK_NODE = 13,
+    YP_NODE_BLOCK_PARAMETER_NODE = 14,
+    YP_NODE_BLOCK_PARAMETERS_NODE = 15,
+    YP_NODE_BREAK_NODE = 16,
+    YP_NODE_CALL_NODE = 17,
+    YP_NODE_CALL_OPERATOR_AND_WRITE_NODE = 18,
+    YP_NODE_CALL_OPERATOR_OR_WRITE_NODE = 19,
+    YP_NODE_CALL_OPERATOR_WRITE_NODE = 20,
+    YP_NODE_CAPTURE_PATTERN_NODE = 21,
+    YP_NODE_CASE_NODE = 22,
+    YP_NODE_CLASS_NODE = 23,
+    YP_NODE_CLASS_VARIABLE_READ_NODE = 24,
+    YP_NODE_CLASS_VARIABLE_WRITE_NODE = 25,
+    YP_NODE_CONSTANT_PATH_NODE = 26,
+    YP_NODE_CONSTANT_PATH_WRITE_NODE = 27,
+    YP_NODE_CONSTANT_READ_NODE = 28,
+    YP_NODE_CONSTANT_WRITE_NODE = 29,
+    YP_NODE_DEF_NODE = 30,
+    YP_NODE_DEFINED_NODE = 31,
+    YP_NODE_ELSE_NODE = 32,
+    YP_NODE_EMBEDDED_STATEMENTS_NODE = 33,
+    YP_NODE_EMBEDDED_VARIABLE_NODE = 34,
+    YP_NODE_ENSURE_NODE = 35,
+    YP_NODE_FALSE_NODE = 36,
+    YP_NODE_FIND_PATTERN_NODE = 37,
+    YP_NODE_FLIP_FLOP_NODE = 38,
+    YP_NODE_FLOAT_NODE = 39,
+    YP_NODE_FOR_NODE = 40,
+    YP_NODE_FORWARDING_ARGUMENTS_NODE = 41,
+    YP_NODE_FORWARDING_PARAMETER_NODE = 42,
+    YP_NODE_FORWARDING_SUPER_NODE = 43,
+    YP_NODE_GLOBAL_VARIABLE_READ_NODE = 44,
+    YP_NODE_GLOBAL_VARIABLE_WRITE_NODE = 45,
+    YP_NODE_HASH_NODE = 46,
+    YP_NODE_HASH_PATTERN_NODE = 47,
+    YP_NODE_IF_NODE = 48,
+    YP_NODE_IMAGINARY_NODE = 49,
+    YP_NODE_IN_NODE = 50,
+    YP_NODE_INSTANCE_VARIABLE_READ_NODE = 51,
+    YP_NODE_INSTANCE_VARIABLE_WRITE_NODE = 52,
+    YP_NODE_INTEGER_NODE = 53,
+    YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE = 54,
+    YP_NODE_INTERPOLATED_STRING_NODE = 55,
+    YP_NODE_INTERPOLATED_SYMBOL_NODE = 56,
+    YP_NODE_INTERPOLATED_X_STRING_NODE = 57,
+    YP_NODE_KEYWORD_HASH_NODE = 58,
+    YP_NODE_KEYWORD_PARAMETER_NODE = 59,
+    YP_NODE_KEYWORD_REST_PARAMETER_NODE = 60,
+    YP_NODE_LAMBDA_NODE = 61,
+    YP_NODE_LOCAL_VARIABLE_READ_NODE = 62,
+    YP_NODE_LOCAL_VARIABLE_WRITE_NODE = 63,
+    YP_NODE_MATCH_PREDICATE_NODE = 64,
+    YP_NODE_MATCH_REQUIRED_NODE = 65,
+    YP_NODE_MISSING_NODE = 66,
+    YP_NODE_MODULE_NODE = 67,
+    YP_NODE_MULTI_WRITE_NODE = 68,
+    YP_NODE_NEXT_NODE = 69,
+    YP_NODE_NIL_NODE = 70,
+    YP_NODE_NO_KEYWORDS_PARAMETER_NODE = 71,
+    YP_NODE_NUMBERED_REFERENCE_READ_NODE = 72,
+    YP_NODE_OPERATOR_WRITE_NODE = 73,
+    YP_NODE_OPTIONAL_PARAMETER_NODE = 74,
+    YP_NODE_OR_NODE = 75,
+    YP_NODE_OR_WRITE_NODE = 76,
+    YP_NODE_PARAMETERS_NODE = 77,
+    YP_NODE_PARENTHESES_NODE = 78,
+    YP_NODE_PINNED_EXPRESSION_NODE = 79,
+    YP_NODE_PINNED_VARIABLE_NODE = 80,
+    YP_NODE_POST_EXECUTION_NODE = 81,
+    YP_NODE_PRE_EXECUTION_NODE = 82,
+    YP_NODE_PROGRAM_NODE = 83,
+    YP_NODE_RANGE_NODE = 84,
+    YP_NODE_RATIONAL_NODE = 85,
+    YP_NODE_REDO_NODE = 86,
+    YP_NODE_REGULAR_EXPRESSION_NODE = 87,
+    YP_NODE_REQUIRED_DESTRUCTURED_PARAMETER_NODE = 88,
+    YP_NODE_REQUIRED_PARAMETER_NODE = 89,
+    YP_NODE_RESCUE_MODIFIER_NODE = 90,
+    YP_NODE_RESCUE_NODE = 91,
+    YP_NODE_REST_PARAMETER_NODE = 92,
+    YP_NODE_RETRY_NODE = 93,
+    YP_NODE_RETURN_NODE = 94,
+    YP_NODE_SELF_NODE = 95,
+    YP_NODE_SINGLETON_CLASS_NODE = 96,
+    YP_NODE_SOURCE_ENCODING_NODE = 97,
+    YP_NODE_SOURCE_FILE_NODE = 98,
+    YP_NODE_SOURCE_LINE_NODE = 99,
+    YP_NODE_SPLAT_NODE = 100,
+    YP_NODE_STATEMENTS_NODE = 101,
+    YP_NODE_STRING_CONCAT_NODE = 102,
+    YP_NODE_STRING_NODE = 103,
+    YP_NODE_SUPER_NODE = 104,
+    YP_NODE_SYMBOL_NODE = 105,
+    YP_NODE_TRUE_NODE = 106,
+    YP_NODE_UNDEF_NODE = 107,
+    YP_NODE_UNLESS_NODE = 108,
+    YP_NODE_UNTIL_NODE = 109,
+    YP_NODE_WHEN_NODE = 110,
+    YP_NODE_WHILE_NODE = 111,
+    YP_NODE_X_STRING_NODE = 112,
+    YP_NODE_YIELD_NODE = 113,
 };
 
 typedef uint16_t yp_node_type_t;
 typedef uint16_t yp_node_flags_t;
 
-// We store the flags enum in every node in the tree
-static const uint16_t YP_NODE_FLAG_NEWLINE = 0x1;
+// We store the flags enum in every node in the tree. Some flags are common to
+// all nodes (the ones listed below). Others are specific to certain node types.
+static const yp_node_flags_t YP_NODE_FLAG_NEWLINE = 0x1;
 
 // For easy access, we define some macros to check node type
 #define YP_NODE_TYPE(node) ((enum yp_node_type)node->type)
@@ -392,6 +379,14 @@ typedef struct yp_and_node {
     yp_location_t operator_loc;
 } yp_and_node_t;
 
+// AndWriteNode
+typedef struct yp_and_write_node {
+    yp_node_t base;
+    struct yp_node *target;
+    struct yp_node *value;
+    yp_location_t operator_loc;
+} yp_and_write_node_t;
+
 // ArgumentsNode
 typedef struct yp_arguments_node {
     yp_node_t base;
@@ -460,7 +455,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;
@@ -498,7 +493,6 @@ typedef struct yp_call_node {
     struct yp_arguments_node *arguments;
     yp_location_t closing_loc;
     struct yp_block_node *block;
-    uint32_t flags;
     yp_string_t name;
 } yp_call_node_t;
 
@@ -553,35 +547,10 @@ 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_class_node_t;
 
-// ClassVariableOperatorAndWriteNode
-typedef struct yp_class_variable_operator_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;
-
-// ClassVariableOperatorOrWriteNode
-typedef struct yp_class_variable_operator_or_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;
-
-// 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_constant_id_t operator;
-} yp_class_variable_operator_write_node_t;
-
 // ClassVariableReadNode
 typedef struct yp_class_variable_read_node {
     yp_node_t base;
@@ -595,31 +564,6 @@ 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 {
-    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;
-
-// ConstantOperatorOrWriteNode
-typedef struct yp_constant_operator_or_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;
-
-// 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_id_t operator;
-} yp_constant_operator_write_node_t;
-
 // ConstantPathNode
 typedef struct yp_constant_path_node {
     yp_node_t base;
@@ -628,31 +572,6 @@ 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 {
-    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;
-
-// ConstantPathOperatorOrWriteNode
-typedef struct yp_constant_path_operator_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;
-
-// 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_id_t operator;
-} yp_constant_path_operator_write_node_t;
-
 // ConstantPathWriteNode
 typedef struct yp_constant_path_write_node {
     yp_node_t base;
@@ -680,7 +599,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;
@@ -746,6 +665,14 @@ typedef struct yp_find_pattern_node {
     yp_location_t closing_loc;
 } yp_find_pattern_node_t;
 
+// FlipFlopNode
+typedef struct yp_flip_flop_node {
+    yp_node_t base;
+    struct yp_node *left;
+    struct yp_node *right;
+    yp_location_t operator_loc;
+} yp_flip_flop_node_t;
+
 // FloatNode
 typedef struct yp_float_node {
     yp_node_t base;
@@ -779,31 +706,6 @@ 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 {
-    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;
-
-// GlobalVariableOperatorOrWriteNode
-typedef struct yp_global_variable_operator_or_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;
-
-// 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_constant_id_t operator;
-} yp_global_variable_operator_write_node_t;
-
 // GlobalVariableReadNode
 typedef struct yp_global_variable_read_node {
     yp_node_t base;
@@ -860,31 +762,6 @@ typedef struct yp_in_node {
     yp_location_t then_loc;
 } yp_in_node_t;
 
-// InstanceVariableOperatorAndWriteNode
-typedef struct yp_instance_variable_operator_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;
-
-// InstanceVariableOperatorOrWriteNode
-typedef struct yp_instance_variable_operator_or_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;
-
-// 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_constant_id_t operator;
-} yp_instance_variable_operator_write_node_t;
-
 // InstanceVariableReadNode
 typedef struct yp_instance_variable_read_node {
     yp_node_t base;
@@ -909,7 +786,6 @@ typedef struct yp_interpolated_regular_expression_node {
     yp_location_t opening_loc;
     struct yp_node_list parts;
     yp_location_t closing_loc;
-    uint32_t flags;
 } yp_interpolated_regular_expression_node_t;
 
 // InterpolatedStringNode
@@ -962,37 +838,9 @@ typedef struct yp_lambda_node {
     yp_constant_id_list_t locals;
     yp_location_t opening_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 {
-    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;
-
-// LocalVariableOperatorOrWriteNode
-typedef struct yp_local_variable_operator_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_local_variable_operator_or_write_node_t;
-
-// 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_constant_id_t operator_id;
-} yp_local_variable_operator_write_node_t;
-
 // LocalVariableReadNode
 typedef struct yp_local_variable_read_node {
     yp_node_t base;
@@ -1037,7 +885,7 @@ 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_module_node_t;
 
@@ -1075,6 +923,15 @@ typedef struct yp_numbered_reference_read_node {
     yp_node_t base;
 } yp_numbered_reference_read_node_t;
 
+// OperatorWriteNode
+typedef struct yp_operator_write_node {
+    yp_node_t base;
+    struct yp_node *target;
+    yp_location_t operator_loc;
+    yp_constant_id_t operator;
+    struct yp_node *value;
+} yp_operator_write_node_t;
+
 // OptionalParameterNode
 typedef struct yp_optional_parameter_node {
     yp_node_t base;
@@ -1092,6 +949,14 @@ typedef struct yp_or_node {
     yp_location_t operator_loc;
 } yp_or_node_t;
 
+// OrWriteNode
+typedef struct yp_or_write_node {
+    yp_node_t base;
+    struct yp_node *target;
+    struct yp_node *value;
+    yp_location_t operator_loc;
+} yp_or_write_node_t;
+
 // ParametersNode
 typedef struct yp_parameters_node {
     yp_node_t base;
@@ -1107,7 +972,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;
@@ -1159,7 +1024,6 @@ typedef struct yp_range_node {
     struct yp_node *left;
     struct yp_node *right;
     yp_location_t operator_loc;
-    uint32_t flags;
 } yp_range_node_t;
 
 // RationalNode
@@ -1180,7 +1044,6 @@ typedef struct yp_regular_expression_node {
     yp_location_t content_loc;
     yp_location_t closing_loc;
     yp_string_t unescaped;
-    uint32_t flags;
 } yp_regular_expression_node_t;
 
 // RequiredDestructuredParameterNode
@@ -1247,7 +1110,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;
 
@@ -1343,7 +1206,6 @@ typedef struct yp_until_node {
     yp_location_t keyword_loc;
     struct yp_node *predicate;
     struct yp_statements_node *statements;
-    uint32_t flags;
 } yp_until_node_t;
 
 // WhenNode
@@ -1360,7 +1222,6 @@ typedef struct yp_while_node {
     yp_location_t keyword_loc;
     struct yp_node *predicate;
     struct yp_statements_node *statements;
-    uint32_t flags;
 } yp_while_node_t;
 
 // XStringNode
@@ -1383,30 +1244,30 @@ typedef struct yp_yield_node {
 
 // CallNodeFlags
 typedef enum {
-    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION = 1 << 0,
-    YP_CALL_NODE_FLAGS_VARIABLE_CALL = 1 << 1,
+    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION = 1 << 1,
+    YP_CALL_NODE_FLAGS_VARIABLE_CALL = 1 << 2,
 } yp_call_node_flags_t;
 
 // LoopFlags
 typedef enum {
-    YP_LOOP_FLAGS_BEGIN_MODIFIER = 1 << 0,
+    YP_LOOP_FLAGS_BEGIN_MODIFIER = 1 << 1,
 } yp_loop_flags_t;
 
-// RangeNodeFlags
+// RangeFlags
 typedef enum {
-    YP_RANGE_NODE_FLAGS_EXCLUDE_END = 1 << 0,
-} yp_range_node_flags_t;
+    YP_RANGE_FLAGS_EXCLUDE_END = 1 << 1,
+} yp_range_flags_t;
 
 // RegularExpressionFlags
 typedef enum {
-    YP_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE = 1 << 0,
-    YP_REGULAR_EXPRESSION_FLAGS_MULTI_LINE = 1 << 1,
-    YP_REGULAR_EXPRESSION_FLAGS_EXTENDED = 1 << 2,
-    YP_REGULAR_EXPRESSION_FLAGS_EUC_JP = 1 << 3,
-    YP_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT = 1 << 4,
-    YP_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J = 1 << 5,
-    YP_REGULAR_EXPRESSION_FLAGS_UTF_8 = 1 << 6,
-    YP_REGULAR_EXPRESSION_FLAGS_ONCE = 1 << 7,
+    YP_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE = 1 << 1,
+    YP_REGULAR_EXPRESSION_FLAGS_MULTI_LINE = 1 << 2,
+    YP_REGULAR_EXPRESSION_FLAGS_EXTENDED = 1 << 3,
+    YP_REGULAR_EXPRESSION_FLAGS_EUC_JP = 1 << 4,
+    YP_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT = 1 << 5,
+    YP_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J = 1 << 6,
+    YP_REGULAR_EXPRESSION_FLAGS_UTF_8 = 1 << 7,
+    YP_REGULAR_EXPRESSION_FLAGS_ONCE = 1 << 8,
 } yp_regular_expression_flags_t;
 
 #endif // YARP_AST_H

data/include/yarp/defines.h

@@ -3,8 +3,6 @@
 
 // This file should be included first by any *.h or *.c in YARP
 
-#include "yarp/config.h"
-
 #include <ctype.h>
 #include <stdarg.h>
 #include <stddef.h>
@@ -36,19 +34,11 @@
 #   define inline __inline
 #endif
 
-int yp_strncasecmp(const char *string1, const char *string2, size_t length);
-
-int yp_snprintf(char *dest, YP_ATTRIBUTE_UNUSED size_t size, const char *format, ...);
-
-#if defined(HAVE_SNPRINTF)
-    // We use snprintf if it's available
-#   define yp_snprintf snprintf
-
-#else
-    // In case snprintf isn't present on the system, we provide our own that simply
-    // forwards to the less-safe sprintf.
-#   define yp_snprintf(dest, size, ...) sprintf((dest), __VA_ARGS__)
-
+// 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/enc/yp_encoding.h

@@ -87,6 +87,7 @@ extern yp_encoding_t yp_encoding_iso_8859_16;
 extern yp_encoding_t yp_encoding_koi8_r;
 extern yp_encoding_t yp_encoding_shift_jis;
 extern yp_encoding_t yp_encoding_utf_8;
+extern yp_encoding_t yp_encoding_utf8_mac;
 extern yp_encoding_t yp_encoding_windows_31j;
 extern yp_encoding_t yp_encoding_windows_1251;
 extern yp_encoding_t yp_encoding_windows_1252;