summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-21 04:47:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-21 04:47:35 +0000
commitf4ac0d75d9ed9c8eec4196f4410d6e9dda464d0c (patch)
treeadc4c4d50e22aee104f5868c31e09f184f824a54 /parse.y
parentc924e2db9612bf3ca7aeb169075fdd80fbf545ca (diff)
parse.y: preserve cmdarg_stack
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y14
1 files changed, 12 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 1b6dcb9e37..7f28694217 100644
--- a/parse.y
+++ b/parse.y
@@ -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