aboutsummaryrefslogtreecommitdiffstats
path: root/prism
diff options
context:
space:
mode:
Diffstat (limited to 'prism')
-rw-r--r--prism/extension.c44
-rw-r--r--prism/parser.h6
-rw-r--r--prism/prism.c4
-rw-r--r--prism/templates/lib/prism/serialize.rb.erb15
-rw-r--r--prism/templates/src/serialize.c.erb14
5 files changed, 51 insertions, 32 deletions
diff --git a/prism/extension.c b/prism/extension.c
index 9ecd1e30da..3637cc1617 100644
--- a/prism/extension.c
+++ b/prism/extension.c
@@ -12,7 +12,6 @@ VALUE rb_cPrismLocation;
VALUE rb_cPrismComment;
VALUE rb_cPrismInlineComment;
VALUE rb_cPrismEmbDocComment;
-VALUE rb_cPrismDATAComment;
VALUE rb_cPrismMagicComment;
VALUE rb_cPrismParseError;
VALUE rb_cPrismParseWarning;
@@ -320,22 +319,7 @@ parser_comments(pm_parser_t *parser, VALUE source) {
LONG2FIX(comment->end - comment->start)
};
- VALUE type;
- switch (comment->type) {
- case PM_COMMENT_INLINE:
- type = rb_cPrismInlineComment;
- break;
- case PM_COMMENT_EMBDOC:
- type = rb_cPrismEmbDocComment;
- break;
- case PM_COMMENT___END__:
- type = rb_cPrismDATAComment;
- break;
- default:
- type = rb_cPrismInlineComment;
- break;
- }
-
+ VALUE type = (comment->type == PM_COMMENT_EMBDOC) ? rb_cPrismEmbDocComment : rb_cPrismInlineComment;
VALUE comment_argv[] = { rb_class_new_instance(3, location_argv, rb_cPrismLocation) };
rb_ary_push(comments, rb_class_new_instance(1, comment_argv, type));
}
@@ -375,6 +359,25 @@ parser_magic_comments(pm_parser_t *parser, VALUE source) {
}
/**
+ * Extract out the data location from the parser into a Location instance if one
+ * exists.
+ */
+static VALUE
+parser_data_loc(const pm_parser_t *parser, VALUE source) {
+ if (parser->data_loc.end == NULL) {
+ return Qnil;
+ } else {
+ VALUE argv[] = {
+ source,
+ LONG2FIX(parser->data_loc.start - parser->start),
+ LONG2FIX(parser->data_loc.end - parser->data_loc.start)
+ };
+
+ return rb_class_new_instance(3, argv, rb_cPrismLocation);
+ }
+}
+
+/**
* Extract the errors out of the parser into an array.
*/
static VALUE
@@ -531,6 +534,7 @@ parse_lex_input(pm_string_t *input, const pm_options_t *options, bool return_nod
value,
parser_comments(&parser, source),
parser_magic_comments(&parser, source),
+ parser_data_loc(&parser, source),
parser_errors(&parser, parse_lex_data.encoding, source),
parser_warnings(&parser, parse_lex_data.encoding, source),
source
@@ -538,7 +542,7 @@ parse_lex_input(pm_string_t *input, const pm_options_t *options, bool return_nod
pm_node_destroy(&parser, node);
pm_parser_free(&parser);
- return rb_class_new_instance(6, result_argv, rb_cPrismParseResult);
+ return rb_class_new_instance(7, result_argv, rb_cPrismParseResult);
}
/**
@@ -601,12 +605,13 @@ parse_input(pm_string_t *input, const pm_options_t *options) {
pm_ast_new(&parser, node, encoding),
parser_comments(&parser, source),
parser_magic_comments(&parser, source),
+ parser_data_loc(&parser, source),
parser_errors(&parser, encoding, source),
parser_warnings(&parser, encoding, source),
source
};
- VALUE result = rb_class_new_instance(6, result_argv, rb_cPrismParseResult);
+ VALUE result = rb_class_new_instance(7, result_argv, rb_cPrismParseResult);
pm_node_destroy(&parser, node);
pm_parser_free(&parser);
@@ -938,7 +943,6 @@ Init_prism(void) {
rb_cPrismComment = rb_define_class_under(rb_cPrism, "Comment", rb_cObject);
rb_cPrismInlineComment = rb_define_class_under(rb_cPrism, "InlineComment", rb_cPrismComment);
rb_cPrismEmbDocComment = rb_define_class_under(rb_cPrism, "EmbDocComment", rb_cPrismComment);
- rb_cPrismDATAComment = rb_define_class_under(rb_cPrism, "DATAComment", rb_cPrismComment);
rb_cPrismMagicComment = rb_define_class_under(rb_cPrism, "MagicComment", rb_cObject);
rb_cPrismParseError = rb_define_class_under(rb_cPrism, "ParseError", rb_cObject);
rb_cPrismParseWarning = rb_define_class_under(rb_cPrism, "ParseWarning", rb_cObject);
diff --git a/prism/parser.h b/prism/parser.h
index e3c93b4246..86442d2a22 100644
--- a/prism/parser.h
+++ b/prism/parser.h
@@ -361,8 +361,7 @@ typedef struct pm_context_node {
/** This is the type of a comment that we've found while parsing. */
typedef enum {
PM_COMMENT_INLINE,
- PM_COMMENT_EMBDOC,
- PM_COMMENT___END__
+ PM_COMMENT_EMBDOC
} pm_comment_type_t;
/**
@@ -571,6 +570,9 @@ struct pm_parser {
/** The list of magic comments that have been found while parsing. */
pm_list_t magic_comment_list;
+ /** The optional location of the __END__ keyword and its contents. */
+ pm_location_t data_loc;
+
/** The list of warnings that have been found while parsing. */
pm_list_t warning_list;
diff --git a/prism/prism.c b/prism/prism.c
index 1751857e1e..f1c0e07760 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -9248,8 +9248,8 @@ parser_lex(pm_parser_t *parser) {
parser->current.type = PM_TOKEN___END__;
parser_lex_callback(parser);
- pm_comment_t *comment = parser_comment(parser, PM_COMMENT___END__);
- pm_list_append(&parser->comment_list, (pm_list_node_t *) comment);
+ parser->data_loc.start = parser->current.start;
+ parser->data_loc.end = parser->current.end;
LEX(PM_TOKEN_EOF);
}
diff --git a/prism/templates/lib/prism/serialize.rb.erb b/prism/templates/lib/prism/serialize.rb.erb
index 058142682e..681b6117b4 100644
--- a/prism/templates/lib/prism/serialize.rb.erb
+++ b/prism/templates/lib/prism/serialize.rb.erb
@@ -95,9 +95,10 @@ module Prism
def load_metadata
comments = load_comments
magic_comments = load_varint.times.map { MagicComment.new(load_location, load_location) }
+ data_loc = load_optional_location
errors = load_varint.times.map { ParseError.new(load_embedded_string, load_location) }
warnings = load_varint.times.map { ParseWarning.new(load_embedded_string, load_location) }
- [comments, magic_comments, errors, warnings]
+ [comments, magic_comments, data_loc, errors, warnings]
end
def load_tokens
@@ -117,11 +118,11 @@ module Prism
tokens = load_tokens
encoding = load_encoding
load_start_line
- comments, magic_comments, errors, warnings = load_metadata
+ comments, magic_comments, data_loc, errors, warnings = load_metadata
tokens.each { |token,| token.value.force_encoding(encoding) }
raise "Expected to consume all bytes while deserializing" unless @io.eof?
- Prism::ParseResult.new(tokens, comments, magic_comments, errors, warnings, @source)
+ Prism::ParseResult.new(tokens, comments, magic_comments, data_loc, errors, warnings, @source)
end
def load_nodes
@@ -129,17 +130,17 @@ module Prism
load_encoding
load_start_line
- comments, magic_comments, errors, warnings = load_metadata
+ comments, magic_comments, data_loc, errors, warnings = load_metadata
@constant_pool_offset = io.read(4).unpack1("L")
@constant_pool = Array.new(load_varint, nil)
- [load_node, comments, magic_comments, errors, warnings]
+ [load_node, comments, magic_comments, data_loc, errors, warnings]
end
def load_result
- node, comments, magic_comments, errors, warnings = load_nodes
- Prism::ParseResult.new(node, comments, magic_comments, errors, warnings, @source)
+ node, comments, magic_comments, data_loc, errors, warnings = load_nodes
+ Prism::ParseResult.new(node, comments, magic_comments, data_loc, errors, warnings, @source)
end
private
diff --git a/prism/templates/src/serialize.c.erb b/prism/templates/src/serialize.c.erb
index db4c91e0cd..0ea70a3976 100644
--- a/prism/templates/src/serialize.c.erb
+++ b/prism/templates/src/serialize.c.erb
@@ -15,7 +15,7 @@ pm_sizet_to_u32(size_t value) {
}
static void
-pm_serialize_location(pm_parser_t *parser, pm_location_t *location, pm_buffer_t *buffer) {
+pm_serialize_location(const pm_parser_t *parser, const pm_location_t *location, pm_buffer_t *buffer) {
assert(location->start);
assert(location->end);
assert(location->start <= location->end);
@@ -171,6 +171,16 @@ pm_serialize_magic_comment_list(pm_parser_t *parser, pm_list_t *list, pm_buffer_
}
static void
+pm_serialize_data_loc(const pm_parser_t *parser, pm_buffer_t *buffer) {
+ if (parser->data_loc.end == NULL) {
+ pm_buffer_append_byte(buffer, 0);
+ } else {
+ pm_buffer_append_byte(buffer, 1);
+ pm_serialize_location(parser, &parser->data_loc, buffer);
+ }
+}
+
+static void
pm_serialize_diagnostic(pm_parser_t *parser, pm_diagnostic_t *diagnostic, pm_buffer_t *buffer) {
// serialize message
size_t message_length = strlen(diagnostic->message);
@@ -214,6 +224,7 @@ pm_serialize_content(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer)
pm_serialize_comment_list(parser, &parser->comment_list, buffer);
<%- end -%>
pm_serialize_magic_comment_list(parser, &parser->magic_comment_list, buffer);
+ pm_serialize_data_loc(parser, buffer);
pm_serialize_diagnostic_list(parser, &parser->error_list, buffer);
pm_serialize_diagnostic_list(parser, &parser->warning_list, buffer);
@@ -310,6 +321,7 @@ pm_serialize_lex(pm_buffer_t *buffer, const uint8_t *source, size_t size, const
pm_buffer_append_varint(buffer, parser.start_line);
pm_serialize_comment_list(&parser, &parser.comment_list, buffer);
pm_serialize_magic_comment_list(&parser, &parser.magic_comment_list, buffer);
+ pm_serialize_data_loc(&parser, buffer);
pm_serialize_diagnostic_list(&parser, &parser.error_list, buffer);
pm_serialize_diagnostic_list(&parser, &parser.warning_list, buffer);
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-04 05:33:33 +0000