diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-15 06:06:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-15 06:06:31 +0000 |
commit | 2e0ebf4e080331773fcd1c5f2f37cdce74569e99 (patch) | |
tree | 96f5fddd094acd4a7a6bcb5ce4f5ef20060a4827 /parse.y | |
parent | e8df78c776d38c015c595fb61e71d483270a10d7 (diff) | |
download | ruby-2e0ebf4e080331773fcd1c5f2f37cdce74569e99.tar.gz |
parse.y: simplify local ID condition
* parse.y (tokenize_ident, parse_ident): ident in tokenize_ident()
can be a local id only when called from parse_ident(), but never
from parse_gvar() and parse_atmark().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -7792,16 +7792,14 @@ tokadd_ident(struct parser_params *parser, int c) return 0; } -static void +static ID tokenize_ident(struct parser_params *parser, const enum lex_state_e last_state) { ID ident = TOK_INTERN(); set_yylval_name(ident); - if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) && - is_local_id(ident) && lvar_defined(ident)) { - SET_LEX_STATE(EXPR_END); - } + + return ident; } static int @@ -7972,6 +7970,7 @@ parse_ident(struct parser_params *parser, int c, int cmd_state) int result = 0; int mb = ENC_CODERANGE_7BIT; const enum lex_state_e last_state = lex_state; + ID ident; do { if (!ISASCII(c)) mb = ENC_CODERANGE_UNKNOWN; @@ -8071,7 +8070,11 @@ parse_ident(struct parser_params *parser, int c, int cmd_state) SET_LEX_STATE(EXPR_END); } - tokenize_ident(parser, last_state); + ident = tokenize_ident(parser, last_state); + if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) && + lvar_defined(ident)) { + SET_LEX_STATE(EXPR_END); + } return result; } |