Merge branch 'nested-switch-fix'

Perryvw · Perryvw · commit 8e858b08a2a7 · 2018-03-17T22:21:07.000+01:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -51,7 +51,7 @@ export class LuaTranspiler {
     checker: ts.TypeChecker;
     options: ts.CompilerOptions;
     genVarCounter: number;
-    transpilingSwitch: boolean;
+    transpilingSwitch: number;
     namespace: string[];
     importCount: number;
     isModule: boolean;
@@ -62,7 +62,7 @@ export class LuaTranspiler {
         this.checker = checker;
         this.options = options;
         this.genVarCounter = 0;
-        this.transpilingSwitch = false;
+        this.transpilingSwitch = 0;
         this.namespace = [];
         this.importCount = 0;
         this.sourceFile = sourceFile;
@@ -277,7 +277,7 @@ export class LuaTranspiler {
     }
 
     transpileBreak(): string {
-        if (this.transpilingSwitch) {
+        if (this.transpilingSwitch > 0) {
             return '';
         } else {
             return this.indent + "break\n";
@@ -410,11 +410,11 @@ export class LuaTranspiler {
             }
             this.pushIndent();
 
-            this.transpilingSwitch = true;
+            this.transpilingSwitch++;
             clause.statements.forEach(statement => {
                 result += this.transpileNode(statement);
             });
-            this.transpilingSwitch = false;
+            this.transpilingSwitch--;
 
             let i = index + 1;
             if (i < clauses.length && !tsEx.containsStatement(clause.statements, ts.SyntaxKind.BreakStatement)) {
diff --git a/test/integration/lua/conditionals.spec.ts b/test/integration/lua/conditionals.spec.ts
@@ -1,4 +1,4 @@
-import { Expect, Test, TestCase } from "alsatian";
+import { Expect, Test, TestCase, FocusTest } from "alsatian";
 import * as util from "../../src/util"
 
 export class LuaConditionalsTests {
@@ -208,5 +208,47 @@ export class LuaConditionalsTests {
         Expect(result).toBe(expected);
     }
 
+    @TestCase(0, 0)
+    @TestCase(1, 1)
+    @TestCase(2, 2)
+    @TestCase(3, -2)
+    @Test("nestedSwitch")
+    public nestedSwitch(inp: number, expected: number) {
+        // Transpile
+        let lua = util.transpileString(
+            `let result = -1;
 
+            switch (${inp}) {
+                case 0:
+                    result = 0;
+                    break;
+                case 1:
+                    switch(${inp}) {
+                        case 0:
+                            result = 0;
+                            break;
+                        case 1:
+                            result = 1;
+                            break;
+                        default:
+                            result = -3;
+                            break;
+                    }
+                    break;
+                case 2:
+                    result = 2;
+                    break;
+                default:
+                    result = -2;
+                    break;
+            }
+            return result;`
+        );
+
+        // Execute
+        let result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(expected);
+    }
 }
