From f6a1ad41dbcea974fca88cf9d12628c739f4dc32 Mon Sep 17 00:00:00 2001 From: yui-knk Date: Tue, 12 Dec 2017 14:47:34 +0000 Subject: [PATCH] parse.y: Change the last location of none * parse.y: Change the last location of none to be equal to the first location of none. Sometimes none has length (`parser->tokp` does not match `lex_p` when none is generated). This leads to invalid code_ranges. e.g. The locations of the NODE_CALL (:sort) is fixed: ``` x.sort.join(" ") ``` * Before ``` NODE_CALL (line: 1, code_range: (1,0)-(1,7)) ``` * After ``` NODE_CALL (line: 1, code_range: (1,0)-(1,6)) ``` git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index 4231d5ded0..2eb1a0e1f8 100644 --- a/parse.y +++ b/parse.y @@ -59,11 +59,13 @@ (Current).last_loc = YYRHSLOC(Rhs, N).last_loc; \ } \ else \ - RUBY_SET_YYLLOC(Current); \ + RUBY_SET_YYLLOC_OF_NONE(Current); \ while (0) #define RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(Current) \ rb_parser_set_location_from_strterm_heredoc(parser, &lex_strterm->u.heredoc, &(Current)) +#define RUBY_SET_YYLLOC_OF_NONE(Current) \ + rb_parser_set_location_of_none(parser, &(Current)) #define RUBY_SET_YYLLOC(Current) \ rb_parser_set_location(parser, &(Current)) @@ -693,6 +695,7 @@ VALUE rb_parser_lex_state_name(enum lex_state_e state); void rb_parser_show_bitstack(struct parser_params *, stack_type, const char *, int); PRINTF_ARGS(void rb_parser_fatal(struct parser_params *parser, const char *fmt, ...), 2, 3); void rb_parser_set_location_from_strterm_heredoc(struct parser_params *parser, rb_strterm_heredoc_t *here, YYLTYPE *yylloc); +void rb_parser_set_location_of_none(struct parser_params *parser, YYLTYPE *yylloc); void rb_parser_set_location(struct parser_params *parser, YYLTYPE *yylloc); RUBY_SYMBOL_EXPORT_END @@ -9910,6 +9913,15 @@ rb_parser_set_location_from_strterm_heredoc(struct parser_params *parser, rb_str yylloc->last_loc.column = (int)(here->u3.lastidx); } +void +rb_parser_set_location_of_none(struct parser_params *parser, YYLTYPE *yylloc) +{ + yylloc->first_loc.lineno = ruby_sourceline; + yylloc->first_loc.column = (int)(parser->tokp - lex_pbeg); + yylloc->last_loc.lineno = ruby_sourceline; + yylloc->last_loc.column = (int)(parser->tokp - lex_pbeg); +} + void rb_parser_set_location(struct parser_params *parser, YYLTYPE *yylloc) {