From 0bbff9d92ce8bd84ad9273c64965bdbf9747eff1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Aug 2015 11:56:31 +0000
Subject: 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
---
 parse.y | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'parse.y')

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
-- 
cgit v1.2.3