From c0cfaf00c06875a37961856104091c5040e3d2fb Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Mon, 28 Feb 2011 11:25:00 +0100 Subject: [PATCH] Avoid generating some unused dummyCatchVars --- .../antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g index 923292e..5aab3c3 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g @@ -978,8 +978,9 @@ method_declaration [CommonTree atts, CommonTree mods, List modList, Comm member_name type_parameter_constraints_clauses? type_parameter_list? formal_parameter_list? $b { exceptions }); method_body [bool smotherExceptions] returns [CommonTree exceptionList]: - b=block nb=magicSmotherExceptions[ dupTree($b.tree) ] el=magicThrowsException[true,$b.tree.Token] { if (!smotherExceptions) $exceptionList=$el.tree; } - -> {smotherExceptions}? $nb + {smotherExceptions}? b=block nb=magicSmotherExceptions[dupTree($b.tree) ] + -> $nb + | b=block el=magicThrowsException[true,$b.tree.Token] { $exceptionList=$el.tree; } -> $b ; member_name returns [string rawId]: @@ -1633,7 +1634,7 @@ magicIdxSetter[CommonTree atts, CommonTree localatts, CommonTree mods, CommonTre magicSmotherExceptions[CommonTree body]: - magicSmotherExceptionsThrow[body, "RuntimeException"] + magicSmotherExceptionsThrow[body, "RuntimeException"] ; magicSmotherExceptionsThrow[CommonTree body, string exception]: