fixed issue where for loop variable would override local with same name (#413)

tomblind · Perryvw · commit 9400a6d4d56f · 2019-02-17T15:10:16.000+01:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -1568,7 +1568,7 @@ export class LuaTransformer {
         );
     }
 
-    public transformForStatement(statement: ts.ForStatement): tstl.Statement[] {
+    public transformForStatement(statement: ts.ForStatement): tstl.DoStatement {
         const result: tstl.Statement[] = [];
 
         if (statement.initializer) {
@@ -1596,7 +1596,7 @@ export class LuaTransformer {
         // while (condition) do ... end
         result.push(tstl.createWhileStatement(tstl.createBlock(body), condition));
 
-        return result;
+        return tstl.createDoStatement(result, statement);
     }
 
     public transformForOfInitializer(initializer: ts.ForInitializer, expression: tstl.Expression): tstl.Statement {
diff --git a/test/translation/lua/continue.lua b/test/translation/lua/continue.lua
@@ -1,10 +1,12 @@
-local i = 0;
-while i < 10 do
-    do
-        if i < 5 then
-            goto __continue1;
+do
+    local i = 0;
+    while i < 10 do
+        do
+            if i < 5 then
+                goto __continue1;
+            end
         end
+        ::__continue1::
+        i = i + 1;
     end
-    ::__continue1::
-    i = i + 1;
 end
diff --git a/test/translation/lua/continueConcurrent.lua b/test/translation/lua/continueConcurrent.lua
@@ -1,13 +1,15 @@
-local i = 0;
-while i < 10 do
-    do
-        if i < 5 then
-            goto __continue1;
-        end
-        if i == 7 then
-            goto __continue1;
+do
+    local i = 0;
+    while i < 10 do
+        do
+            if i < 5 then
+                goto __continue1;
+            end
+            if i == 7 then
+                goto __continue1;
+            end
         end
+        ::__continue1::
+        i = i + 1;
     end
-    ::__continue1::
-    i = i + 1;
 end
diff --git a/test/translation/lua/continueNested.lua b/test/translation/lua/continueNested.lua
@@ -1,20 +1,24 @@
-local i = 0;
-while i < 5 do
-    do
-        if (i % 2) == 0 then
-            goto __continue1;
-        end
-        local j = 0;
-        while j < 2 do
+do
+    local i = 0;
+    while i < 5 do
+        do
+            if (i % 2) == 0 then
+                goto __continue1;
+            end
             do
-                if j == 1 then
-                    goto __continue3;
+                local j = 0;
+                while j < 2 do
+                    do
+                        if j == 1 then
+                            goto __continue3;
+                        end
+                    end
+                    ::__continue3::
+                    j = j + 1;
                 end
             end
-            ::__continue3::
-            j = j + 1;
         end
+        ::__continue1::
+        i = i + 1;
     end
-    ::__continue1::
-    i = i + 1;
 end
diff --git a/test/translation/lua/continueNestedConcurrent.lua b/test/translation/lua/continueNestedConcurrent.lua
@@ -1,23 +1,27 @@
-local i = 0;
-while i < 5 do
-    do
-        if (i % 2) == 0 then
-            goto __continue1;
-        end
-        local j = 0;
-        while j < 2 do
+do
+    local i = 0;
+    while i < 5 do
+        do
+            if (i % 2) == 0 then
+                goto __continue1;
+            end
             do
-                if j == 1 then
-                    goto __continue3;
+                local j = 0;
+                while j < 2 do
+                    do
+                        if j == 1 then
+                            goto __continue3;
+                        end
+                    end
+                    ::__continue3::
+                    j = j + 1;
                 end
             end
-            ::__continue3::
-            j = j + 1;
-        end
-        if i == 4 then
-            goto __continue1;
+            if i == 4 then
+                goto __continue1;
+            end
         end
+        ::__continue1::
+        i = i + 1;
     end
-    ::__continue1::
-    i = i + 1;
 end
diff --git a/test/translation/lua/for.lua b/test/translation/lua/for.lua
@@ -1,7 +1,9 @@
-local i = 1;
-while i <= 100 do
-    do
+do
+    local i = 1;
+    while i <= 100 do
+        do
+        end
+        ::__continue1::
+        i = i + 1;
     end
-    ::__continue1::
-    i = i + 1;
 end
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -263,6 +263,15 @@ export class LuaLoopTests
         Expect(result).toBe(JSON.stringify(expected));
     }
 
+    @TestCase("for scope")
+    public forScope(): void {
+        const code =
+            `let i = 42;
+            for (let i = 0; i < 10; ++i) {}
+            return i;`;
+        Expect(util.transpileAndExecute(code)).toBe(42);
+    }
+
     @TestCase({ ["test1"]: 0, ["test2"]: 1, ["test3"]: 2 }, { ["test1"]: 1, ["test2"]: 2, ["test3"]: 3 })
     @Test("forin[Object]")
     public forinObject(inp: any, expected: any): void

Original file line number	Diff line number	Diff line change
`@@ -1568,7 +1568,7 @@ export class LuaTransformer {`
`1568`	`1568`	`);`
`1569`	`1569`	`}`
`1570`	`1570`
`1571`		`- public transformForStatement(statement: ts.ForStatement): tstl.Statement[] {`
	`1571`	`+ public transformForStatement(statement: ts.ForStatement): tstl.DoStatement {`
`1572`	`1572`	`const result: tstl.Statement[] = [];`
`1573`	`1573`
`1574`	`1574`	`if (statement.initializer) {`
`@@ -1596,7 +1596,7 @@ export class LuaTransformer {`
`1596`	`1596`	`// while (condition) do ... end`
`1597`	`1597`	`result.push(tstl.createWhileStatement(tstl.createBlock(body), condition));`
`1598`	`1598`
`1599`		`- return result;`
	`1599`	`+ return tstl.createDoStatement(result, statement);`
`1600`	`1600`	`}`
`1601`	`1601`
`1602`	`1602`	`public transformForOfInitializer(initializer: ts.ForInitializer, expression: tstl.Expression): tstl.Statement {`