yarp 0.9.0 → 0.11.0

data/include/yarp/ast.h

@@ -188,23 +188,17 @@ typedef enum yp_token_type {
 // type and location information.
 typedef struct {
     yp_token_type_t type;
-    const char *start;
-    const char *end;
+    const uint8_t *start;
+    const uint8_t *end;
 } yp_token_t;
 
 // This represents a range of bytes in the source string to which a node or
 // token corresponds.
 typedef struct {
-    const char *start;
-    const char *end;
+    const uint8_t *start;
+    const uint8_t *end;
 } yp_location_t;
 
-typedef struct {
-    yp_location_t *locations;
-    size_t size;
-    size_t capacity;
-} yp_location_list_t;
-
 struct yp_node;
 
 typedef struct yp_node_list {
@@ -214,143 +208,284 @@ typedef struct yp_node_list {
 } yp_node_list_t;
 
 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_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_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_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_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
+    YP_ALIAS_NODE = 1,
+    YP_ALTERNATION_PATTERN_NODE = 2,
+    YP_AND_NODE = 3,
+    YP_ARGUMENTS_NODE = 4,
+    YP_ARRAY_NODE = 5,
+    YP_ARRAY_PATTERN_NODE = 6,
+    YP_ASSOC_NODE = 7,
+    YP_ASSOC_SPLAT_NODE = 8,
+    YP_BACK_REFERENCE_READ_NODE = 9,
+    YP_BEGIN_NODE = 10,
+    YP_BLOCK_ARGUMENT_NODE = 11,
+    YP_BLOCK_LOCAL_VARIABLE_NODE = 12,
+    YP_BLOCK_NODE = 13,
+    YP_BLOCK_PARAMETER_NODE = 14,
+    YP_BLOCK_PARAMETERS_NODE = 15,
+    YP_BREAK_NODE = 16,
+    YP_CALL_AND_WRITE_NODE = 17,
+    YP_CALL_NODE = 18,
+    YP_CALL_OPERATOR_WRITE_NODE = 19,
+    YP_CALL_OR_WRITE_NODE = 20,
+    YP_CAPTURE_PATTERN_NODE = 21,
+    YP_CASE_NODE = 22,
+    YP_CLASS_NODE = 23,
+    YP_CLASS_VARIABLE_AND_WRITE_NODE = 24,
+    YP_CLASS_VARIABLE_OPERATOR_WRITE_NODE = 25,
+    YP_CLASS_VARIABLE_OR_WRITE_NODE = 26,
+    YP_CLASS_VARIABLE_READ_NODE = 27,
+    YP_CLASS_VARIABLE_TARGET_NODE = 28,
+    YP_CLASS_VARIABLE_WRITE_NODE = 29,
+    YP_CONSTANT_AND_WRITE_NODE = 30,
+    YP_CONSTANT_OPERATOR_WRITE_NODE = 31,
+    YP_CONSTANT_OR_WRITE_NODE = 32,
+    YP_CONSTANT_PATH_AND_WRITE_NODE = 33,
+    YP_CONSTANT_PATH_NODE = 34,
+    YP_CONSTANT_PATH_OPERATOR_WRITE_NODE = 35,
+    YP_CONSTANT_PATH_OR_WRITE_NODE = 36,
+    YP_CONSTANT_PATH_TARGET_NODE = 37,
+    YP_CONSTANT_PATH_WRITE_NODE = 38,
+    YP_CONSTANT_READ_NODE = 39,
+    YP_CONSTANT_TARGET_NODE = 40,
+    YP_CONSTANT_WRITE_NODE = 41,
+    YP_DEF_NODE = 42,
+    YP_DEFINED_NODE = 43,
+    YP_ELSE_NODE = 44,
+    YP_EMBEDDED_STATEMENTS_NODE = 45,
+    YP_EMBEDDED_VARIABLE_NODE = 46,
+    YP_ENSURE_NODE = 47,
+    YP_FALSE_NODE = 48,
+    YP_FIND_PATTERN_NODE = 49,
+    YP_FLIP_FLOP_NODE = 50,
+    YP_FLOAT_NODE = 51,
+    YP_FOR_NODE = 52,
+    YP_FORWARDING_ARGUMENTS_NODE = 53,
+    YP_FORWARDING_PARAMETER_NODE = 54,
+    YP_FORWARDING_SUPER_NODE = 55,
+    YP_GLOBAL_VARIABLE_AND_WRITE_NODE = 56,
+    YP_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE = 57,
+    YP_GLOBAL_VARIABLE_OR_WRITE_NODE = 58,
+    YP_GLOBAL_VARIABLE_READ_NODE = 59,
+    YP_GLOBAL_VARIABLE_TARGET_NODE = 60,
+    YP_GLOBAL_VARIABLE_WRITE_NODE = 61,
+    YP_HASH_NODE = 62,
+    YP_HASH_PATTERN_NODE = 63,
+    YP_IF_NODE = 64,
+    YP_IMAGINARY_NODE = 65,
+    YP_IN_NODE = 66,
+    YP_INSTANCE_VARIABLE_AND_WRITE_NODE = 67,
+    YP_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE = 68,
+    YP_INSTANCE_VARIABLE_OR_WRITE_NODE = 69,
+    YP_INSTANCE_VARIABLE_READ_NODE = 70,
+    YP_INSTANCE_VARIABLE_TARGET_NODE = 71,
+    YP_INSTANCE_VARIABLE_WRITE_NODE = 72,
+    YP_INTEGER_NODE = 73,
+    YP_INTERPOLATED_REGULAR_EXPRESSION_NODE = 74,
+    YP_INTERPOLATED_STRING_NODE = 75,
+    YP_INTERPOLATED_SYMBOL_NODE = 76,
+    YP_INTERPOLATED_X_STRING_NODE = 77,
+    YP_KEYWORD_HASH_NODE = 78,
+    YP_KEYWORD_PARAMETER_NODE = 79,
+    YP_KEYWORD_REST_PARAMETER_NODE = 80,
+    YP_LAMBDA_NODE = 81,
+    YP_LOCAL_VARIABLE_AND_WRITE_NODE = 82,
+    YP_LOCAL_VARIABLE_OPERATOR_WRITE_NODE = 83,
+    YP_LOCAL_VARIABLE_OR_WRITE_NODE = 84,
+    YP_LOCAL_VARIABLE_READ_NODE = 85,
+    YP_LOCAL_VARIABLE_TARGET_NODE = 86,
+    YP_LOCAL_VARIABLE_WRITE_NODE = 87,
+    YP_MATCH_PREDICATE_NODE = 88,
+    YP_MATCH_REQUIRED_NODE = 89,
+    YP_MISSING_NODE = 90,
+    YP_MODULE_NODE = 91,
+    YP_MULTI_TARGET_NODE = 92,
+    YP_MULTI_WRITE_NODE = 93,
+    YP_NEXT_NODE = 94,
+    YP_NIL_NODE = 95,
+    YP_NO_KEYWORDS_PARAMETER_NODE = 96,
+    YP_NUMBERED_REFERENCE_READ_NODE = 97,
+    YP_OPTIONAL_PARAMETER_NODE = 98,
+    YP_OR_NODE = 99,
+    YP_PARAMETERS_NODE = 100,
+    YP_PARENTHESES_NODE = 101,
+    YP_PINNED_EXPRESSION_NODE = 102,
+    YP_PINNED_VARIABLE_NODE = 103,
+    YP_POST_EXECUTION_NODE = 104,
+    YP_PRE_EXECUTION_NODE = 105,
+    YP_PROGRAM_NODE = 106,
+    YP_RANGE_NODE = 107,
+    YP_RATIONAL_NODE = 108,
+    YP_REDO_NODE = 109,
+    YP_REGULAR_EXPRESSION_NODE = 110,
+    YP_REQUIRED_DESTRUCTURED_PARAMETER_NODE = 111,
+    YP_REQUIRED_PARAMETER_NODE = 112,
+    YP_RESCUE_MODIFIER_NODE = 113,
+    YP_RESCUE_NODE = 114,
+    YP_REST_PARAMETER_NODE = 115,
+    YP_RETRY_NODE = 116,
+    YP_RETURN_NODE = 117,
+    YP_SELF_NODE = 118,
+    YP_SINGLETON_CLASS_NODE = 119,
+    YP_SOURCE_ENCODING_NODE = 120,
+    YP_SOURCE_FILE_NODE = 121,
+    YP_SOURCE_LINE_NODE = 122,
+    YP_SPLAT_NODE = 123,
+    YP_STATEMENTS_NODE = 124,
+    YP_STRING_CONCAT_NODE = 125,
+    YP_STRING_NODE = 126,
+    YP_SUPER_NODE = 127,
+    YP_SYMBOL_NODE = 128,
+    YP_TRUE_NODE = 129,
+    YP_UNDEF_NODE = 130,
+    YP_UNLESS_NODE = 131,
+    YP_UNTIL_NODE = 132,
+    YP_WHEN_NODE = 133,
+    YP_WHILE_NODE = 134,
+    YP_X_STRING_NODE = 135,
+    YP_YIELD_NODE = 136,
+    YP_SCOPE_NODE
 };
 
+// Deprecated aliases
+#define YP_NODE_SCOPE_NODE YP_SCOPE_NODE
+#define YP_NODE_ALIAS_NODE YP_ALIAS_NODE
+#define YP_NODE_ALTERNATION_PATTERN_NODE YP_ALTERNATION_PATTERN_NODE
+#define YP_NODE_AND_NODE YP_AND_NODE
+#define YP_NODE_ARGUMENTS_NODE YP_ARGUMENTS_NODE
+#define YP_NODE_ARRAY_NODE YP_ARRAY_NODE
+#define YP_NODE_ARRAY_PATTERN_NODE YP_ARRAY_PATTERN_NODE
+#define YP_NODE_ASSOC_NODE YP_ASSOC_NODE
+#define YP_NODE_ASSOC_SPLAT_NODE YP_ASSOC_SPLAT_NODE
+#define YP_NODE_BACK_REFERENCE_READ_NODE YP_BACK_REFERENCE_READ_NODE
+#define YP_NODE_BEGIN_NODE YP_BEGIN_NODE
+#define YP_NODE_BLOCK_ARGUMENT_NODE YP_BLOCK_ARGUMENT_NODE
+#define YP_NODE_BLOCK_LOCAL_VARIABLE_NODE YP_BLOCK_LOCAL_VARIABLE_NODE
+#define YP_NODE_BLOCK_NODE YP_BLOCK_NODE
+#define YP_NODE_BLOCK_PARAMETER_NODE YP_BLOCK_PARAMETER_NODE
+#define YP_NODE_BLOCK_PARAMETERS_NODE YP_BLOCK_PARAMETERS_NODE
+#define YP_NODE_BREAK_NODE YP_BREAK_NODE
+#define YP_NODE_CALL_AND_WRITE_NODE YP_CALL_AND_WRITE_NODE
+#define YP_NODE_CALL_NODE YP_CALL_NODE
+#define YP_NODE_CALL_OPERATOR_WRITE_NODE YP_CALL_OPERATOR_WRITE_NODE
+#define YP_NODE_CALL_OR_WRITE_NODE YP_CALL_OR_WRITE_NODE
+#define YP_NODE_CAPTURE_PATTERN_NODE YP_CAPTURE_PATTERN_NODE
+#define YP_NODE_CASE_NODE YP_CASE_NODE
+#define YP_NODE_CLASS_NODE YP_CLASS_NODE
+#define YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE YP_CLASS_VARIABLE_AND_WRITE_NODE
+#define YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE YP_CLASS_VARIABLE_OPERATOR_WRITE_NODE
+#define YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE YP_CLASS_VARIABLE_OR_WRITE_NODE
+#define YP_NODE_CLASS_VARIABLE_READ_NODE YP_CLASS_VARIABLE_READ_NODE
+#define YP_NODE_CLASS_VARIABLE_TARGET_NODE YP_CLASS_VARIABLE_TARGET_NODE
+#define YP_NODE_CLASS_VARIABLE_WRITE_NODE YP_CLASS_VARIABLE_WRITE_NODE
+#define YP_NODE_CONSTANT_AND_WRITE_NODE YP_CONSTANT_AND_WRITE_NODE
+#define YP_NODE_CONSTANT_OPERATOR_WRITE_NODE YP_CONSTANT_OPERATOR_WRITE_NODE
+#define YP_NODE_CONSTANT_OR_WRITE_NODE YP_CONSTANT_OR_WRITE_NODE
+#define YP_NODE_CONSTANT_PATH_AND_WRITE_NODE YP_CONSTANT_PATH_AND_WRITE_NODE
+#define YP_NODE_CONSTANT_PATH_NODE YP_CONSTANT_PATH_NODE
+#define YP_NODE_CONSTANT_PATH_OPERATOR_WRITE_NODE YP_CONSTANT_PATH_OPERATOR_WRITE_NODE
+#define YP_NODE_CONSTANT_PATH_OR_WRITE_NODE YP_CONSTANT_PATH_OR_WRITE_NODE
+#define YP_NODE_CONSTANT_PATH_TARGET_NODE YP_CONSTANT_PATH_TARGET_NODE
+#define YP_NODE_CONSTANT_PATH_WRITE_NODE YP_CONSTANT_PATH_WRITE_NODE
+#define YP_NODE_CONSTANT_READ_NODE YP_CONSTANT_READ_NODE
+#define YP_NODE_CONSTANT_TARGET_NODE YP_CONSTANT_TARGET_NODE
+#define YP_NODE_CONSTANT_WRITE_NODE YP_CONSTANT_WRITE_NODE
+#define YP_NODE_DEF_NODE YP_DEF_NODE
+#define YP_NODE_DEFINED_NODE YP_DEFINED_NODE
+#define YP_NODE_ELSE_NODE YP_ELSE_NODE
+#define YP_NODE_EMBEDDED_STATEMENTS_NODE YP_EMBEDDED_STATEMENTS_NODE
+#define YP_NODE_EMBEDDED_VARIABLE_NODE YP_EMBEDDED_VARIABLE_NODE
+#define YP_NODE_ENSURE_NODE YP_ENSURE_NODE
+#define YP_NODE_FALSE_NODE YP_FALSE_NODE
+#define YP_NODE_FIND_PATTERN_NODE YP_FIND_PATTERN_NODE
+#define YP_NODE_FLIP_FLOP_NODE YP_FLIP_FLOP_NODE
+#define YP_NODE_FLOAT_NODE YP_FLOAT_NODE
+#define YP_NODE_FOR_NODE YP_FOR_NODE
+#define YP_NODE_FORWARDING_ARGUMENTS_NODE YP_FORWARDING_ARGUMENTS_NODE
+#define YP_NODE_FORWARDING_PARAMETER_NODE YP_FORWARDING_PARAMETER_NODE
+#define YP_NODE_FORWARDING_SUPER_NODE YP_FORWARDING_SUPER_NODE
+#define YP_NODE_GLOBAL_VARIABLE_AND_WRITE_NODE YP_GLOBAL_VARIABLE_AND_WRITE_NODE
+#define YP_NODE_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE YP_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE
+#define YP_NODE_GLOBAL_VARIABLE_OR_WRITE_NODE YP_GLOBAL_VARIABLE_OR_WRITE_NODE
+#define YP_NODE_GLOBAL_VARIABLE_READ_NODE YP_GLOBAL_VARIABLE_READ_NODE
+#define YP_NODE_GLOBAL_VARIABLE_TARGET_NODE YP_GLOBAL_VARIABLE_TARGET_NODE
+#define YP_NODE_GLOBAL_VARIABLE_WRITE_NODE YP_GLOBAL_VARIABLE_WRITE_NODE
+#define YP_NODE_HASH_NODE YP_HASH_NODE
+#define YP_NODE_HASH_PATTERN_NODE YP_HASH_PATTERN_NODE
+#define YP_NODE_IF_NODE YP_IF_NODE
+#define YP_NODE_IMAGINARY_NODE YP_IMAGINARY_NODE
+#define YP_NODE_IN_NODE YP_IN_NODE
+#define YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE YP_INSTANCE_VARIABLE_AND_WRITE_NODE
+#define YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE YP_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE
+#define YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE YP_INSTANCE_VARIABLE_OR_WRITE_NODE
+#define YP_NODE_INSTANCE_VARIABLE_READ_NODE YP_INSTANCE_VARIABLE_READ_NODE
+#define YP_NODE_INSTANCE_VARIABLE_TARGET_NODE YP_INSTANCE_VARIABLE_TARGET_NODE
+#define YP_NODE_INSTANCE_VARIABLE_WRITE_NODE YP_INSTANCE_VARIABLE_WRITE_NODE
+#define YP_NODE_INTEGER_NODE YP_INTEGER_NODE
+#define YP_NODE_INTERPOLATED_REGULAR_EXPRESSION_NODE YP_INTERPOLATED_REGULAR_EXPRESSION_NODE
+#define YP_NODE_INTERPOLATED_STRING_NODE YP_INTERPOLATED_STRING_NODE
+#define YP_NODE_INTERPOLATED_SYMBOL_NODE YP_INTERPOLATED_SYMBOL_NODE
+#define YP_NODE_INTERPOLATED_X_STRING_NODE YP_INTERPOLATED_X_STRING_NODE
+#define YP_NODE_KEYWORD_HASH_NODE YP_KEYWORD_HASH_NODE
+#define YP_NODE_KEYWORD_PARAMETER_NODE YP_KEYWORD_PARAMETER_NODE
+#define YP_NODE_KEYWORD_REST_PARAMETER_NODE YP_KEYWORD_REST_PARAMETER_NODE
+#define YP_NODE_LAMBDA_NODE YP_LAMBDA_NODE
+#define YP_NODE_LOCAL_VARIABLE_AND_WRITE_NODE YP_LOCAL_VARIABLE_AND_WRITE_NODE
+#define YP_NODE_LOCAL_VARIABLE_OPERATOR_WRITE_NODE YP_LOCAL_VARIABLE_OPERATOR_WRITE_NODE
+#define YP_NODE_LOCAL_VARIABLE_OR_WRITE_NODE YP_LOCAL_VARIABLE_OR_WRITE_NODE
+#define YP_NODE_LOCAL_VARIABLE_READ_NODE YP_LOCAL_VARIABLE_READ_NODE
+#define YP_NODE_LOCAL_VARIABLE_TARGET_NODE YP_LOCAL_VARIABLE_TARGET_NODE
+#define YP_NODE_LOCAL_VARIABLE_WRITE_NODE YP_LOCAL_VARIABLE_WRITE_NODE
+#define YP_NODE_MATCH_PREDICATE_NODE YP_MATCH_PREDICATE_NODE
+#define YP_NODE_MATCH_REQUIRED_NODE YP_MATCH_REQUIRED_NODE
+#define YP_NODE_MISSING_NODE YP_MISSING_NODE
+#define YP_NODE_MODULE_NODE YP_MODULE_NODE
+#define YP_NODE_MULTI_TARGET_NODE YP_MULTI_TARGET_NODE
+#define YP_NODE_MULTI_WRITE_NODE YP_MULTI_WRITE_NODE
+#define YP_NODE_NEXT_NODE YP_NEXT_NODE
+#define YP_NODE_NIL_NODE YP_NIL_NODE
+#define YP_NODE_NO_KEYWORDS_PARAMETER_NODE YP_NO_KEYWORDS_PARAMETER_NODE
+#define YP_NODE_NUMBERED_REFERENCE_READ_NODE YP_NUMBERED_REFERENCE_READ_NODE
+#define YP_NODE_OPTIONAL_PARAMETER_NODE YP_OPTIONAL_PARAMETER_NODE
+#define YP_NODE_OR_NODE YP_OR_NODE
+#define YP_NODE_PARAMETERS_NODE YP_PARAMETERS_NODE
+#define YP_NODE_PARENTHESES_NODE YP_PARENTHESES_NODE
+#define YP_NODE_PINNED_EXPRESSION_NODE YP_PINNED_EXPRESSION_NODE
+#define YP_NODE_PINNED_VARIABLE_NODE YP_PINNED_VARIABLE_NODE
+#define YP_NODE_POST_EXECUTION_NODE YP_POST_EXECUTION_NODE
+#define YP_NODE_PRE_EXECUTION_NODE YP_PRE_EXECUTION_NODE
+#define YP_NODE_PROGRAM_NODE YP_PROGRAM_NODE
+#define YP_NODE_RANGE_NODE YP_RANGE_NODE
+#define YP_NODE_RATIONAL_NODE YP_RATIONAL_NODE
+#define YP_NODE_REDO_NODE YP_REDO_NODE
+#define YP_NODE_REGULAR_EXPRESSION_NODE YP_REGULAR_EXPRESSION_NODE
+#define YP_NODE_REQUIRED_DESTRUCTURED_PARAMETER_NODE YP_REQUIRED_DESTRUCTURED_PARAMETER_NODE
+#define YP_NODE_REQUIRED_PARAMETER_NODE YP_REQUIRED_PARAMETER_NODE
+#define YP_NODE_RESCUE_MODIFIER_NODE YP_RESCUE_MODIFIER_NODE
+#define YP_NODE_RESCUE_NODE YP_RESCUE_NODE
+#define YP_NODE_REST_PARAMETER_NODE YP_REST_PARAMETER_NODE
+#define YP_NODE_RETRY_NODE YP_RETRY_NODE
+#define YP_NODE_RETURN_NODE YP_RETURN_NODE
+#define YP_NODE_SELF_NODE YP_SELF_NODE
+#define YP_NODE_SINGLETON_CLASS_NODE YP_SINGLETON_CLASS_NODE
+#define YP_NODE_SOURCE_ENCODING_NODE YP_SOURCE_ENCODING_NODE
+#define YP_NODE_SOURCE_FILE_NODE YP_SOURCE_FILE_NODE
+#define YP_NODE_SOURCE_LINE_NODE YP_SOURCE_LINE_NODE
+#define YP_NODE_SPLAT_NODE YP_SPLAT_NODE
+#define YP_NODE_STATEMENTS_NODE YP_STATEMENTS_NODE
+#define YP_NODE_STRING_CONCAT_NODE YP_STRING_CONCAT_NODE
+#define YP_NODE_STRING_NODE YP_STRING_NODE
+#define YP_NODE_SUPER_NODE YP_SUPER_NODE
+#define YP_NODE_SYMBOL_NODE YP_SYMBOL_NODE
+#define YP_NODE_TRUE_NODE YP_TRUE_NODE
+#define YP_NODE_UNDEF_NODE YP_UNDEF_NODE
+#define YP_NODE_UNLESS_NODE YP_UNLESS_NODE
+#define YP_NODE_UNTIL_NODE YP_UNTIL_NODE
+#define YP_NODE_WHEN_NODE YP_WHEN_NODE
+#define YP_NODE_WHILE_NODE YP_WHILE_NODE
+#define YP_NODE_X_STRING_NODE YP_X_STRING_NODE
+#define YP_NODE_YIELD_NODE YP_YIELD_NODE
+
 typedef uint16_t yp_node_type_t;
 typedef uint16_t yp_node_flags_t;
 
@@ -368,8 +503,7 @@ typedef struct yp_node {
     // existed in the original grammar and ripper, but it's not a 1:1 mapping.
     yp_node_type_t type;
 
-    // This represents any flags on the node. Currently, this is only a newline
-    // flag
+    // This represents any flags on the node
     yp_node_flags_t flags;
 
     // This is the location of the node in the source. It's a range of bytes
@@ -378,6 +512,8 @@ typedef struct yp_node {
 } yp_node_t;
 
 // AliasNode
+//
+// Type: YP_ALIAS_NODE
 typedef struct yp_alias_node {
     yp_node_t base;
     struct yp_node *new_name;
@@ -386,6 +522,8 @@ typedef struct yp_alias_node {
 } yp_alias_node_t;
 
 // AlternationPatternNode
+//
+// Type: YP_ALTERNATION_PATTERN_NODE
 typedef struct yp_alternation_pattern_node {
     yp_node_t base;
     struct yp_node *left;
@@ -394,6 +532,8 @@ typedef struct yp_alternation_pattern_node {
 } yp_alternation_pattern_node_t;
 
 // AndNode
+//
+// Type: YP_AND_NODE
 typedef struct yp_and_node {
     yp_node_t base;
     struct yp_node *left;
@@ -402,12 +542,16 @@ typedef struct yp_and_node {
 } yp_and_node_t;
 
 // ArgumentsNode
+//
+// Type: YP_ARGUMENTS_NODE
 typedef struct yp_arguments_node {
     yp_node_t base;
     struct yp_node_list arguments;
 } yp_arguments_node_t;
 
 // ArrayNode
+//
+// Type: YP_ARRAY_NODE
 typedef struct yp_array_node {
     yp_node_t base;
     struct yp_node_list elements;
@@ -416,6 +560,8 @@ typedef struct yp_array_node {
 } yp_array_node_t;
 
 // ArrayPatternNode
+//
+// Type: YP_ARRAY_PATTERN_NODE
 typedef struct yp_array_pattern_node {
     yp_node_t base;
     struct yp_node *constant;
@@ -427,6 +573,8 @@ typedef struct yp_array_pattern_node {
 } yp_array_pattern_node_t;
 
 // AssocNode
+//
+// Type: YP_ASSOC_NODE
 typedef struct yp_assoc_node {
     yp_node_t base;
     struct yp_node *key;
@@ -435,6 +583,8 @@ typedef struct yp_assoc_node {
 } yp_assoc_node_t;
 
 // AssocSplatNode
+//
+// Type: YP_ASSOC_SPLAT_NODE
 typedef struct yp_assoc_splat_node {
     yp_node_t base;
     struct yp_node *value;
@@ -442,11 +592,15 @@ typedef struct yp_assoc_splat_node {
 } yp_assoc_splat_node_t;
 
 // BackReferenceReadNode
+//
+// Type: YP_BACK_REFERENCE_READ_NODE
 typedef struct yp_back_reference_read_node {
     yp_node_t base;
 } yp_back_reference_read_node_t;
 
 // BeginNode
+//
+// Type: YP_BEGIN_NODE
 typedef struct yp_begin_node {
     yp_node_t base;
     yp_location_t begin_keyword_loc;
@@ -458,13 +612,25 @@ typedef struct yp_begin_node {
 } yp_begin_node_t;
 
 // BlockArgumentNode
+//
+// Type: YP_BLOCK_ARGUMENT_NODE
 typedef struct yp_block_argument_node {
     yp_node_t base;
     struct yp_node *expression;
     yp_location_t operator_loc;
 } yp_block_argument_node_t;
 
+// BlockLocalVariableNode
+//
+// Type: YP_BLOCK_LOCAL_VARIABLE_NODE
+typedef struct yp_block_local_variable_node {
+    yp_node_t base;
+    yp_constant_id_t name;
+} yp_block_local_variable_node_t;
+
 // BlockNode
+//
+// Type: YP_BLOCK_NODE
 typedef struct yp_block_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -475,33 +641,65 @@ typedef struct yp_block_node {
 } yp_block_node_t;
 
 // BlockParameterNode
+//
+// Type: YP_BLOCK_PARAMETER_NODE
 typedef struct yp_block_parameter_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
 } yp_block_parameter_node_t;
 
 // BlockParametersNode
+//
+// Type: YP_BLOCK_PARAMETERS_NODE
 typedef struct yp_block_parameters_node {
     yp_node_t base;
     struct yp_parameters_node *parameters;
-    yp_location_list_t locals;
+    struct yp_node_list locals;
     yp_location_t opening_loc;
     yp_location_t closing_loc;
 } yp_block_parameters_node_t;
 
 // BreakNode
+//
+// Type: YP_BREAK_NODE
 typedef struct yp_break_node {
     yp_node_t base;
     struct yp_arguments_node *arguments;
     yp_location_t keyword_loc;
 } yp_break_node_t;
 
+// CallAndWriteNode
+//
+// Type: YP_CALL_AND_WRITE_NODE
+// Flags:
+//    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION
+//    YP_CALL_NODE_FLAGS_VARIABLE_CALL
+typedef struct yp_call_and_write_node {
+    yp_node_t base;
+    struct yp_node *receiver;
+    yp_location_t call_operator_loc;
+    yp_location_t message_loc;
+    yp_location_t opening_loc;
+    struct yp_arguments_node *arguments;
+    yp_location_t closing_loc;
+    yp_string_t read_name;
+    yp_string_t write_name;
+    yp_location_t operator_loc;
+    struct yp_node *value;
+} yp_call_and_write_node_t;
+
 // CallNode
+//
+// Type: YP_CALL_NODE
+// Flags:
+//    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION
+//    YP_CALL_NODE_FLAGS_VARIABLE_CALL
 typedef struct yp_call_node {
     yp_node_t base;
     struct yp_node *receiver;
-    yp_location_t operator_loc;
+    yp_location_t call_operator_loc;
     yp_location_t message_loc;
     yp_location_t opening_loc;
     struct yp_arguments_node *arguments;
@@ -510,32 +708,50 @@ typedef struct yp_call_node {
     yp_string_t name;
 } yp_call_node_t;
 
-// CallOperatorAndWriteNode
-typedef struct yp_call_operator_and_write_node {
+// CallOperatorWriteNode
+//
+// Type: YP_CALL_OPERATOR_WRITE_NODE
+// Flags:
+//    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION
+//    YP_CALL_NODE_FLAGS_VARIABLE_CALL
+typedef struct yp_call_operator_write_node {
     yp_node_t base;
-    struct yp_call_node *target;
+    struct yp_node *receiver;
+    yp_location_t call_operator_loc;
+    yp_location_t message_loc;
+    yp_location_t opening_loc;
+    struct yp_arguments_node *arguments;
+    yp_location_t closing_loc;
+    yp_string_t read_name;
+    yp_string_t write_name;
+    yp_constant_id_t operator;
     yp_location_t operator_loc;
     struct yp_node *value;
-} yp_call_operator_and_write_node_t;
-
-// CallOperatorOrWriteNode
-typedef struct yp_call_operator_or_write_node {
-    yp_node_t base;
-    struct yp_call_node *target;
-    struct yp_node *value;
-    yp_location_t operator_loc;
-} yp_call_operator_or_write_node_t;
+} yp_call_operator_write_node_t;
 
-// CallOperatorWriteNode
-typedef struct yp_call_operator_write_node {
+// CallOrWriteNode
+//
+// Type: YP_CALL_OR_WRITE_NODE
+// Flags:
+//    YP_CALL_NODE_FLAGS_SAFE_NAVIGATION
+//    YP_CALL_NODE_FLAGS_VARIABLE_CALL
+typedef struct yp_call_or_write_node {
     yp_node_t base;
-    struct yp_call_node *target;
+    struct yp_node *receiver;
+    yp_location_t call_operator_loc;
+    yp_location_t message_loc;
+    yp_location_t opening_loc;
+    struct yp_arguments_node *arguments;
+    yp_location_t closing_loc;
+    yp_string_t read_name;
+    yp_string_t write_name;
     yp_location_t operator_loc;
     struct yp_node *value;
-    yp_constant_id_t operator_id;
-} yp_call_operator_write_node_t;
+} yp_call_or_write_node_t;
 
 // CapturePatternNode
+//
+// Type: YP_CAPTURE_PATTERN_NODE
 typedef struct yp_capture_pattern_node {
     yp_node_t base;
     struct yp_node *value;
@@ -544,6 +760,8 @@ typedef struct yp_capture_pattern_node {
 } yp_capture_pattern_node_t;
 
 // CaseNode
+//
+// Type: YP_CASE_NODE
 typedef struct yp_case_node {
     yp_node_t base;
     struct yp_node *predicate;
@@ -554,6 +772,8 @@ typedef struct yp_case_node {
 } yp_case_node_t;
 
 // ClassNode
+//
+// Type: YP_CLASS_NODE
 typedef struct yp_class_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -563,20 +783,26 @@ typedef struct yp_class_node {
     struct yp_node *superclass;
     struct yp_node *body;
     yp_location_t end_keyword_loc;
-    yp_string_t name;
+    yp_constant_id_t name;
 } yp_class_node_t;
 
 // ClassVariableAndWriteNode
+//
+// Type: YP_CLASS_VARIABLE_AND_WRITE_NODE
 typedef struct yp_class_variable_and_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_class_variable_and_write_node_t;
 
 // ClassVariableOperatorWriteNode
+//
+// Type: YP_CLASS_VARIABLE_OPERATOR_WRITE_NODE
 typedef struct yp_class_variable_operator_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
@@ -584,42 +810,60 @@ typedef struct yp_class_variable_operator_write_node {
 } yp_class_variable_operator_write_node_t;
 
 // ClassVariableOrWriteNode
+//
+// Type: YP_CLASS_VARIABLE_OR_WRITE_NODE
 typedef struct yp_class_variable_or_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_class_variable_or_write_node_t;
 
 // ClassVariableReadNode
+//
+// Type: YP_CLASS_VARIABLE_READ_NODE
 typedef struct yp_class_variable_read_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_class_variable_read_node_t;
 
 // ClassVariableTargetNode
+//
+// Type: YP_CLASS_VARIABLE_TARGET_NODE
 typedef struct yp_class_variable_target_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_class_variable_target_node_t;
 
 // ClassVariableWriteNode
+//
+// Type: YP_CLASS_VARIABLE_WRITE_NODE
 typedef struct yp_class_variable_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     struct yp_node *value;
     yp_location_t operator_loc;
 } yp_class_variable_write_node_t;
 
 // ConstantAndWriteNode
+//
+// Type: YP_CONSTANT_AND_WRITE_NODE
 typedef struct yp_constant_and_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_constant_and_write_node_t;
 
 // ConstantOperatorWriteNode
+//
+// Type: YP_CONSTANT_OPERATOR_WRITE_NODE
 typedef struct yp_constant_operator_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
@@ -627,14 +871,19 @@ typedef struct yp_constant_operator_write_node {
 } yp_constant_operator_write_node_t;
 
 // ConstantOrWriteNode
+//
+// Type: YP_CONSTANT_OR_WRITE_NODE
 typedef struct yp_constant_or_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_constant_or_write_node_t;
 
 // ConstantPathAndWriteNode
+//
+// Type: YP_CONSTANT_PATH_AND_WRITE_NODE
 typedef struct yp_constant_path_and_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
@@ -643,6 +892,8 @@ typedef struct yp_constant_path_and_write_node {
 } yp_constant_path_and_write_node_t;
 
 // ConstantPathNode
+//
+// Type: YP_CONSTANT_PATH_NODE
 typedef struct yp_constant_path_node {
     yp_node_t base;
     struct yp_node *parent;
@@ -651,6 +902,8 @@ typedef struct yp_constant_path_node {
 } yp_constant_path_node_t;
 
 // ConstantPathOperatorWriteNode
+//
+// Type: YP_CONSTANT_PATH_OPERATOR_WRITE_NODE
 typedef struct yp_constant_path_operator_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
@@ -660,6 +913,8 @@ typedef struct yp_constant_path_operator_write_node {
 } yp_constant_path_operator_write_node_t;
 
 // ConstantPathOrWriteNode
+//
+// Type: YP_CONSTANT_PATH_OR_WRITE_NODE
 typedef struct yp_constant_path_or_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
@@ -668,6 +923,8 @@ typedef struct yp_constant_path_or_write_node {
 } yp_constant_path_or_write_node_t;
 
 // ConstantPathTargetNode
+//
+// Type: YP_CONSTANT_PATH_TARGET_NODE
 typedef struct yp_constant_path_target_node {
     yp_node_t base;
     struct yp_node *parent;
@@ -676,6 +933,8 @@ typedef struct yp_constant_path_target_node {
 } yp_constant_path_target_node_t;
 
 // ConstantPathWriteNode
+//
+// Type: YP_CONSTANT_PATH_WRITE_NODE
 typedef struct yp_constant_path_write_node {
     yp_node_t base;
     struct yp_constant_path_node *target;
@@ -684,26 +943,38 @@ typedef struct yp_constant_path_write_node {
 } yp_constant_path_write_node_t;
 
 // ConstantReadNode
+//
+// Type: YP_CONSTANT_READ_NODE
 typedef struct yp_constant_read_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_constant_read_node_t;
 
 // ConstantTargetNode
+//
+// Type: YP_CONSTANT_TARGET_NODE
 typedef struct yp_constant_target_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_constant_target_node_t;
 
 // ConstantWriteNode
+//
+// Type: YP_CONSTANT_WRITE_NODE
 typedef struct yp_constant_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     struct yp_node *value;
     yp_location_t operator_loc;
 } yp_constant_write_node_t;
 
 // DefNode
+//
+// Type: YP_DEF_NODE
 typedef struct yp_def_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     struct yp_node *receiver;
     struct yp_parameters_node *parameters;
@@ -718,6 +989,8 @@ typedef struct yp_def_node {
 } yp_def_node_t;
 
 // DefinedNode
+//
+// Type: YP_DEFINED_NODE
 typedef struct yp_defined_node {
     yp_node_t base;
     yp_location_t lparen_loc;
@@ -727,6 +1000,8 @@ typedef struct yp_defined_node {
 } yp_defined_node_t;
 
 // ElseNode
+//
+// Type: YP_ELSE_NODE
 typedef struct yp_else_node {
     yp_node_t base;
     yp_location_t else_keyword_loc;
@@ -735,6 +1010,8 @@ typedef struct yp_else_node {
 } yp_else_node_t;
 
 // EmbeddedStatementsNode
+//
+// Type: YP_EMBEDDED_STATEMENTS_NODE
 typedef struct yp_embedded_statements_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -743,6 +1020,8 @@ typedef struct yp_embedded_statements_node {
 } yp_embedded_statements_node_t;
 
 // EmbeddedVariableNode
+//
+// Type: YP_EMBEDDED_VARIABLE_NODE
 typedef struct yp_embedded_variable_node {
     yp_node_t base;
     yp_location_t operator_loc;
@@ -750,6 +1029,8 @@ typedef struct yp_embedded_variable_node {
 } yp_embedded_variable_node_t;
 
 // EnsureNode
+//
+// Type: YP_ENSURE_NODE
 typedef struct yp_ensure_node {
     yp_node_t base;
     yp_location_t ensure_keyword_loc;
@@ -758,11 +1039,15 @@ typedef struct yp_ensure_node {
 } yp_ensure_node_t;
 
 // FalseNode
+//
+// Type: YP_FALSE_NODE
 typedef struct yp_false_node {
     yp_node_t base;
 } yp_false_node_t;
 
 // FindPatternNode
+//
+// Type: YP_FIND_PATTERN_NODE
 typedef struct yp_find_pattern_node {
     yp_node_t base;
     struct yp_node *constant;
@@ -774,6 +1059,10 @@ typedef struct yp_find_pattern_node {
 } yp_find_pattern_node_t;
 
 // FlipFlopNode
+//
+// Type: YP_FLIP_FLOP_NODE
+// Flags:
+//    YP_RANGE_FLAGS_EXCLUDE_END
 typedef struct yp_flip_flop_node {
     yp_node_t base;
     struct yp_node *left;
@@ -782,11 +1071,15 @@ typedef struct yp_flip_flop_node {
 } yp_flip_flop_node_t;
 
 // FloatNode
+//
+// Type: YP_FLOAT_NODE
 typedef struct yp_float_node {
     yp_node_t base;
 } yp_float_node_t;
 
 // ForNode
+//
+// Type: YP_FOR_NODE
 typedef struct yp_for_node {
     yp_node_t base;
     struct yp_node *index;
@@ -799,32 +1092,44 @@ typedef struct yp_for_node {
 } yp_for_node_t;
 
 // ForwardingArgumentsNode
+//
+// Type: YP_FORWARDING_ARGUMENTS_NODE
 typedef struct yp_forwarding_arguments_node {
     yp_node_t base;
 } yp_forwarding_arguments_node_t;
 
 // ForwardingParameterNode
+//
+// Type: YP_FORWARDING_PARAMETER_NODE
 typedef struct yp_forwarding_parameter_node {
     yp_node_t base;
 } yp_forwarding_parameter_node_t;
 
 // ForwardingSuperNode
+//
+// Type: YP_FORWARDING_SUPER_NODE
 typedef struct yp_forwarding_super_node {
     yp_node_t base;
     struct yp_block_node *block;
 } yp_forwarding_super_node_t;
 
 // GlobalVariableAndWriteNode
+//
+// Type: YP_GLOBAL_VARIABLE_AND_WRITE_NODE
 typedef struct yp_global_variable_and_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_global_variable_and_write_node_t;
 
 // GlobalVariableOperatorWriteNode
+//
+// Type: YP_GLOBAL_VARIABLE_OPERATOR_WRITE_NODE
 typedef struct yp_global_variable_operator_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
@@ -832,32 +1137,46 @@ typedef struct yp_global_variable_operator_write_node {
 } yp_global_variable_operator_write_node_t;
 
 // GlobalVariableOrWriteNode
+//
+// Type: YP_GLOBAL_VARIABLE_OR_WRITE_NODE
 typedef struct yp_global_variable_or_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_global_variable_or_write_node_t;
 
 // GlobalVariableReadNode
+//
+// Type: YP_GLOBAL_VARIABLE_READ_NODE
 typedef struct yp_global_variable_read_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_global_variable_read_node_t;
 
 // GlobalVariableTargetNode
+//
+// Type: YP_GLOBAL_VARIABLE_TARGET_NODE
 typedef struct yp_global_variable_target_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_global_variable_target_node_t;
 
 // GlobalVariableWriteNode
+//
+// Type: YP_GLOBAL_VARIABLE_WRITE_NODE
 typedef struct yp_global_variable_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
-    yp_location_t operator_loc;
     struct yp_node *value;
+    yp_location_t operator_loc;
 } yp_global_variable_write_node_t;
 
 // HashNode
+//
+// Type: YP_HASH_NODE
 typedef struct yp_hash_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -866,6 +1185,8 @@ typedef struct yp_hash_node {
 } yp_hash_node_t;
 
 // HashPatternNode
+//
+// Type: YP_HASH_PATTERN_NODE
 typedef struct yp_hash_pattern_node {
     yp_node_t base;
     struct yp_node *constant;
@@ -876,6 +1197,8 @@ typedef struct yp_hash_pattern_node {
 } yp_hash_pattern_node_t;
 
 // IfNode
+//
+// Type: YP_IF_NODE
 typedef struct yp_if_node {
     yp_node_t base;
     yp_location_t if_keyword_loc;
@@ -886,12 +1209,16 @@ typedef struct yp_if_node {
 } yp_if_node_t;
 
 // ImaginaryNode
+//
+// Type: YP_IMAGINARY_NODE
 typedef struct yp_imaginary_node {
     yp_node_t base;
     struct yp_node *numeric;
 } yp_imaginary_node_t;
 
 // InNode
+//
+// Type: YP_IN_NODE
 typedef struct yp_in_node {
     yp_node_t base;
     struct yp_node *pattern;
@@ -901,16 +1228,22 @@ typedef struct yp_in_node {
 } yp_in_node_t;
 
 // InstanceVariableAndWriteNode
+//
+// Type: YP_INSTANCE_VARIABLE_AND_WRITE_NODE
 typedef struct yp_instance_variable_and_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_instance_variable_and_write_node_t;
 
 // InstanceVariableOperatorWriteNode
+//
+// Type: YP_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE
 typedef struct yp_instance_variable_operator_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
@@ -918,37 +1251,62 @@ typedef struct yp_instance_variable_operator_write_node {
 } yp_instance_variable_operator_write_node_t;
 
 // InstanceVariableOrWriteNode
+//
+// Type: YP_INSTANCE_VARIABLE_OR_WRITE_NODE
 typedef struct yp_instance_variable_or_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_instance_variable_or_write_node_t;
 
 // InstanceVariableReadNode
+//
+// Type: YP_INSTANCE_VARIABLE_READ_NODE
 typedef struct yp_instance_variable_read_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_instance_variable_read_node_t;
 
 // InstanceVariableTargetNode
+//
+// Type: YP_INSTANCE_VARIABLE_TARGET_NODE
 typedef struct yp_instance_variable_target_node {
     yp_node_t base;
+    yp_constant_id_t name;
 } yp_instance_variable_target_node_t;
 
 // InstanceVariableWriteNode
+//
+// Type: YP_INSTANCE_VARIABLE_WRITE_NODE
 typedef struct yp_instance_variable_write_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     struct yp_node *value;
     yp_location_t operator_loc;
 } yp_instance_variable_write_node_t;
 
 // IntegerNode
+//
+// Type: YP_INTEGER_NODE
 typedef struct yp_integer_node {
     yp_node_t base;
 } yp_integer_node_t;
 
 // InterpolatedRegularExpressionNode
+//
+// Type: YP_INTERPOLATED_REGULAR_EXPRESSION_NODE
+// Flags:
+//    YP_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE
+//    YP_REGULAR_EXPRESSION_FLAGS_MULTI_LINE
+//    YP_REGULAR_EXPRESSION_FLAGS_EXTENDED
+//    YP_REGULAR_EXPRESSION_FLAGS_EUC_JP
+//    YP_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT
+//    YP_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J
+//    YP_REGULAR_EXPRESSION_FLAGS_UTF_8
+//    YP_REGULAR_EXPRESSION_FLAGS_ONCE
 typedef struct yp_interpolated_regular_expression_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -957,6 +1315,8 @@ typedef struct yp_interpolated_regular_expression_node {
 } yp_interpolated_regular_expression_node_t;
 
 // InterpolatedStringNode
+//
+// Type: YP_INTERPOLATED_STRING_NODE
 typedef struct yp_interpolated_string_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -965,6 +1325,8 @@ typedef struct yp_interpolated_string_node {
 } yp_interpolated_string_node_t;
 
 // InterpolatedSymbolNode
+//
+// Type: YP_INTERPOLATED_SYMBOL_NODE
 typedef struct yp_interpolated_symbol_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -973,6 +1335,8 @@ typedef struct yp_interpolated_symbol_node {
 } yp_interpolated_symbol_node_t;
 
 // InterpolatedXStringNode
+//
+// Type: YP_INTERPOLATED_X_STRING_NODE
 typedef struct yp_interpolated_x_string_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -981,26 +1345,36 @@ typedef struct yp_interpolated_x_string_node {
 } yp_interpolated_x_string_node_t;
 
 // KeywordHashNode
+//
+// Type: YP_KEYWORD_HASH_NODE
 typedef struct yp_keyword_hash_node {
     yp_node_t base;
     struct yp_node_list elements;
 } yp_keyword_hash_node_t;
 
 // KeywordParameterNode
+//
+// Type: YP_KEYWORD_PARAMETER_NODE
 typedef struct yp_keyword_parameter_node {
     yp_node_t base;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     struct yp_node *value;
 } yp_keyword_parameter_node_t;
 
 // KeywordRestParameterNode
+//
+// Type: YP_KEYWORD_REST_PARAMETER_NODE
 typedef struct yp_keyword_rest_parameter_node {
     yp_node_t base;
-    yp_location_t operator_loc;
+    yp_constant_id_t name;
     yp_location_t name_loc;
+    yp_location_t operator_loc;
 } yp_keyword_rest_parameter_node_t;
 
 // LambdaNode
+//
+// Type: YP_LAMBDA_NODE
 typedef struct yp_lambda_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -1012,61 +1386,75 @@ typedef struct yp_lambda_node {
 } yp_lambda_node_t;
 
 // LocalVariableAndWriteNode
+//
+// Type: YP_LOCAL_VARIABLE_AND_WRITE_NODE
 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_constant_id_t name;
     uint32_t depth;
 } yp_local_variable_and_write_node_t;
 
 // LocalVariableOperatorWriteNode
+//
+// Type: YP_LOCAL_VARIABLE_OPERATOR_WRITE_NODE
 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_constant_id_t name;
+    yp_constant_id_t operator;
     uint32_t depth;
 } yp_local_variable_operator_write_node_t;
 
 // LocalVariableOrWriteNode
+//
+// Type: YP_LOCAL_VARIABLE_OR_WRITE_NODE
 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 name;
     uint32_t depth;
 } yp_local_variable_or_write_node_t;
 
 // LocalVariableReadNode
+//
+// Type: YP_LOCAL_VARIABLE_READ_NODE
 typedef struct yp_local_variable_read_node {
     yp_node_t base;
-    yp_constant_id_t constant_id;
+    yp_constant_id_t name;
     uint32_t depth;
 } yp_local_variable_read_node_t;
 
 // LocalVariableTargetNode
+//
+// Type: YP_LOCAL_VARIABLE_TARGET_NODE
 typedef struct yp_local_variable_target_node {
     yp_node_t base;
-    yp_constant_id_t constant_id;
+    yp_constant_id_t name;
     uint32_t depth;
 } yp_local_variable_target_node_t;
 
 // LocalVariableWriteNode
+//
+// Type: YP_LOCAL_VARIABLE_WRITE_NODE
 typedef struct yp_local_variable_write_node {
     yp_node_t base;
-    yp_constant_id_t constant_id;
+    yp_constant_id_t name;
     uint32_t depth;
-    struct yp_node *value;
     yp_location_t name_loc;
+    struct yp_node *value;
     yp_location_t operator_loc;
 } yp_local_variable_write_node_t;
 
 // MatchPredicateNode
+//
+// Type: YP_MATCH_PREDICATE_NODE
 typedef struct yp_match_predicate_node {
     yp_node_t base;
     struct yp_node *value;
@@ -1075,6 +1463,8 @@ typedef struct yp_match_predicate_node {
 } yp_match_predicate_node_t;
 
 // MatchRequiredNode
+//
+// Type: YP_MATCH_REQUIRED_NODE
 typedef struct yp_match_required_node {
     yp_node_t base;
     struct yp_node *value;
@@ -1083,11 +1473,15 @@ typedef struct yp_match_required_node {
 } yp_match_required_node_t;
 
 // MissingNode
+//
+// Type: YP_MISSING_NODE
 typedef struct yp_missing_node {
     yp_node_t base;
 } yp_missing_node_t;
 
 // ModuleNode
+//
+// Type: YP_MODULE_NODE
 typedef struct yp_module_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -1095,20 +1489,34 @@ typedef struct yp_module_node {
     struct yp_node *constant_path;
     struct yp_node *body;
     yp_location_t end_keyword_loc;
-    yp_string_t name;
+    yp_constant_id_t name;
 } yp_module_node_t;
 
+// MultiTargetNode
+//
+// Type: YP_MULTI_TARGET_NODE
+typedef struct yp_multi_target_node {
+    yp_node_t base;
+    struct yp_node_list targets;
+    yp_location_t lparen_loc;
+    yp_location_t rparen_loc;
+} yp_multi_target_node_t;
+
 // MultiWriteNode
+//
+// Type: YP_MULTI_WRITE_NODE
 typedef struct yp_multi_write_node {
     yp_node_t base;
     struct yp_node_list targets;
-    yp_location_t operator_loc;
-    struct yp_node *value;
     yp_location_t lparen_loc;
     yp_location_t rparen_loc;
+    yp_location_t operator_loc;
+    struct yp_node *value;
 } yp_multi_write_node_t;
 
 // NextNode
+//
+// Type: YP_NEXT_NODE
 typedef struct yp_next_node {
     yp_node_t base;
     struct yp_arguments_node *arguments;
@@ -1116,11 +1524,15 @@ typedef struct yp_next_node {
 } yp_next_node_t;
 
 // NilNode
+//
+// Type: YP_NIL_NODE
 typedef struct yp_nil_node {
     yp_node_t base;
 } yp_nil_node_t;
 
 // NoKeywordsParameterNode
+//
+// Type: YP_NO_KEYWORDS_PARAMETER_NODE
 typedef struct yp_no_keywords_parameter_node {
     yp_node_t base;
     yp_location_t operator_loc;
@@ -1128,20 +1540,27 @@ typedef struct yp_no_keywords_parameter_node {
 } yp_no_keywords_parameter_node_t;
 
 // NumberedReferenceReadNode
+//
+// Type: YP_NUMBERED_REFERENCE_READ_NODE
 typedef struct yp_numbered_reference_read_node {
     yp_node_t base;
+    uint32_t number;
 } yp_numbered_reference_read_node_t;
 
 // OptionalParameterNode
+//
+// Type: YP_OPTIONAL_PARAMETER_NODE
 typedef struct yp_optional_parameter_node {
     yp_node_t base;
-    yp_constant_id_t constant_id;
+    yp_constant_id_t name;
     yp_location_t name_loc;
     yp_location_t operator_loc;
     struct yp_node *value;
 } yp_optional_parameter_node_t;
 
 // OrNode
+//
+// Type: YP_OR_NODE
 typedef struct yp_or_node {
     yp_node_t base;
     struct yp_node *left;
@@ -1150,6 +1569,8 @@ typedef struct yp_or_node {
 } yp_or_node_t;
 
 // ParametersNode
+//
+// Type: YP_PARAMETERS_NODE
 typedef struct yp_parameters_node {
     yp_node_t base;
     struct yp_node_list requireds;
@@ -1162,6 +1583,8 @@ typedef struct yp_parameters_node {
 } yp_parameters_node_t;
 
 // ParenthesesNode
+//
+// Type: YP_PARENTHESES_NODE
 typedef struct yp_parentheses_node {
     yp_node_t base;
     struct yp_node *body;
@@ -1170,6 +1593,8 @@ typedef struct yp_parentheses_node {
 } yp_parentheses_node_t;
 
 // PinnedExpressionNode
+//
+// Type: YP_PINNED_EXPRESSION_NODE
 typedef struct yp_pinned_expression_node {
     yp_node_t base;
     struct yp_node *expression;
@@ -1179,6 +1604,8 @@ typedef struct yp_pinned_expression_node {
 } yp_pinned_expression_node_t;
 
 // PinnedVariableNode
+//
+// Type: YP_PINNED_VARIABLE_NODE
 typedef struct yp_pinned_variable_node {
     yp_node_t base;
     struct yp_node *variable;
@@ -1186,6 +1613,8 @@ typedef struct yp_pinned_variable_node {
 } yp_pinned_variable_node_t;
 
 // PostExecutionNode
+//
+// Type: YP_POST_EXECUTION_NODE
 typedef struct yp_post_execution_node {
     yp_node_t base;
     struct yp_statements_node *statements;
@@ -1195,6 +1624,8 @@ typedef struct yp_post_execution_node {
 } yp_post_execution_node_t;
 
 // PreExecutionNode
+//
+// Type: YP_PRE_EXECUTION_NODE
 typedef struct yp_pre_execution_node {
     yp_node_t base;
     struct yp_statements_node *statements;
@@ -1204,6 +1635,8 @@ typedef struct yp_pre_execution_node {
 } yp_pre_execution_node_t;
 
 // ProgramNode
+//
+// Type: YP_PROGRAM_NODE
 typedef struct yp_program_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -1211,6 +1644,10 @@ typedef struct yp_program_node {
 } yp_program_node_t;
 
 // RangeNode
+//
+// Type: YP_RANGE_NODE
+// Flags:
+//    YP_RANGE_FLAGS_EXCLUDE_END
 typedef struct yp_range_node {
     yp_node_t base;
     struct yp_node *left;
@@ -1219,17 +1656,32 @@ typedef struct yp_range_node {
 } yp_range_node_t;
 
 // RationalNode
+//
+// Type: YP_RATIONAL_NODE
 typedef struct yp_rational_node {
     yp_node_t base;
     struct yp_node *numeric;
 } yp_rational_node_t;
 
 // RedoNode
+//
+// Type: YP_REDO_NODE
 typedef struct yp_redo_node {
     yp_node_t base;
 } yp_redo_node_t;
 
 // RegularExpressionNode
+//
+// Type: YP_REGULAR_EXPRESSION_NODE
+// Flags:
+//    YP_REGULAR_EXPRESSION_FLAGS_IGNORE_CASE
+//    YP_REGULAR_EXPRESSION_FLAGS_MULTI_LINE
+//    YP_REGULAR_EXPRESSION_FLAGS_EXTENDED
+//    YP_REGULAR_EXPRESSION_FLAGS_EUC_JP
+//    YP_REGULAR_EXPRESSION_FLAGS_ASCII_8BIT
+//    YP_REGULAR_EXPRESSION_FLAGS_WINDOWS_31J
+//    YP_REGULAR_EXPRESSION_FLAGS_UTF_8
+//    YP_REGULAR_EXPRESSION_FLAGS_ONCE
 typedef struct yp_regular_expression_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -1239,6 +1691,8 @@ typedef struct yp_regular_expression_node {
 } yp_regular_expression_node_t;
 
 // RequiredDestructuredParameterNode
+//
+// Type: YP_REQUIRED_DESTRUCTURED_PARAMETER_NODE
 typedef struct yp_required_destructured_parameter_node {
     yp_node_t base;
     struct yp_node_list parameters;
@@ -1247,12 +1701,16 @@ typedef struct yp_required_destructured_parameter_node {
 } yp_required_destructured_parameter_node_t;
 
 // RequiredParameterNode
+//
+// Type: YP_REQUIRED_PARAMETER_NODE
 typedef struct yp_required_parameter_node {
     yp_node_t base;
-    yp_constant_id_t constant_id;
+    yp_constant_id_t name;
 } yp_required_parameter_node_t;
 
 // RescueModifierNode
+//
+// Type: YP_RESCUE_MODIFIER_NODE
 typedef struct yp_rescue_modifier_node {
     yp_node_t base;
     struct yp_node *expression;
@@ -1261,6 +1719,8 @@ typedef struct yp_rescue_modifier_node {
 } yp_rescue_modifier_node_t;
 
 // RescueNode
+//
+// Type: YP_RESCUE_NODE
 typedef struct yp_rescue_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1272,18 +1732,25 @@ typedef struct yp_rescue_node {
 } yp_rescue_node_t;
 
 // RestParameterNode
+//
+// Type: YP_REST_PARAMETER_NODE
 typedef struct yp_rest_parameter_node {
     yp_node_t base;
-    yp_location_t operator_loc;
+    yp_constant_id_t name;
     yp_location_t name_loc;
+    yp_location_t operator_loc;
 } yp_rest_parameter_node_t;
 
 // RetryNode
+//
+// Type: YP_RETRY_NODE
 typedef struct yp_retry_node {
     yp_node_t base;
 } yp_retry_node_t;
 
 // ReturnNode
+//
+// Type: YP_RETURN_NODE
 typedef struct yp_return_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1291,11 +1758,15 @@ typedef struct yp_return_node {
 } yp_return_node_t;
 
 // SelfNode
+//
+// Type: YP_SELF_NODE
 typedef struct yp_self_node {
     yp_node_t base;
 } yp_self_node_t;
 
 // SingletonClassNode
+//
+// Type: YP_SINGLETON_CLASS_NODE
 typedef struct yp_singleton_class_node {
     yp_node_t base;
     yp_constant_id_list_t locals;
@@ -1307,22 +1778,30 @@ typedef struct yp_singleton_class_node {
 } yp_singleton_class_node_t;
 
 // SourceEncodingNode
+//
+// Type: YP_SOURCE_ENCODING_NODE
 typedef struct yp_source_encoding_node {
     yp_node_t base;
 } yp_source_encoding_node_t;
 
 // SourceFileNode
+//
+// Type: YP_SOURCE_FILE_NODE
 typedef struct yp_source_file_node {
     yp_node_t base;
     yp_string_t filepath;
 } yp_source_file_node_t;
 
 // SourceLineNode
+//
+// Type: YP_SOURCE_LINE_NODE
 typedef struct yp_source_line_node {
     yp_node_t base;
 } yp_source_line_node_t;
 
 // SplatNode
+//
+// Type: YP_SPLAT_NODE
 typedef struct yp_splat_node {
     yp_node_t base;
     yp_location_t operator_loc;
@@ -1330,12 +1809,16 @@ typedef struct yp_splat_node {
 } yp_splat_node_t;
 
 // StatementsNode
+//
+// Type: YP_STATEMENTS_NODE
 typedef struct yp_statements_node {
     yp_node_t base;
     struct yp_node_list body;
 } yp_statements_node_t;
 
 // StringConcatNode
+//
+// Type: YP_STRING_CONCAT_NODE
 typedef struct yp_string_concat_node {
     yp_node_t base;
     struct yp_node *left;
@@ -1343,6 +1826,8 @@ typedef struct yp_string_concat_node {
 } yp_string_concat_node_t;
 
 // StringNode
+//
+// Type: YP_STRING_NODE
 typedef struct yp_string_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -1352,6 +1837,8 @@ typedef struct yp_string_node {
 } yp_string_node_t;
 
 // SuperNode
+//
+// Type: YP_SUPER_NODE
 typedef struct yp_super_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1362,6 +1849,8 @@ typedef struct yp_super_node {
 } yp_super_node_t;
 
 // SymbolNode
+//
+// Type: YP_SYMBOL_NODE
 typedef struct yp_symbol_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -1371,11 +1860,15 @@ typedef struct yp_symbol_node {
 } yp_symbol_node_t;
 
 // TrueNode
+//
+// Type: YP_TRUE_NODE
 typedef struct yp_true_node {
     yp_node_t base;
 } yp_true_node_t;
 
 // UndefNode
+//
+// Type: YP_UNDEF_NODE
 typedef struct yp_undef_node {
     yp_node_t base;
     struct yp_node_list names;
@@ -1383,6 +1876,8 @@ typedef struct yp_undef_node {
 } yp_undef_node_t;
 
 // UnlessNode
+//
+// Type: YP_UNLESS_NODE
 typedef struct yp_unless_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1393,6 +1888,10 @@ typedef struct yp_unless_node {
 } yp_unless_node_t;
 
 // UntilNode
+//
+// Type: YP_UNTIL_NODE
+// Flags:
+//    YP_LOOP_FLAGS_BEGIN_MODIFIER
 typedef struct yp_until_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1402,6 +1901,8 @@ typedef struct yp_until_node {
 } yp_until_node_t;
 
 // WhenNode
+//
+// Type: YP_WHEN_NODE
 typedef struct yp_when_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1410,6 +1911,10 @@ typedef struct yp_when_node {
 } yp_when_node_t;
 
 // WhileNode
+//
+// Type: YP_WHILE_NODE
+// Flags:
+//    YP_LOOP_FLAGS_BEGIN_MODIFIER
 typedef struct yp_while_node {
     yp_node_t base;
     yp_location_t keyword_loc;
@@ -1419,6 +1924,8 @@ typedef struct yp_while_node {
 } yp_while_node_t;
 
 // XStringNode
+//
+// Type: YP_X_STRING_NODE
 typedef struct yp_x_string_node {
     yp_node_t base;
     yp_location_t opening_loc;
@@ -1428,6 +1935,8 @@ typedef struct yp_x_string_node {
 } yp_x_string_node_t;
 
 // YieldNode
+//
+// Type: YP_YIELD_NODE
 typedef struct yp_yield_node {
     yp_node_t base;
     yp_location_t keyword_loc;