Fixed for loops with expressions (#370)

tomblind · web-flow · commit 25eeb9d5bff0 · 2019-01-29T07:32:26.000-07:00
fixes #367
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -1144,9 +1144,13 @@ export class LuaTransformer {
         const result: tstl.Statement[] = [];
 
         if (statement.initializer) {
-            for (const variableDeclaration of (statement.initializer as ts.VariableDeclarationList).declarations) {
-                // local initializer = value
-                result.push(...this.transformVariableDeclaration(variableDeclaration));
+            if (ts.isVariableDeclarationList(statement.initializer)) {
+                for (const variableDeclaration of statement.initializer.declarations) {
+                    // local initializer = value
+                    result.push(...this.transformVariableDeclaration(variableDeclaration));
+                }
+            } else {
+                result.push(this.transformExpressionStatement(statement.initializer));
             }
         }
 
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -103,6 +103,22 @@ export class LuaLoopTests
         Expect(result).toBe(JSON.stringify(expected));
     }
 
+    @TestCase([0, 1, 2, 3], [1, 2, 3, 4])
+    @Test("for with expression")
+    public forWithExpression(inp: number[], expected: number[]): void
+    {
+        const result = util.transpileAndExecute(
+            `let arrTest = ${JSON.stringify(inp)};
+            let i: number;
+            for (i = 0 * 1; i < arrTest.length; ++i) {
+                arrTest[i] = arrTest[i] + 1;
+            }
+            return JSONStringify(arrTest);`
+        );
+        // Assert
+        Expect(result).toBe(JSON.stringify(expected));
+    }
+
     @TestCase([0, 1, 2, 3, 4], [0, 0, 2, 0, 4])
     @Test("for with continue")
     public forWithContinue(inp: number[], expected: number[]): void
