From 80aa804a3372424e91bd4b01cffd4600b63bbd54 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 23 Sep 2017 06:49:35 +0000 Subject: parse.y: token type by identifer ID type * parse.y (parse_ident): leave identifier type decision (local or const) to rb_enc_symname_type, and set the token type by ID type. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 9eb1a9c833..d4462dd691 100644 --- a/parse.y +++ b/parse.y @@ -7842,7 +7842,7 @@ parse_ident(struct parser_params *parser, int c, int cmd_state) tokadd(c); } else { - result = ISUPPER(tok()[0]) ? tCONSTANT : tIDENTIFIER; + result = tCONSTANT; /* assume provisionally */ pushback(c); } tokfix(); @@ -7909,6 +7909,7 @@ parse_ident(struct parser_params *parser, int c, int cmd_state) } ident = tokenize_ident(parser, last_state); + if (result == tCONSTANT && is_local_id(ident)) result = tIDENTIFIER; if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) && (result == tIDENTIFIER) && /* not EXPR_FNAME, not attrasgn */ lvar_defined(ident)) { -- cgit v1.2.3