Added additional test for fallthroughs & Removed inline assigning

lolleko · lolleko · commit b5c15825f3b5 · 2018-02-14T21:44:32.000+01:00
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -312,7 +312,8 @@ var LuaTranspiler = /** @class */ (function () {
         var expression = this.transpileExpression(node.expression, true);
         var clauses = node.caseBlock.clauses;
         var result = this.indent + "-------Switch statement start-------\n";
-        var jumpTableName = "____switch" + ++this.genVarCounter;
+        var jumpTableName = "____switch" + this.genVarCounter;
+        this.genVarCounter++;
         result += this.indent + ("local " + jumpTableName + " = {\n");
         this.pushIndent();
         // If statement to go to right entry label
@@ -337,7 +338,8 @@ var LuaTranspiler = /** @class */ (function () {
                 while (i < clauses.length
                     && ts.isCaseClause(nextClause)
                     && nextClause.statements.length === 0) {
-                    nextClause = clauses[++i];
+                    i++;
+                    nextClause = clauses[i];
                 }
                 if (i !== index && nextClause) {
                     if (ts.isCaseClause(nextClause)) {
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -347,7 +347,8 @@ export class LuaTranspiler {
 
         let result = this.indent + "-------Switch statement start-------\n";
 
-        let jumpTableName = "____switch" + ++this.genVarCounter
+        let jumpTableName = "____switch" + this.genVarCounter;
+        this.genVarCounter++;
 
         result += this.indent + `local ${jumpTableName} = {\n`;
 
@@ -378,7 +379,8 @@ export class LuaTranspiler {
                     && ts.isCaseClause(nextClause)
                     && nextClause.statements.length === 0
                 ) {
-                    nextClause = clauses[++i];
+                    i++;
+                    nextClause = clauses[i];
                 }
 
                 if (i !== index && nextClause) {
diff --git a/test/integration/lua/conditionals.spec.ts b/test/integration/lua/conditionals.spec.ts
@@ -173,7 +173,8 @@ export class LuaConditionalsTests {
     @TestCase(2, 4)
     @TestCase(3, 4)
     @TestCase(4, 4)
-    @TestCase(5, -2)
+    @TestCase(5, 15)
+    @TestCase(7, -2)
     @Test("switchfallthrough")
     public switchfallthrough(inp: number, expected: number) {
         /// Transpile
@@ -194,6 +195,11 @@ export class LuaConditionalsTests {
                     break;
                 case 5:
                     result = 5;
+                case 6:
+                    result += 10;
+                    break;
+                case 7:
+                    result = 7;
                 default:
                     result = -2;
                     break;
