summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-19 06:38:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-19 06:38:31 +0000
commitc501345218dc5fb0fae90d56a0c6fd19d38df5bb (patch)
tree8196b0407f41f8e1c8046dc73cfea0b7999c4460 /parse.y
parent95de2b001247b5e8ccd89d5ba7225d42aafec1e5 (diff)
parse.y: allow parenthesed do-block in cmdarg
* parse.y (primary): flush cmdarg flags inside left-paren in a command argument, to allow parenthesed do-block as an argument without arguments parentheses. [ruby-core:61950] [Bug #9726] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y12
1 files changed, 9 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 5b90bd2909..726f89130b 100644
--- a/parse.y
+++ b/parse.y
@@ -2620,12 +2620,18 @@ primary : literal
$$ = dispatch1(paren, 0);
%*/
}
- | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} rparen
+ | tLPAREN_ARG
{
+ $<val>1 = cmdarg_stack;
+ cmdarg_stack = 0;
+ }
+ expr {lex_state = EXPR_ENDARG;} rparen
+ {
+ cmdarg_stack = $<val>1;
/*%%%*/
- $$ = $2;
+ $$ = $3;
/*%
- $$ = dispatch1(paren, $2);
+ $$ = dispatch1(paren, $3);
%*/
}
| tLPAREN compstmt ')'