diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 17:12:34 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 17:12:34 +0000 |
| commit | b7c90baf074156456e2ba5216c492e8b79b8bc3c (patch) | |
| tree | 29c046d3658f2121deca2d222c116bfffdc3082c /defs | |
| parent | 9dc33b83bb866e0bc0c4d67e32040b31d26e0738 (diff) | |
merge revision(s) 53753,54131: [Backport #8851]
lex.c.blt: update
* lex.c.blt: follows r52429, not removing casts to int.
* 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_3@54642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/keywords | 4 | ||||
| -rw-r--r-- | defs/lex.c.src | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/defs/keywords b/defs/keywords index 20044a420c..e0d931cd1f 100644 --- a/defs/keywords +++ b/defs/keywords @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE diff --git a/defs/lex.c.src b/defs/lex.c.src index 20044a420c..e0d931cd1f 100644 --- a/defs/lex.c.src +++ b/defs/lex.c.src @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE |