diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 11:56:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 11:56:31 +0000 |
commit | 23352f62a72d4e1cab6c73db48133696eabfff01 (patch) | |
tree | 759ed645fb97be2a9e557e6fafa331fd498ba2ab /parse.y | |
parent | 9a8c6f6efe95f5989d1f42f9d3d4d6db839560b8 (diff) | |
download | ruby-23352f62a72d4e1cab6c73db48133696eabfff01.tar.gz |
parse.y: revert arg in r47649
* parse.y (arg): revert a part of r47649.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 16 |
1 files changed, 3 insertions, 13 deletions
@@ -2360,24 +2360,14 @@ arg : lhs '=' arg $$ = dispatch1(defined, $4); %*/ } - | arg '?' - { - $<val>$ = cond_stack; - cond_stack = 0; - COND_PUSH(1); - } - arg opt_nl ':' - { - cond_stack = $<val>3; - } - arg + | arg '?' arg opt_nl ':' arg { /*%%%*/ value_expr($1); - $$ = new_if($1, $4, $8); + $$ = new_if($1, $3, $6); fixpos($$, $1); /*% - $$ = dispatch3(ifop, $1, $4, $8); + $$ = dispatch3(ifop, $1, $3, $6); %*/ } | primary |