diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 05:51:15 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 05:51:15 +0000 |
commit | 3df0e54b3b75e8e3625eae8ddb3934504153a9db (patch) | |
tree | ae533eef829846b89825d1cab0abad36bee17e0f /ChangeLog | |
parent | 22a97cbf830ff18042a8b59df8eaa03ab29bbc30 (diff) |
merge revision(s) 53834,53835,53836: [Backport #12073]
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().
* parse.y (parse_ident): allow keyword arguments just after a
method where the same name local variable is defined.
[ruby-core:73816] [Bug#12073]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Apr 22 14:48:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parse_ident): allow keyword arguments just after a + method where the same name local variable is defined. + [ruby-core:73816] [Bug#12073] + Fri Apr 22 14:34:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (setup_exception): set the cause only if it is explicitly |