fix continue in for loops

bdkearns · bdkearns · commit 0c6ee8e1a9da · 2014-10-15T04:16:02.000-04:00
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -407,6 +407,10 @@ def acceptCatch(self, node, memo):
 
     def acceptContinue(self, node, memo):
         """ Accept and process a continue statement. """
+        parent = node.parents(lambda x: x.type in {tokens.FOR, tokens.FOR_EACH, tokens.DO, tokens.WHILE}).next()
+        if parent.type == tokens.FOR:
+            updateStat = self.factory.expr(parent=self)
+            updateStat.walk(parent.firstChildOfType(tokens.FOR_UPDATE), memo)
         contStat = self.factory.statement('continue', fs=FS.lsr, parent=self)
         if len(node.children):
             warn('Detected unhandled continue statement with label; generated code incorrect.')
diff --git a/test/Continue0.java b/test/Continue0.java
@@ -3,12 +3,12 @@ public static void main(String[] args) {
         int x = 0;
         while (x < 10) {
             System.out.println(x);
-            if (x==6) {
-                break ;
+            if (x == 6) {
+                break;
             } else {
-                x+=2;
-                continue ;
+                x += 2;
+                continue;
             }
-    }
+        }
     }
 }
diff --git a/test/Continue1.java b/test/Continue1.java
@@ -0,0 +1,13 @@
+class Continue1 {
+    public static void main(String[] args) {
+        int[] ints = {1, 2, 3, 4, 5, 6, 7};
+        for (int x : ints) {
+            if (x == 6) {
+                break;
+            } else if (x == 3) {
+                continue;
+            }
+            System.out.println(x);
+        }
+    }
+}
diff --git a/test/Continue2.java b/test/Continue2.java
@@ -0,0 +1,14 @@
+class Continue2 {
+    public static void main(String[] args) {
+        int x = 0;
+        do {
+            System.out.println(x);
+            if (x == 6) {
+                break;
+            } else {
+                x += 2;
+                continue;
+            }
+        } while (x < 10);
+    }
+}
diff --git a/test/ForLoop2.java b/test/ForLoop2.java
@@ -0,0 +1,9 @@
+class ForLoop2 {
+    public static void main(String[] args) {
+        for (int i = 0; i < 3; i++) {
+            if (i == 1)
+                continue;
+	    System.out.println(i);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ public static void main(String[] args) {`
`3`	`3`	`int x = 0;`
`4`	`4`	`while (x < 10) {`
`5`	`5`	`System.out.println(x);`
`6`		`- if (x==6) {`
`7`		`- break ;`
	`6`	`+ if (x == 6) {`
	`7`	`+ break;`
`8`	`8`	`} else {`
`9`		`- x+=2;`
`10`		`- continue ;`
	`9`	`+ x += 2;`
	`10`	`+ continue;`
`11`	`11`	`}`
`12`		`- }`
	`12`	`+ }`
`13`	`13`	`}`
`14`	`14`	`}`