From 62b3d4c721334108f89cd59407ffd910204e7868 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 28 May 2019 14:36:29 +0900 Subject: Skip following all digits after `@@` --- parse.y | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 8a8c2adc09..a218819997 100644 --- a/parse.y +++ b/parse.y @@ -8368,13 +8368,13 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state) return result; } else if (ISDIGIT(c)) { + const char *ptr = p->lex.pcur - 1; + size_t len = p->lex.pend - ptr; + int overflow; + unsigned long n = ruby_scan_digits(ptr, len, 10, &len, &overflow); + p->lex.pcur = ptr + len; + RUBY_SET_YYLLOC(loc); if (result == tIVAR) { - const char *ptr = p->lex.pcur - 1; - size_t len = p->lex.pend - ptr; - int overflow; - unsigned long n = ruby_scan_digits(ptr, len, 10, &len, &overflow); - p->lex.pcur = ptr + len; - RUBY_SET_YYLLOC(loc); if (IS_lex_state(EXPR_FNAME)) { compile_error(p, "`@%c' is not allowed as an instance variable name", c); } @@ -8389,8 +8389,6 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state) } } else { - RUBY_SET_YYLLOC(loc); - pushback(p, c); compile_error(p, "`@@%c' is not allowed as a class variable name", c); } parser_show_error_line(p, &loc); -- cgit v1.2.3