From f3e1ca6e0bf592a65b9f6b209e8cb56358ac987f Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Wed, 24 Nov 2010 11:29:30 +0100
Subject: [PATCH] no need for SEP now that types are wrapped

---
 CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g         | 6 +++---
 CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g   | 2 +-
 CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g          | 2 +-
 .../antlr3/src/cs2j/bin/Debug/templates/java.stg            | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g
index d29bf0b..ee93c0f 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g
+++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g
@@ -495,7 +495,7 @@ unary_expression:
 	;
 cast_expression:
 	//'('   type   ')'   unary_expression ; 
-	'('   type   ')'   unary_expression -> ^(CAST_EXPR type SEP unary_expression);
+	'('   type   ')'   unary_expression -> ^(CAST_EXPR type unary_expression);
 assignment_operator:
 	'=' | '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>' '>=' ;
 pre_increment_expression: 
@@ -533,8 +533,8 @@ relational_expression:
 			| (i='is'  t=non_nullable_type -> ^(INSTANCEOF[$i.Token,"instanceof"] $relational_expression $t) 
                 | i1='as' t1=non_nullable_type -> ^(COND_EXPR[$i1.Token, "?:"] 
                                                         ^(INSTANCEOF[$i1.Token,"instanceof"] { (CommonTree)adaptor.DupTree($relational_expression.tree) } { (CommonTree)adaptor.DupTree($t1.tree) } ) 
-                                                        ^(CAST_EXPR[$i1.Token, "(cast)"] { (CommonTree)adaptor.DupTree($t1.tree) } SEP[$i1.Token, "SEP"] { (CommonTree)adaptor.DupTree($relational_expression.tree) }) 
-                                                        ^(CAST_EXPR[$i1.Token, "(cast)"] { (CommonTree)adaptor.DupTree($t1.tree) } SEP[$i1.Token, "SEP"] NULL[$i1.Token, "null"])))
+                                                        ^(CAST_EXPR[$i1.Token, "(cast)"] { (CommonTree)adaptor.DupTree($t1.tree) } { (CommonTree)adaptor.DupTree($relational_expression.tree) }) 
+                                                        ^(CAST_EXPR[$i1.Token, "(cast)"] { (CommonTree)adaptor.DupTree($t1.tree) } NULL[$i1.Token, "null"])))
 		)* ;
 equality_expression:
 	relational_expression
diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g
index 9f65886..f8deef4 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g
+++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/JavaPrettyPrint.g
@@ -403,7 +403,7 @@ unary_expression:
 	| addressof_expression 
 	;
 cast_expression:
-	'('   type   ')'   unary_expression ;
+	^(CAST_EXPR  type unary_expression ) -> cast_expr(type= { $type.st}, exp = { $unary_expression.st});
 assignment_operator:
 	'=' | '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>' '>=' ;
 pre_increment_expression: 
diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g
index 60abe50..3af1938 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g
+++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g
@@ -329,7 +329,7 @@ unary_expression:
 	//('(' arguments ')' ('[' | '.' | '(')) => primary_or_array_creation_expression	
 
     //(cast_expression) => cast_expression
-	^(CAST_EXPR type SEP unary_expression) 
+	^(CAST_EXPR type unary_expression) 
 	| primary_or_array_creation_expression
 	| '+'   unary_expression 
 	| '-'   unary_expression 
diff --git a/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg b/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
index 24a6c37..6a9666a 100644
--- a/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
+++ b/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
@@ -86,5 +86,9 @@ modifiers(mods) ::= "<if(mods)><mods; separator=\" \"> <endif>"
 extends(types) ::= "<if(types)>extends <types; separator=\",\"><endif>"
 imps(types) ::= "<if(types)>implements <types; separator=\",\"><endif>"
 
+// ******* EXPRESSIONS *******
+
+cast_expr(type, exp) ::= "(<type>)<exp>"
+
 // ******* UTILITY ***********
 string(payload) ::= "<payload>"
\ No newline at end of file