Switch data_loc over to using a slice

Author: kddnewton

ext/prism/extension.c

@@ -533,10 +533,10 @@ parser_magic_comments(const pm_parser_t *parser, VALUE source, bool freeze) {
  */
 static VALUE
 parser_data_loc(const pm_parser_t *parser, VALUE source, bool freeze) {
-    if (parser->data_loc.end == NULL) {
+    if (parser->data_loc.length == 0) {
         return Qnil;
     } else {
-        return PARSER_LOCATION_LOC(parser, source, freeze, parser->data_loc);
+        return parser_location(parser, source, freeze, parser->data_loc.start, parser->data_loc.length);
     }
 }
 

include/prism/parser.h

@@ -722,7 +722,7 @@ struct pm_parser {
      * and the rest of the content of the file. This content is loaded into the
      * DATA constant when the file being parsed is the main file being executed.
      */
-    pm_location_t data_loc;
+    pm_slice_t data_loc;
 
     /** The list of warnings that have been found while parsing. */
     pm_list_t warning_list;

src/prism.c

@@ -10951,8 +10951,8 @@ parser_lex(pm_parser_t *parser) {
                         parser->current.type = PM_TOKEN___END__;
                         parser_lex_callback(parser);
 
-                        parser->data_loc.start = parser->current.start;
-                        parser->data_loc.end = parser->current.end;
+                        parser->data_loc.start = (uint32_t) (parser->current.start - parser->start);
+                        parser->data_loc.length = (uint32_t) (parser->current.end - parser->current.start);
 
                         LEX(PM_TOKEN_EOF);
                     }
@@ -21707,7 +21707,7 @@ pm_parser_init(pm_parser_t *parser, const uint8_t *source, size_t size, const pm
         .current = { .type = PM_TOKEN_EOF, .start = source, .end = source },
         .next_start = NULL,
         .heredoc_end = NULL,
-        .data_loc = { .start = NULL, .end = NULL },
+        .data_loc = { 0 },
         .comment_list = { 0 },
         .magic_comment_list = { 0 },
         .warning_list = { 0 },

templates/src/serialize.c.erb

@@ -232,11 +232,11 @@ pm_serialize_magic_comment_list(pm_list_t *list, pm_buffer_t *buffer) {
 
 static void
 pm_serialize_data_loc(const pm_parser_t *parser, pm_buffer_t *buffer) {
-    if (parser->data_loc.end == NULL) {
+    if (parser->data_loc.length == 0) {
         pm_buffer_append_byte(buffer, 0);
     } else {
         pm_buffer_append_byte(buffer, 1);
-        pm_serialize_location(parser, &parser->data_loc, buffer);
+        pm_serialize_slice(&parser->data_loc, buffer);
     }
 }