From 7e74699021d1fb7d77008941f5789b15ce21f8a0 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Wed, 16 Mar 2011 12:44:52 +0100
Subject: [PATCH] conditional expressions have full expressions (e.g.
 assignments) as arguments

---
 .../antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g
index 5a52d9a..01a0f23 100644
--- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g
+++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g
@@ -785,7 +785,7 @@ non_assignment_expression returns [int precedence]
 	//'non ASSIGNment'
 	(anonymous_function_signature   '=>')	=> lambda_expression
 	| (query_expression) => query_expression 
-	| ^(cop=COND_EXPR ce1=non_assignment_expression ce2=non_assignment_expression ce3=non_assignment_expression) { $precedence = precedence[$cop.token.Type]; } 
+	| ^(cop=COND_EXPR ce1=non_assignment_expression ce2=expression ce3=expression) { $precedence = precedence[$cop.token.Type]; } 
           -> cond( condexp = { $ce1.st }, thenexp = { $ce2.st }, elseexp = { $ce3.st },
                     condparens = { comparePrecedence($cop.token, $ce1.precedence) <= 0 }, 
                     thenparens = { comparePrecedence($cop.token, $ce2.precedence) <= 0 },