add tertiary expressions

diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index b4cbbec4ad56ca133303ec304ccde90d45a5e9c2..17c47a16d60fe6ec023bf7cd8099601e424fe1ec 100644 (file)
--- 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 {: