Fixes for exception statements. See natural#21.

Troy Melhase · Troy Melhase · commit 8e8abff69a61 · 2007-04-13T07:07:18.000Z
diff --git a/java2python/lib/sourcetypes.py b/java2python/lib/sourcetypes.py
@@ -349,7 +349,7 @@ def formatExpression(self, expr):
         elif isinstance(first, tuple) and isinstance(second, tuple):
             return (format(first), format(second))
         else:
-            raise NotImplementedError('Unhandled expression type.')
+            raise NotImplementedError('Unhandled expression type:  %s' % expr)
 
     def alternateName(self, name, key='renameAnyMap'):
         """ returns an alternate for given name
@@ -753,6 +753,7 @@ def isBadLabel(self):
             parent_names = [p.name for p in self.allParents]
             if 'while' not in parent_names and 'for' not in parent_names:
                 return True
+
     @property
     def isNoOp(self):
         """ True if instance does nothing
@@ -798,6 +799,6 @@ def writeTo(self, output, indent):
         if self.needsBlockIndicator:
             output.write(':')
         output.write('\n')
-        if (not lines) and name not in ('break', 'continue', ):
+        if (not lines) and name not in ('break', 'continue', 'raise'):
             self.addSource('pass')
         Source.writeTo(self, output, indent+1)
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -1,8 +1,8 @@
 /*
 Current:
 
-    This file is part of IbPy.  Redistributed under terms of original
-    license below.  Modifications Copyright (C) Troy Melhase
+    This file is part of java2python.  Redistributed under terms of
+    original license below.  Modifications Copyright (C) Troy Melhase
     <troy@gci.net>.
 
 Original:
@@ -444,7 +444,7 @@ statement [block]
     |   {
         raise_stat = block.newStatement("raise")
         }
-        #("throw" raise_exp = expression[block])
+        #("throw" raise_exp = expression[block, False])
         {
         raise_stat.setExpression(raise_exp)
         }
@@ -462,7 +462,7 @@ case_group [block, switch_expr]
         right = block.missingValue
         }
         #(CASE_GROUP
-            (#("case" 
+            (#("case"
                right = expression[other, False]) | "default")+
                statement_list[other]
         )
@@ -479,13 +479,15 @@ case_group [block, switch_expr]
 try_block [block]
     {
     try_stat = block.newStatement("try")
-    except_stat = block.newStatement("except")
+
     finally_stat = block.newStatement("finally")
     }
 
     :   #("try"
             statement_list[try_stat]
-            (handler[except_stat])*
+            ({except_stat = block.newStatement("except")}
+             handler[except_stat]
+            )*
             (#("finally" statement_list[finally_stat]))?
         )
     ;
diff --git a/java2python/tests/TryCatchTests.java b/java2python/tests/TryCatchTests.java
@@ -0,0 +1,44 @@
+class TryCatchTests {
+	// this works
+	public void tryCatchSimple() {
+		try {
+			System.out.println("try block");
+		} catch (Exception e) {
+			System.out.println("catch Exception block");
+		}
+	}
+	
+	// this collapse both catch blocks into a single except
+	public void tryCatchCompound() {
+		try {
+			System.out.println("try block");
+		} catch (RuntimeException re) {
+			System.out.println("catch RuntimeException block");
+		} catch (Exception e) {
+			System.out.println("catch Exception block");
+		}
+	}
+
+	// throwing generates broken python
+	public void tryCatchThrowSimple() {
+		try {
+			System.out.println("try block");
+		} catch (Exception e) {
+			System.out.println("catch Exception block");
+			throw e;
+		}
+	}
+	
+	// same problem with multiple catches
+	public void tryCatchThrowCompound() {
+		try {
+			System.out.println("try block");
+		} catch (RuntimeException re) {
+			System.out.println("catch RuntimeException block");
+			throw re;
+		} catch (Exception e) {
+			System.out.println("catch Exception block");
+			throw e;
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`/*`
`2`	`2`	`Current:`
`3`	`3`
`4`		`- This file is part of IbPy. Redistributed under terms of original`
`5`		`- license below. Modifications Copyright (C) Troy Melhase`
	`4`	`+ This file is part of java2python. Redistributed under terms of`
	`5`	`+ original license below. Modifications Copyright (C) Troy Melhase`
`6`	`6`	`<troy@gci.net>.`
`7`	`7`
`8`	`8`	`Original:`
`@@ -444,7 +444,7 @@ statement [block]`
`444`	`444`	`\| {`
`445`	`445`	`raise_stat = block.newStatement("raise")`
`446`	`446`	`}`
`447`		`- #("throw" raise_exp = expression[block])`
	`447`	`+ #("throw" raise_exp = expression[block, False])`
`448`	`448`	`{`
`449`	`449`	`raise_stat.setExpression(raise_exp)`
`450`	`450`	`}`
`@@ -462,7 +462,7 @@ case_group [block, switch_expr]`
`462`	`462`	`right = block.missingValue`
`463`	`463`	`}`
`464`	`464`	`#(CASE_GROUP`
`465`		`- (#("case"`
	`465`	`+ (#("case"`
`466`	`466`	`right = expression[other, False]) \| "default")+`
`467`	`467`	`statement_list[other]`
`468`	`468`	`)`
`@@ -479,13 +479,15 @@ case_group [block, switch_expr]`
`479`	`479`	`try_block [block]`
`480`	`480`	`{`
`481`	`481`	`try_stat = block.newStatement("try")`
`482`		`- except_stat = block.newStatement("except")`
	`482`	`+`
`483`	`483`	`finally_stat = block.newStatement("finally")`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`: #("try"`
`487`	`487`	`statement_list[try_stat]`
`488`		`- (handler[except_stat])*`
	`488`	`+ ({except_stat = block.newStatement("except")}`
	`489`	`+ handler[except_stat]`
	`490`	`+ )*`
`489`	`491`	`(#("finally" statement_list[finally_stat]))?`
`490`	`492`	`)`
`491`	`493`	`;`