diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | parse.y | 14 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 21 |
3 files changed, 38 insertions, 5 deletions
@@ -1,10 +1,12 @@ -Wed Sep 21 13:38:44 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Sep 21 13:47:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (brace_body, do_body): preserve cmdarg_stack so that + `do` after cmdarg in a block should be `do_block` and bound to + the outer method. [ruby-core:72482] [Bug #11873] * 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. Tue Sep 20 23:02:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> @@ -3759,13 +3759,23 @@ brace_block : '{' ; brace_body : {$<vars>$ = dyna_push();} + {$<val>$ = cmdarg_stack >> 1; CMDARG_SET(0);} opt_block_param compstmt - {$$ = new_brace_body($2, $3); dyna_pop($<vars>1);} + { + $$ = new_brace_body($3, $4); + dyna_pop($<vars>1); + CMDARG_SET($<num>2); + } ; do_body : {$<vars>$ = dyna_push();} + {$<val>$ = cmdarg_stack >> 1; CMDARG_SET(0);} opt_block_param compstmt - {$$ = new_do_body($2, $3); dyna_pop($<vars>1);} + { + $$ = new_do_body($3, $4); + dyna_pop($<vars>1); + CMDARG_SET($<num>2); + } ; case_body : keyword_when args then diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 965ef3e577..fcec8c955c 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -840,6 +840,27 @@ eom assert_valid_syntax %q{a b(c(d)), :e do end}, bug11873 end + def test_block_after_cmdarg_in_paren + bug11873 = '[ruby-core:72482] [Bug #11873]' + def bug11873.p(*);end; + + assert_raise(LocalJumpError, bug11873) do + bug11873.instance_eval do + p p{p p;p(p)}, tap do + raise SyntaxError, "should not be passed to tap" + end + end + end + + assert_raise(LocalJumpError, bug11873) do + bug11873.instance_eval do + p p{p(p);p p}, tap do + raise SyntaxError, "should not be passed to tap" + end + end + end + end + private def not_label(x) @result = x; @not_label ||= nil end |