diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 07:11:04 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 07:11:04 +0000 |
commit | e102f56340d50a2459312df876eb3010cc4b92ef (patch) | |
tree | 1c0bf7ed7a339acebc3a79fb19ac7e79b9a12cc5 /lex.c.blt | |
parent | 88efadca4aea13b6c5f3cd4b39c932004d4a23e2 (diff) |
merge revision(s) 54131: [Backport #8851]
* defs/keywords (alias, undef): symbol literals are allowed.
* parse.y (parse_percent): should parse symbol literals for alias
and undef. [ruby-dev:47681] [Bug #8851]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lex.c.blt')
-rw-r--r-- | lex.c.blt | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -156,7 +156,7 @@ rb_reserved_word (str, len) #line 30 "defs/keywords" {"for", {keyword_for, keyword_for}, EXPR_VALUE}, #line 46 "defs/keywords" - {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME}, + {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM}, #line 37 "defs/keywords" {"or", {keyword_or, keyword_or}, EXPR_VALUE}, #line 32 "defs/keywords" @@ -188,7 +188,7 @@ rb_reserved_word (str, len) #line 15 "defs/keywords" {"END", {keyword_END, keyword_END}, EXPR_END}, #line 16 "defs/keywords" - {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME}, + {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM}, #line 14 "defs/keywords" {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END}, #line 23 "defs/keywords" |