yarp 0.9.0 → 0.10.0

data/docs/encoding.md

@@ -61,22 +61,22 @@ typedef struct {
     // Return the number of bytes that the next character takes if it is valid
     // in the encoding. Does not read more than n bytes. It is assumed that n is
     // at least 1.
-    size_t (*char_width)(const char *c, ptrdiff_t n);
+    size_t (*char_width)(const uint8_t *b, ptrdiff_t n);
 
     // Return the number of bytes that the next character takes if it is valid
     // in the encoding and is alphabetical. Does not read more than n bytes. It
     // is assumed that n is at least 1.
-    size_t (*alpha_char)(const char *c, ptrdiff_t n);
+    size_t (*alpha_char)(const uint8_t *b, ptrdiff_t n);
 
     // Return the number of bytes that the next character takes if it is valid
     // in the encoding and is alphanumeric. Does not read more than n bytes. It
     // is assumed that n is at least 1.
-    size_t (*alnum_char)(const char *c, ptrdiff_t n);
+    size_t (*alnum_char)(const uint8_t *b, ptrdiff_t n);
 
     // Return true if the next character is valid in the encoding and is an
     // uppercase character. Does not read more than n bytes. It is assumed that
     // n is at least 1.
-    bool (*isupper_char)(const char *c, ptrdiff_t n);
+    bool (*isupper_char)(const uint8_t *b, ptrdiff_t n);
 
     // The name of the encoding. This should correspond to a value that can be
     // passed to Encoding.find in Ruby.
@@ -90,7 +90,7 @@ typedef struct {
 // the ability here to call out to a user-defined function to get an encoding
 // struct. If the function returns something that isn't NULL, we set that to
 // our encoding and use it to parse identifiers.
-typedef yp_encoding_t *(*yp_encoding_decode_callback_t)(yp_parser_t *parser, const char *name, size_t width);
+typedef yp_encoding_t *(*yp_encoding_decode_callback_t)(yp_parser_t *parser, const uint8_t *name, size_t width);
 
 // Register a callback that will be called when YARP encounters a magic comment
 // with an encoding referenced that it doesn't understand. The callback should

data/docs/serialization.md

@@ -130,14 +130,14 @@ void yp_buffer_free(yp_buffer_t *);
 
 // Parse and serialize the AST represented by the given source to the given
 // buffer.
-void yp_parse_serialize(const char *, size_t, yp_buffer_t *, const char *);
+void yp_parse_serialize(const uint8_t *source, size_t length, yp_buffer_t *buffer, const char *metadata);
 ```
 
 Typically you would use a stack-allocated `yp_buffer_t` and call `yp_parse_serialize`, as in:
 
 ```c
 void
-serialize(const char *source, size_t length) {
+serialize(const uint8_t *source, size_t length) {
   yp_buffer_t buffer;
   if (!yp_buffer_init(&buffer)) return;
 

data/ext/yarp/api_node.c

@@ -150,7 +150,7 @@ static VALUE rb_cYARPXStringNode;
 static VALUE rb_cYARPYieldNode;
 
 static VALUE
-yp_location_new(yp_parser_t *parser, const char *start, const char *end, VALUE source) {
+yp_location_new(yp_parser_t *parser, const uint8_t *start, const uint8_t *end, VALUE source) {
     VALUE argv[] = { source, LONG2FIX(start - parser->start), LONG2FIX(end - start) };
     return rb_class_new_instance(3, argv, rb_cYARPLocation);
 }
@@ -162,7 +162,7 @@ yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALU
 
     VALUE argv[] = {
         ID2SYM(type),
-        rb_enc_str_new(token->start, token->end - token->start, encoding),
+        rb_enc_str_new((const char *) token->start, token->end - token->start, encoding),
         location
     };
 
@@ -171,13 +171,13 @@ yp_token_new(yp_parser_t *parser, yp_token_t *token, rb_encoding *encoding, VALU
 
 static VALUE
 yp_string_new(yp_string_t *string, rb_encoding *encoding) {
-    return rb_enc_str_new(yp_string_source(string), yp_string_length(string), encoding);
+    return rb_enc_str_new((const char *) yp_string_source(string), yp_string_length(string), encoding);
 }
 
 // Create a YARP::Source object from the given parser.
 VALUE
 yp_source_new(yp_parser_t *parser) {
-    VALUE source = rb_str_new(parser->start, parser->end - parser->start);
+    VALUE source = rb_str_new((const char *) parser->start, parser->end - parser->start);
     VALUE offsets = rb_ary_new_capa(parser->newline_list.size);
 
     for (size_t index = 0; index < parser->newline_list.size; index++) {
@@ -223,7 +223,7 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
         yp_constant_t constant = parser->constant_pool.constants[index];
 
         if (constant.id != 0) {
-            constants[constant.id - 1] = rb_intern3(constant.start, constant.length, encoding);
+            constants[constant.id - 1] = rb_intern3((const char *) constant.start, constant.length, encoding);
         }
     }
 
@@ -1366,8 +1366,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // value
                     argv[2] = rb_ary_pop(value_stack);
 
-                    // operator_id
-                    argv[3] = rb_id2sym(constants[cast->operator_id - 1]);
+                    // operator
+                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
 
                     // location
                     argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -1465,104 +1465,124 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_AND_WRITE_NODE: {
                     yp_class_variable_and_write_node_t *cast = (yp_class_variable_and_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPClassVariableAndWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableAndWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_OPERATOR_WRITE_NODE: {
                     yp_class_variable_operator_write_node_t *cast = (yp_class_variable_operator_write_node_t *) node;
-                    VALUE argv[5];
+                    VALUE argv[6];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // operator
-                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableOperatorWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPClassVariableOperatorWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_OR_WRITE_NODE: {
                     yp_class_variable_or_write_node_t *cast = (yp_class_variable_or_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPClassVariableOrWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableOrWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_READ_NODE: {
-                    VALUE argv[1];
+                    yp_class_variable_read_node_t *cast = (yp_class_variable_read_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPClassVariableReadNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPClassVariableReadNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_TARGET_NODE: {
-                    VALUE argv[1];
+                    yp_class_variable_target_node_t *cast = (yp_class_variable_target_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPClassVariableTargetNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPClassVariableTargetNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_CLASS_VARIABLE_WRITE_NODE: {
                     yp_class_variable_write_node_t *cast = (yp_class_variable_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // value
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[2] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[3] = cast->operator_loc.start == NULL ? Qnil : yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPClassVariableWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPClassVariableWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2169,11 +2189,11 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // name_loc
                     argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
-                    // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
-
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[1] = rb_ary_pop(value_stack);
+
+                    // operator_loc
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
                     argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
@@ -2298,104 +2318,124 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_AND_WRITE_NODE: {
                     yp_instance_variable_and_write_node_t *cast = (yp_instance_variable_and_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPInstanceVariableAndWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableAndWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_OPERATOR_WRITE_NODE: {
                     yp_instance_variable_operator_write_node_t *cast = (yp_instance_variable_operator_write_node_t *) node;
-                    VALUE argv[5];
+                    VALUE argv[6];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // operator
-                    argv[3] = rb_id2sym(constants[cast->operator - 1]);
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
 
                     // location
-                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[5] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableOperatorWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(6, argv, rb_cYARPInstanceVariableOperatorWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_OR_WRITE_NODE: {
                     yp_instance_variable_or_write_node_t *cast = (yp_instance_variable_or_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // operator_loc
-                    argv[1] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // value
-                    argv[2] = rb_ary_pop(value_stack);
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPInstanceVariableOrWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableOrWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_READ_NODE: {
-                    VALUE argv[1];
+                    yp_instance_variable_read_node_t *cast = (yp_instance_variable_read_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPInstanceVariableReadNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPInstanceVariableReadNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_TARGET_NODE: {
-                    VALUE argv[1];
+                    yp_instance_variable_target_node_t *cast = (yp_instance_variable_target_node_t *) node;
+                    VALUE argv[2];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPInstanceVariableTargetNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPInstanceVariableTargetNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_INSTANCE_VARIABLE_WRITE_NODE: {
                     yp_instance_variable_write_node_t *cast = (yp_instance_variable_write_node_t *) node;
-                    VALUE argv[4];
+                    VALUE argv[5];
+
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
-                    argv[0] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
 
                     // value
-                    argv[1] = rb_ary_pop(value_stack);
+                    argv[2] = rb_ary_pop(value_stack);
 
                     // operator_loc
-                    argv[2] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
+                    argv[3] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
 
                     // location
-                    argv[3] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[4] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(4, argv, rb_cYARPInstanceVariableWriteNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(5, argv, rb_cYARPInstanceVariableWriteNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2600,8 +2640,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // value
                     argv[2] = rb_ary_pop(value_stack);
 
-                    // constant_id
-                    argv[3] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[4] = ULONG2NUM(cast->depth);
@@ -2626,11 +2666,11 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // value
                     argv[2] = rb_ary_pop(value_stack);
 
-                    // constant_id
-                    argv[3] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
 
-                    // operator_id
-                    argv[4] = rb_id2sym(constants[cast->operator_id - 1]);
+                    // operator
+                    argv[4] = rb_id2sym(constants[cast->operator - 1]);
 
                     // depth
                     argv[5] = ULONG2NUM(cast->depth);
@@ -2655,8 +2695,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     // value
                     argv[2] = rb_ary_pop(value_stack);
 
-                    // constant_id
-                    argv[3] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[3] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[4] = ULONG2NUM(cast->depth);
@@ -2672,8 +2712,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_local_variable_read_node_t *cast = (yp_local_variable_read_node_t *) node;
                     VALUE argv[3];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[1] = ULONG2NUM(cast->depth);
@@ -2689,8 +2729,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_local_variable_target_node_t *cast = (yp_local_variable_target_node_t *) node;
                     VALUE argv[3];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[1] = ULONG2NUM(cast->depth);
@@ -2706,17 +2746,17 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_local_variable_write_node_t *cast = (yp_local_variable_write_node_t *) node;
                     VALUE argv[6];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // depth
                     argv[1] = ULONG2NUM(cast->depth);
 
-                    // value
-                    argv[2] = rb_ary_pop(value_stack);
-
                     // name_loc
-                    argv[3] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+                    argv[2] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
+
+                    // value
+                    argv[3] = rb_ary_pop(value_stack);
 
                     // operator_loc
                     argv[4] = yp_location_new(parser, cast->operator_loc.start, cast->operator_loc.end, source);
@@ -2884,12 +2924,16 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                 }
 #line 137 "api_node.c.erb"
                 case YP_NODE_NUMBERED_REFERENCE_READ_NODE: {
-                    VALUE argv[1];
+                    yp_numbered_reference_read_node_t *cast = (yp_numbered_reference_read_node_t *) node;
+                    VALUE argv[2];
+
+                    // number
+                    argv[0] = ULONG2NUM(cast->number);
 
                     // location
-                    argv[0] = yp_location_new(parser, node->location.start, node->location.end, source);
+                    argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);
 
-                    rb_ary_push(value_stack, rb_class_new_instance(1, argv, rb_cYARPNumberedReferenceReadNode));
+                    rb_ary_push(value_stack, rb_class_new_instance(2, argv, rb_cYARPNumberedReferenceReadNode));
                     break;
                 }
 #line 137 "api_node.c.erb"
@@ -2897,8 +2941,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_optional_parameter_node_t *cast = (yp_optional_parameter_node_t *) node;
                     VALUE argv[5];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // name_loc
                     argv[1] = yp_location_new(parser, cast->name_loc.start, cast->name_loc.end, source);
@@ -3205,8 +3249,8 @@ yp_ast_new(yp_parser_t *parser, yp_node_t *node, rb_encoding *encoding) {
                     yp_required_parameter_node_t *cast = (yp_required_parameter_node_t *) node;
                     VALUE argv[2];
 
-                    // constant_id
-                    argv[0] = rb_id2sym(constants[cast->constant_id - 1]);
+                    // name
+                    argv[0] = rb_id2sym(constants[cast->name - 1]);
 
                     // location
                     argv[1] = yp_location_new(parser, node->location.start, node->location.end, source);

data/ext/yarp/extension.c

@@ -83,7 +83,21 @@ dump(int argc, VALUE *argv, VALUE self) {
 
     yp_string_t input;
     input_load_string(&input, string);
-    return dump_input(&input, check_string(filepath));
+
+#ifdef YARP_DEBUG_MODE_BUILD
+    size_t length = yp_string_length(&input);
+    char* dup = malloc(length);
+    memcpy(dup, yp_string_source(&input), length);
+    yp_string_constant_init(&input, dup, length);
+#endif
+
+    VALUE value = dump_input(&input, check_string(filepath));
+
+#ifdef YARP_DEBUG_MODE_BUILD
+    free(dup);
+#endif
+
+    return value;
 }
 
 // Dump the AST corresponding to the given file to a string.
@@ -246,7 +260,7 @@ parse_lex_input(yp_string_t *input, const char *filepath, bool return_nodes) {
     yp_parser_register_encoding_changed_callback(&parser, parse_lex_encoding_changed_callback);
 
     VALUE offsets = rb_ary_new();
-    VALUE source_argv[] = { rb_str_new(yp_string_source(input), yp_string_length(input)), offsets };
+    VALUE source_argv[] = { rb_str_new((const char *) yp_string_source(input), yp_string_length(input)), offsets };
     VALUE source = rb_class_new_instance(2, source_argv, rb_cYARPSource);
 
     parse_lex_data_t parse_lex_data = {
@@ -428,7 +442,7 @@ named_captures(VALUE self, VALUE source) {
     yp_string_list_t string_list;
     yp_string_list_init(&string_list);
 
-    if (!yp_regexp_named_capture_group_names(RSTRING_PTR(source), RSTRING_LEN(source), &string_list, false, &yp_encoding_utf_8)) {
+    if (!yp_regexp_named_capture_group_names((const uint8_t *) RSTRING_PTR(source), RSTRING_LEN(source), &string_list, false, &yp_encoding_utf_8)) {
         yp_string_list_free(&string_list);
         return Qnil;
     }
@@ -436,7 +450,7 @@ named_captures(VALUE self, VALUE source) {
     VALUE names = rb_ary_new();
     for (size_t index = 0; index < string_list.length; index++) {
         const yp_string_t *string = &string_list.strings[index];
-        rb_ary_push(names, rb_str_new(yp_string_source(string), yp_string_length(string)));
+        rb_ary_push(names, rb_str_new((const char *) yp_string_source(string), yp_string_length(string)));
     }
 
     yp_string_list_free(&string_list);
@@ -449,8 +463,8 @@ static VALUE
 unescape(VALUE source, yp_unescape_type_t unescape_type) {
     yp_string_t result;
 
-    if (yp_unescape_string(RSTRING_PTR(source), RSTRING_LEN(source), unescape_type, &result)) {
-        VALUE str = rb_str_new(yp_string_source(&result), yp_string_length(&result));
+    if (yp_unescape_string((const uint8_t *) RSTRING_PTR(source), RSTRING_LEN(source), unescape_type, &result)) {
+        VALUE str = rb_str_new((const char *) yp_string_source(&result), yp_string_length(&result));
         yp_string_free(&result);
         return str;
     } else {
@@ -484,7 +498,7 @@ static VALUE
 memsize(VALUE self, VALUE string) {
     yp_parser_t parser;
     size_t length = RSTRING_LEN(string);
-    yp_parser_init(&parser, RSTRING_PTR(string), length, NULL);
+    yp_parser_init(&parser, (const uint8_t *) RSTRING_PTR(string), length, NULL);
 
     yp_node_t *node = yp_parse(&parser);
     yp_memsize_t memsize;

data/ext/yarp/extension.h

@@ -1,7 +1,7 @@
 #ifndef YARP_EXT_NODE_H
 #define YARP_EXT_NODE_H
 
-#define EXPECTED_YARP_VERSION "0.9.0"
+#define EXPECTED_YARP_VERSION "0.10.0"
 
 #include <ruby.h>
 #include <ruby/encoding.h>