Changes and test case for issue natural#26.

Troy Melhase · Troy Melhase · commit 5bff7340ba37 · 2007-09-24T17:42:29.000Z
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -475,19 +475,35 @@ statement [block]
 case_group [block, switch_expr]
     :   {
         other = block.newStatement("elif")
-        right = block.missingValue
+        right = None
         }
         #(CASE_GROUP
             (#("case"
-               right = expression[other, False]) | "default")+
+               newright = expression[other, False]
+               {
+        if not right:
+            right = ("%s", newright)
+        else:
+            right = ("%s, %s", (right, newright))
+               }
+              ) | "default" { right = block.emptyAssign } )+
                statement_list[other]
         )
         {
-        if right is block.missingValue:
+        if right is block.emptyAssign:
             other.setName("else")
             other.setExpression(None)
+        elif right[0] == "%s":
+            other.setExpression(("%s == %s", (switch_expr, right)))
         else:
-            other.setExpression(("%s == %s", (switch_expr, ("%s", right))))
+            other.setExpression(("%s in (%s)", (switch_expr, right)))
+
+        /* if only one break statement in the elif block, delete it, then
+           a pass statement will be generated */
+        if len(other.lines) == 1 and \
+            hasattr(other.lines[0], "name") and \
+            other.lines[0].name == "break":
+            del other.lines[0]
         }
     ;
 
diff --git a/java2python/tests/Switches.java b/java2python/tests/Switches.java
@@ -0,0 +1,29 @@
+class Switches {
+    public static void main(String[] args) {
+	System.out.println( switches() );
+    }
+
+    public static int switches() {
+        int i;
+	i = 3;
+
+        switch (i) {
+            case 1:
+            case 2:
+                break;
+            case 3:
+                i = 2;
+            default:
+                return -4;
+        }
+
+        switch (i) {
+            case 3:
+            default:
+                i = 2;
+	}
+        return -1;
+    }
+
+}
+
