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