aboutsummaryrefslogtreecommitdiffstats
path: root/parse.y
diff options
context:
space:
mode:
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y16
1 files changed, 3 insertions, 13 deletions
diff --git a/parse.y b/parse.y
index 820ea66f1c..009dc420fa 100644
--- a/parse.y
+++ b/parse.y
@@ -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