yarp 0.7.0 → 0.8.0

data/ext/yarp/extension.c

@@ -66,7 +66,7 @@ dump_input(yp_string_t *input, const char *filepath) {
     yp_node_t *node = yp_parse(&parser);
     yp_serialize(&parser, node, &buffer);
 
-    VALUE result = rb_str_new(buffer.value, buffer.length);
+    VALUE result = rb_str_new(yp_buffer_value(&buffer), yp_buffer_length(&buffer));
     yp_node_destroy(&parser, node);
     yp_buffer_free(&buffer);
     yp_parser_free(&parser);
@@ -483,7 +483,7 @@ parse_serialize_file_metadata(VALUE self, VALUE filepath, VALUE metadata) {
     if (!yp_string_mapped_init(&input, checked)) return Qnil;
 
     yp_parse_serialize(yp_string_source(&input), yp_string_length(&input), &buffer, check_string(metadata));
-    VALUE result = rb_str_new(buffer.value, buffer.length);
+    VALUE result = rb_str_new(yp_buffer_value(&buffer), yp_buffer_length(&buffer));
 
     yp_buffer_free(&buffer);
     return result;

data/ext/yarp/extension.h

@@ -5,7 +5,7 @@
 #include <ruby/encoding.h>
 #include "yarp.h"
 
-#define EXPECTED_YARP_VERSION "0.7.0"
+#define EXPECTED_YARP_VERSION "0.8.0"
 
 VALUE yp_source_new(yp_parser_t *parser);
 VALUE yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALUE source);

data/include/yarp/ast.h

@@ -217,131 +217,116 @@ 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_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_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;
@@ -394,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;
@@ -462,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;
@@ -554,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;
@@ -596,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;
@@ -629,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;
@@ -681,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;
@@ -788,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;
@@ -869,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;
@@ -970,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;
@@ -1045,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;
 
@@ -1083,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;
@@ -1100,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;
@@ -1115,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;
@@ -1253,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;
 

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/unescape.h

@@ -31,7 +31,7 @@ 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, yp_list_t *error_list);
 
 // 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.

data/include/yarp/util/yp_buffer.h

@@ -12,16 +12,24 @@
 // A yp_buffer_t is a simple memory buffer that stores data in a contiguous
 // block of memory. It is used to store the serialized representation of a
 // YARP tree.
-// NOTE: keep in sync with YARP::LibRubyParser::Buffer in lib/yarp.rb
 typedef struct {
     char *value;
     size_t length;
     size_t capacity;
 } yp_buffer_t;
 
+// Return the size of the yp_buffer_t struct.
+YP_EXPORTED_FUNCTION size_t yp_buffer_sizeof(void);
+
 // Initialize a yp_buffer_t with its default values.
 YP_EXPORTED_FUNCTION bool yp_buffer_init(yp_buffer_t *buffer);
 
+// Return the value of the buffer.
+YP_EXPORTED_FUNCTION char * yp_buffer_value(yp_buffer_t *buffer);
+
+// Return the length of the buffer.
+YP_EXPORTED_FUNCTION size_t yp_buffer_length(yp_buffer_t *buffer);
+
 // Append the given amount of space as zeroes to the buffer.
 void yp_buffer_append_zeroes(yp_buffer_t *buffer, size_t length);
 

data/include/yarp/util/yp_constant_pool.h

@@ -51,6 +51,9 @@ typedef struct {
     size_t capacity;
 } yp_constant_pool_t;
 
+// Define an empty constant pool.
+#define YP_CONSTANT_POOL_EMPTY ((yp_constant_pool_t) { .constants = NULL, .size = 0, .capacity = 0 })
+
 // Initialize a new constant pool with a given capacity.
 bool yp_constant_pool_init(yp_constant_pool_t *pool, size_t capacity);
 

data/include/yarp/util/yp_list.h

@@ -15,9 +15,7 @@
 //       int value;
 //     } yp_int_node_t;
 //
-//     yp_list_t list;
-//     yp_list_init(&list);
-//
+//     yp_list_t list = YP_LIST_EMPTY;
 //     yp_int_node_t *node = malloc(sizeof(yp_int_node_t));
 //     node->value = 5;
 //
@@ -45,18 +43,20 @@ typedef struct yp_list_node {
 // This represents the overall linked list. It keeps a pointer to the head and
 // tail so that iteration is easy and pushing new nodes is easy.
 typedef struct {
+    size_t size;
     yp_list_node_t *head;
     yp_list_node_t *tail;
 } yp_list_t;
 
-// Initializes a new list.
-YP_EXPORTED_FUNCTION void yp_list_init(yp_list_t *list);
+// This represents an empty list. It's used to initialize a stack-allocated list
+// as opposed to a method call.
+#define YP_LIST_EMPTY ((yp_list_t) { .size = 0, .head = NULL, .tail = NULL })
 
 // Returns true if the given list is empty.
 YP_EXPORTED_FUNCTION bool yp_list_empty_p(yp_list_t *list);
 
-// Returns the size of the list in O(n) time.
-YP_EXPORTED_FUNCTION uint32_t yp_list_size(yp_list_t *list);
+// Returns the size of the list.
+YP_EXPORTED_FUNCTION size_t yp_list_size(yp_list_t *list);
 
 // Append a node to the given list.
 void yp_list_append(yp_list_t *list, yp_list_node_t *node);

data/include/yarp/util/yp_newline_list.h

@@ -35,6 +35,10 @@ typedef struct {
     size_t column;
 } yp_line_column_t;
 
+#define YP_NEWLINE_LIST_EMPTY ((yp_newline_list_t) { \
+    .start = NULL, .offsets = NULL, .size = 0, .capacity = 0, .last_offset = 0, .last_index = 0 \
+})
+
 // Initialize a new newline list with the given capacity. Returns true if the
 // allocation of the offsets succeeds, otherwise returns false.
 bool yp_newline_list_init(yp_newline_list_t *list, const char *start, size_t capacity);

data/include/yarp/util/yp_state_stack.h

@@ -10,7 +10,7 @@
 typedef uint32_t yp_state_stack_t;
 
 // Initializes the state stack to an empty stack.
-void yp_state_stack_init(yp_state_stack_t *stack);
+#define YP_STATE_STACK_EMPTY ((yp_state_stack_t) 0)
 
 // Pushes a value onto the stack.
 void yp_state_stack_push(yp_state_stack_t *stack, bool value);