Skip to content

Commit

Permalink
[PRISM] Correctly hook up line numbers for eval
Browse files Browse the repository at this point in the history
  • Loading branch information
@kddnewton
kddnewton committed Feb 14, 2024
1 parent 1d3b306 commit 9933377
Show file tree
Hide file tree
Showing 16 changed files with 133 additions and 139 deletions.
11 changes: 8 additions & 3 deletions iseq.c
View file
Expand Up @@ -1002,8 +1002,10 @@ pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpa
if (!option) option = &COMPILE_OPTION_DEFAULT;

pm_location_t *location = &node->base.location;
pm_line_column_t start = pm_newline_list_line_column(&node->parser->newline_list, location->start);
pm_line_column_t end = pm_newline_list_line_column(&node->parser->newline_list, location->end);
int32_t start_line = node->parser->start_line;

pm_line_column_t start = pm_newline_list_line_column(&node->parser->newline_list, location->start, start_line);
pm_line_column_t end = pm_newline_list_line_column(&node->parser->newline_list, location->end, start_line);

rb_code_location_t code_location = (rb_code_location_t) {
.beg_pos = { .lineno = (int) start.line, .column = (int) start.column },
Expand Down Expand Up @@ -1232,8 +1234,9 @@ pm_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, V
StringValueCStr(file);

pm_parse_result_t result = { 0 };
VALUE error;
pm_options_line_set(&result.options, NUM2INT(line));

VALUE error;
if (RB_TYPE_P(src, T_FILE)) {
VALUE filepath = rb_io_path(src);
error = pm_parse_file(&result, filepath);
Expand Down Expand Up @@ -1635,6 +1638,8 @@ iseqw_s_compile_file_prism(int argc, VALUE *argv, VALUE self)
VALUE v = rb_vm_push_frame_fname(ec, file);

pm_parse_result_t result = { 0 };
result.options.line = 1;

VALUE error = pm_parse_file(&result, file);

if (error == Qnil) {
Expand Down
2 changes: 2 additions & 0 deletions load.c
View file
Expand Up @@ -745,6 +745,8 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname)

if (*rb_ruby_prism_ptr()) {
pm_parse_result_t result = { 0 };
result.options.line = 1;

VALUE error = pm_parse_file(&result, fname);

if (error == Qnil) {
Expand Down
66 changes: 35 additions & 31 deletions prism/prism.c
View file
Expand Up @@ -18115,7 +18115,7 @@ typedef struct {
pm_diagnostic_t *error;

/** The start line of the diagnostic message. */
uint32_t line;
int32_t line;

/** The column start of the diagnostic message. */
uint32_t column_start;
Expand Down Expand Up @@ -18147,12 +18147,13 @@ typedef struct {
#define PM_COLOR_RESET "\033[0m"

static inline pm_error_t *
pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_t *newline_list) {
pm_parser_errors_format_sort(const pm_parser_t *parser, const pm_list_t *error_list, const pm_newline_list_t *newline_list) {
pm_error_t *errors = calloc(error_list->size, sizeof(pm_error_t));
int32_t start_line = parser->start_line;

for (pm_diagnostic_t *error = (pm_diagnostic_t *) error_list->head; error != NULL; error = (pm_diagnostic_t *) error->node.next) {
pm_line_column_t start = pm_newline_list_line_column(newline_list, error->location.start);
pm_line_column_t end = pm_newline_list_line_column(newline_list, error->location.end);
pm_line_column_t start = pm_newline_list_line_column(newline_list, error->location.start, start_line);
pm_line_column_t end = pm_newline_list_line_column(newline_list, error->location.end, start_line);

// We're going to insert this error into the array in sorted order. We
// do this by finding the first error that has a line number greater
Expand All @@ -18163,8 +18164,8 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_
(index < error_list->size) &&
(errors[index].error != NULL) &&
(
(errors[index].line < ((uint32_t) start.line)) ||
(errors[index].line == ((uint32_t) start.line) && errors[index].column_start < ((uint32_t) start.column))
(errors[index].line < start.line) ||
((errors[index].line == start.line) && (errors[index].column_start < start.column))
)
) index++;

Expand All @@ -18177,18 +18178,18 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_
// Finally, we'll insert the error into the array.
uint32_t column_end;
if (start.line == end.line) {
column_end = (uint32_t) end.column;
column_end = end.column;
} else {
column_end = (uint32_t) (newline_list->offsets[start.line] - newline_list->offsets[start.line - 1] - 1);
column_end = (uint32_t) (newline_list->offsets[start.line - start_line + 1] - newline_list->offsets[start.line - start_line] - 1);
}

// Ensure we have at least one column of error.
if (((uint32_t) start.column) == column_end) column_end++;
if (start.column == column_end) column_end++;

errors[index] = (pm_error_t) {
.error = error,
.line = (uint32_t) start.line,
.column_start = (uint32_t) start.column,
.line = start.line,
.column_start = start.column,
.column_end = column_end
};
}
Expand All @@ -18197,17 +18198,19 @@ pm_parser_errors_format_sort(const pm_list_t *error_list, const pm_newline_list_
}

static inline void
pm_parser_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *newline_list, const char *number_prefix, size_t line, pm_buffer_t *buffer) {
const uint8_t *start = &parser->start[newline_list->offsets[line - 1]];
pm_parser_errors_format_line(const pm_parser_t *parser, const pm_newline_list_t *newline_list, const char *number_prefix, int32_t line, pm_buffer_t *buffer) {
size_t index = (size_t) (line - parser->start_line);

const uint8_t *start = &parser->start[newline_list->offsets[index]];
const uint8_t *end;

if (line >= newline_list->size) {
if (index >= newline_list->size - 1) {
end = parser->end;
} else {
end = &parser->start[newline_list->offsets[line]];
end = &parser->start[newline_list->offsets[index + 1]];
}

pm_buffer_append_format(buffer, number_prefix, (uint32_t) line);
pm_buffer_append_format(buffer, number_prefix, line);
pm_buffer_append_string(buffer, (const char *) start, (size_t) (end - start));

if (end == parser->end && end[-1] != '\n') {
Expand All @@ -18225,81 +18228,82 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col

// First, we're going to sort all of the errors by line number using an
// insertion sort into a newly allocated array.
const int32_t start_line = parser->start_line;
const pm_newline_list_t *newline_list = &parser->newline_list;
pm_error_t *errors = pm_parser_errors_format_sort(error_list, newline_list);
pm_error_t *errors = pm_parser_errors_format_sort(parser, error_list, newline_list);

// Now we're going to determine how we're going to format line numbers and
// blank lines based on the maximum number of digits in the line numbers
// that are going to be displayed.
pm_error_format_t error_format;
size_t max_line_number = errors[error_list->size - 1].line;
int32_t max_line_number = errors[error_list->size - 1].line - start_line;

if (max_line_number < 10) {
if (colorize) {
error_format = (pm_error_format_t) {
.number_prefix = PM_COLOR_GRAY "%1" PRIu32 " | " PM_COLOR_RESET,
.number_prefix = PM_COLOR_GRAY "%1" PRIi32 " | " PM_COLOR_RESET,
.blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET,
.divider = PM_COLOR_GRAY " ~~~~~" PM_COLOR_RESET "\n"
};
} else {
error_format = (pm_error_format_t) {
.number_prefix = "%1" PRIu32 " | ",
.number_prefix = "%1" PRIi32 " | ",
.blank_prefix = " | ",
.divider = " ~~~~~\n"
};
}
} else if (max_line_number < 100) {
if (colorize) {
error_format = (pm_error_format_t) {
.number_prefix = PM_COLOR_GRAY "%2" PRIu32 " | " PM_COLOR_RESET,
.number_prefix = PM_COLOR_GRAY "%2" PRIi32 " | " PM_COLOR_RESET,
.blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET,
.divider = PM_COLOR_GRAY " ~~~~~~" PM_COLOR_RESET "\n"
};
} else {
error_format = (pm_error_format_t) {
.number_prefix = "%2" PRIu32 " | ",
.number_prefix = "%2" PRIi32 " | ",
.blank_prefix = " | ",
.divider = " ~~~~~~\n"
};
}
} else if (max_line_number < 1000) {
if (colorize) {
error_format = (pm_error_format_t) {
.number_prefix = PM_COLOR_GRAY "%3" PRIu32 " | " PM_COLOR_RESET,
.number_prefix = PM_COLOR_GRAY "%3" PRIi32 " | " PM_COLOR_RESET,
.blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET,
.divider = PM_COLOR_GRAY " ~~~~~~~" PM_COLOR_RESET "\n"
};
} else {
error_format = (pm_error_format_t) {
.number_prefix = "%3" PRIu32 " | ",
.number_prefix = "%3" PRIi32 " | ",
.blank_prefix = " | ",
.divider = " ~~~~~~~\n"
};
}
} else if (max_line_number < 10000) {
if (colorize) {
error_format = (pm_error_format_t) {
.number_prefix = PM_COLOR_GRAY "%4" PRIu32 " | " PM_COLOR_RESET,
.number_prefix = PM_COLOR_GRAY "%4" PRIi32 " | " PM_COLOR_RESET,
.blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET,
.divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n"
};
} else {
error_format = (pm_error_format_t) {
.number_prefix = "%4" PRIu32 " | ",
.number_prefix = "%4" PRIi32 " | ",
.blank_prefix = " | ",
.divider = " ~~~~~~~~\n"
};
}
} else {
if (colorize) {
error_format = (pm_error_format_t) {
.number_prefix = PM_COLOR_GRAY "%5" PRIu32 " | " PM_COLOR_RESET,
.number_prefix = PM_COLOR_GRAY "%5" PRIi32 " | " PM_COLOR_RESET,
.blank_prefix = PM_COLOR_GRAY " | " PM_COLOR_RESET,
.divider = PM_COLOR_GRAY " ~~~~~~~~" PM_COLOR_RESET "\n"
};
} else {
error_format = (pm_error_format_t) {
.number_prefix = "%5" PRIu32 " | ",
.number_prefix = "%5" PRIi32 " | ",
.blank_prefix = " | ",
.divider = " ~~~~~~~~\n"
};
Expand All @@ -18314,7 +18318,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
// the source before the error to give some context. We'll be careful not to
// display the same line twice in case the errors are close enough in the
// source.
uint32_t last_line = 0;
int32_t last_line = 0;
const pm_encoding_t *encoding = parser->encoding;

for (size_t index = 0; index < error_list->size; index++) {
Expand Down Expand Up @@ -18360,7 +18364,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
pm_buffer_append_string(buffer, error_format.blank_prefix, error_format.blank_prefix_length);

size_t column = 0;
const uint8_t *start = &parser->start[newline_list->offsets[error->line - 1]];
const uint8_t *start = &parser->start[newline_list->offsets[error->line - start_line]];

while (column < error->column_end) {
if (column < error->column_start) {
Expand All @@ -18384,7 +18388,7 @@ pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool col
// Here we determine how many lines of padding to display after the
// error, depending on where the next error is in source.
last_line = error->line;
size_t next_line = (index == error_list->size - 1) ? newline_list->size : errors[index + 1].line;
int32_t next_line = (index == error_list->size - 1) ? ((int32_t) newline_list->size) : errors[index + 1].line;

if (next_line - last_line > 1) {
pm_buffer_append_string(buffer, " ", 2);
Expand Down
6 changes: 3 additions & 3 deletions prism/templates/src/prettyprint.c.erb
View file
Expand Up @@ -38,9 +38,9 @@ prettyprint_source(pm_buffer_t *output_buffer, const uint8_t *source, size_t len

static inline void
prettyprint_location(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm_location_t *location) {
pm_line_column_t start = pm_newline_list_line_column(&parser->newline_list, location->start);
pm_line_column_t end = pm_newline_list_line_column(&parser->newline_list, location->end);
pm_buffer_append_format(output_buffer, "(%lu,%lu)-(%lu,%lu)", (unsigned long) start.line, (unsigned long) start.column, (unsigned long) end.line, (unsigned long) end.column);
pm_line_column_t start = pm_newline_list_line_column(&parser->newline_list, location->start, parser->start_line);
pm_line_column_t end = pm_newline_list_line_column(&parser->newline_list, location->end, parser->start_line);
pm_buffer_append_format(output_buffer, "(%" PRIi32 ",%" PRIu32 ")-(%" PRIi32 ",%" PRIu32 ")", start.line, start.column, end.line, end.column);
}

static inline void
Expand Down
9 changes: 6 additions & 3 deletions prism/util/pm_newline_list.c
View file
Expand Up @@ -51,7 +51,7 @@ pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor) {
* are returned.
*/
pm_line_column_t
pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor) {
pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line) {
assert(cursor >= list->start);
size_t offset = (size_t) (cursor - list->start);

Expand All @@ -62,7 +62,7 @@ pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor
size_t mid = left + (right - left) / 2;

if (list->offsets[mid] == offset) {
return ((pm_line_column_t) { mid + 1, 0 });
return ((pm_line_column_t) { ((int32_t) mid) + start_line, 0 });
}

if (list->offsets[mid] < offset) {
Expand All @@ -72,7 +72,10 @@ pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor
}
}

return ((pm_line_column_t) { left, offset - list->offsets[left - 1] });
return ((pm_line_column_t) {
.line = ((int32_t) left) + start_line - 1,
.column = (uint32_t) (offset - list->offsets[left - 1])
});
}

/**
Expand Down
7 changes: 4 additions & 3 deletions prism/util/pm_newline_list.h
View file
Expand Up @@ -44,10 +44,10 @@ typedef struct {
*/
typedef struct {
/** The line number. */
size_t line;
int32_t line;

/** The column number. */
size_t column;
uint32_t column;
} pm_line_column_t;

/**
Expand Down Expand Up @@ -79,9 +79,10 @@ bool pm_newline_list_append(pm_newline_list_t *list, const uint8_t *cursor);
*
* @param list The list to search.
* @param cursor A pointer to the offset to search for.
* @param start_line The line to start counting from.
* @return The line and column of the given offset.
*/
pm_line_column_t pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor);
pm_line_column_t pm_newline_list_line_column(const pm_newline_list_t *list, const uint8_t *cursor, int32_t start_line);

/**
* Free the internal memory allocated for the newline list.
Expand Down

0 comments on commit 9933377

Please sign in to comment.