Bugfix for missing for_iter expressions. Closes natural#14.

Troy Melhase · Troy Melhase · commit b9415cdaa9e0 · 2007-02-19T20:53:55.000Z
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -366,6 +366,7 @@ statement [block]
     |   {
         block.addComment("for-while")
         for_init, for_stat = block.newFor()
+        for_iter = None
         }
         #("for"
             #(FOR_INIT
@@ -376,7 +377,8 @@ statement [block]
         )
         {
         for_stat.setExpression(("%s", for_cond))
-        for_stat.addSource(("%s", for_iter))
+        if for_iter:
+            for_stat.addSource(("%s", for_iter))
         }
 
 
diff --git a/java2python/tests/Loops.java b/java2python/tests/Loops.java
@@ -0,0 +1,13 @@
+class Loops {
+    public static void main(String[] args) {
+	for(int a = 1; a < 10;){
+	    a+= 3;
+	    System.out.println(a);
+	}
+
+	for (int b = 0; b < 20; b+=2) {
+	}
+
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,7 @@ statement [block]`
`366`	`366`	`\| {`
`367`	`367`	`block.addComment("for-while")`
`368`	`368`	`for_init, for_stat = block.newFor()`
	`369`	`+ for_iter = None`
`369`	`370`	`}`
`370`	`371`	`#("for"`
`371`	`372`	`#(FOR_INIT`
`@@ -376,7 +377,8 @@ statement [block]`
`376`	`377`	`)`
`377`	`378`	`{`
`378`	`379`	`for_stat.setExpression(("%s", for_cond))`
`379`		`- for_stat.addSource(("%s", for_iter))`
	`380`	`+ if for_iter:`
	`381`	`+ for_stat.addSource(("%s", for_iter))`
`380`	`382`	`}`
`381`	`383`
`382`	`384`