diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-21 04:38:46 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-21 04:38:46 +0000 |
commit | c924e2db9612bf3ca7aeb169075fdd80fbf545ca (patch) | |
tree | 4bea4e0f74aba505748e88742c93a22d9ad67d93 | |
parent | b458aef0f0bbac4e8ab260e2388cf2bc480da5e9 (diff) | |
download | ruby-c924e2db9612bf3ca7aeb169075fdd80fbf545ca.tar.gz |
parse.y: do after cmdarg in paren
* parse.y: `do` after cmdarg in parentheses should be `do_block`
and bound to the outer method. [ruby-core:72482] [Bug #11873]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 8 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Sep 21 13:38:44 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y: `do` after cmdarg in parentheses should be `do_block` + and bound to the outer method. [ruby-core:72482] [Bug #11873] + Wed Sep 21 13:32:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (brace_body, do_body): extract block bodies. @@ -7911,7 +7911,7 @@ parse_ident(struct parser_params *parser, int c, int cmd_state) if (COND_P()) return keyword_do_cond; if (CMDARG_P() && !IS_lex_state_for(state, EXPR_CMDARG)) return keyword_do_block; - if (IS_lex_state_for(state, (EXPR_BEG | EXPR_ENDARG))) + if (IS_lex_state_for(state, (EXPR_BEG | EXPR_END | EXPR_ENDARG))) return keyword_do_block; return keyword_do; } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index c135cec4ea..965ef3e577 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -832,6 +832,14 @@ eom assert_valid_syntax("foo (bar rescue nil)") end + def test_cmdarg_in_paren + bug11873 = '[ruby-core:72482] [Bug #11873]' + assert_valid_syntax %q{a b{c d}, :e do end}, bug11873 + assert_valid_syntax %q{a b(c d), :e do end}, bug11873 + assert_valid_syntax %q{a b{c(d)}, :e do end}, bug11873 + assert_valid_syntax %q{a b(c(d)), :e do end}, bug11873 + end + private def not_label(x) @result = x; @not_label ||= nil end |