From: bdemsky <bdemsky>
Date: Tue, 10 Feb 2009 19:19:42 +0000 (+0000)
Subject: add tertiary expressions
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0175544c7e2077837a19534a8ca5f2c516668d22;p=IRC.git

add tertiary expressions
---

diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index b4cbbec4..17c47a16 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -1844,8 +1844,14 @@ conditional_or_expression ::=
 conditional_expression ::=
 		conditional_or_expression:condor {: 
 			RESULT=condor; :}
-//	|	conditional_or_expression QUESTION expression 
-//			COLON conditional_expression
+	|	conditional_or_expression:condor QUESTION expression:exptrue
+			COLON conditional_expression:expfalse {: 
+			ParseNode pn=new ParseNode("tert");
+			pn.addChild("cond").addChild(condor);
+			pn.addChild("trueexpr").addChild(exptrue);
+			pn.addChild("falseexpr").addChild(expfalse);
+			RETULT=pn;
+			:}
 	;
 getoffset_expression ::=
         GETOFFSET LBRACE class_or_interface_type:type COMMA IDENTIFIER:id RBRACE {: