diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 19:33:51 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 19:33:51 +0000 |
commit | 7fc0105f653157e11a4e8747dea65d0197097359 (patch) | |
tree | 1a7c85f7c0c872380071ec98e06f981984ac9d5c /parse.y | |
parent | 1c0abbf07692b21835f6c81f759b8d2d6b8963c2 (diff) |
merge revision(s) 40606,40607,40635: [Backport #8375]
test_scanner_events.rb: assert_location
* test/ripper/test_scanner_events.rb (TestRipper#assert_location):
rename so skipped in backtraces.
* parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid
name character. [ruby-core:54846] [Bug #8375].
* parse.y (parser_peek_variable_name): treat invalid global, class,
and instance variable names as mere strings rather than errors.
[ruby-core:54885] [Bug #8375]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 113 |
1 files changed, 79 insertions, 34 deletions
@@ -6137,6 +6137,70 @@ ripper_flush_string_content(struct parser_params *parser, rb_encoding *enc) #define flush_string_content(enc) ((void)(enc)) #endif +RUBY_FUNC_EXPORTED const unsigned int ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32]; +/* this can be shared with ripper, since it's independent from struct + * parser_params. */ +#ifndef RIPPER +#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0) +#define SPECIAL_PUNCT(idx) ( \ + BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \ + BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \ + BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \ + BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \ + BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \ + BIT('0', idx)) +const unsigned int ruby_global_name_punct_bits[] = { + SPECIAL_PUNCT(0), + SPECIAL_PUNCT(1), + SPECIAL_PUNCT(2), +}; +#undef BIT +#undef SPECIAL_PUNCT +#endif + +static inline int +is_global_name_punct(const char c) +{ + if (c <= 0x20 || 0x7e < c) return 0; + return (ruby_global_name_punct_bits[(c - 0x20) / 32] >> (c % 32)) & 1; +} + +static int +parser_peek_variable_name(struct parser_params *parser) +{ + int c; + const char *p = lex_p; + + if (p + 1 >= lex_pend) return 0; + c = *p++; + switch (c) { + case '$': + if ((c = *p) == '-') { + if (++p >= lex_pend) return 0; + c = *p; + } + else if (is_global_name_punct(c) || ISDIGIT(c)) { + return tSTRING_DVAR; + } + break; + case '@': + if ((c = *p) == '@') { + if (++p >= lex_pend) return 0; + c = *p; + } + break; + case '{': + lex_p = p; + command_start = TRUE; + return tSTRING_DBEG; + default: + return 0; + } + if (!ISASCII(c) || c == '_' || ISALPHA(c)) + return tSTRING_DVAR; + return 0; +} + static int parser_parse_string(struct parser_params *parser, NODE *quote) { @@ -6167,16 +6231,10 @@ parser_parse_string(struct parser_params *parser, NODE *quote) } newtok(); if ((func & STR_FUNC_EXPAND) && c == '#') { - switch (c = nextc()) { - case '$': - case '@': - pushback(c); - return tSTRING_DVAR; - case '{': - command_start = TRUE; - return tSTRING_DBEG; - } + int t = parser_peek_variable_name(parser); + if (t) return t; tokadd('#'); + c = nextc(); } pushback(c); if (tokadd_string(func, term, paren, "e->nd_nest, @@ -6383,16 +6441,10 @@ parser_here_document(struct parser_params *parser, NODE *here) /* int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/ newtok(); if (c == '#') { - switch (c = nextc()) { - case '$': - case '@': - pushback(c); - return tSTRING_DVAR; - case '{': - command_start = TRUE; - return tSTRING_DBEG; - } + int t = parser_peek_variable_name(parser); + if (t) return t; tokadd('#'); + c = nextc(); } do { pushback(c); @@ -7857,7 +7909,8 @@ parser_yylex(struct parser_params *parser) default: if (!parser_is_identchar()) { pushback(c); - return '$'; + compile_error(PARSER_ARG "`$%c' is not allowed as a global variable name", c); + return 0; } case '0': tokadd('$'); @@ -7872,7 +7925,8 @@ parser_yylex(struct parser_params *parser) tokadd('@'); c = nextc(); } - if (c != -1 && ISDIGIT(c)) { + if (c != -1 && (ISDIGIT(c) || !parser_is_identchar())) { + pushback(c); if (tokidx == 1) { compile_error(PARSER_ARG "`@%c' is not allowed as an instance variable name", c); } @@ -7881,10 +7935,6 @@ parser_yylex(struct parser_params *parser) } return 0; } - if (!parser_is_identchar()) { - pushback(c); - return '@'; - } break; case '_': @@ -9971,22 +10021,17 @@ is_special_global_name(const char *m, const char *e, rb_encoding *enc) int mb = 0; if (m >= e) return 0; - switch (*m) { - case '~': case '*': case '$': case '?': case '!': case '@': - case '/': case '\\': case ';': case ',': case '.': case '=': - case ':': case '<': case '>': case '\"': - case '&': case '`': case '\'': case '+': - case '0': + if (is_global_name_punct(*m)) { ++m; - break; - case '-': + } + else if (*m == '-') { ++m; if (m < e && is_identchar(m, e, enc)) { if (!ISASCII(*m)) mb = 1; m += rb_enc_mbclen(m, e, enc); } - break; - default: + } + else { if (!rb_enc_isdigit(*m, enc)) return 0; do { if (!ISASCII(*m)) mb = 1; |