Merge pull request #124 from zengjie/master

Perryvw · web-flow · commit bbaf3aed9cc9 · 2018-06-25T17:31:49.000+02:00
Fixed continue implementation breaking versions before 5.2.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.js
 node_modules/
+yarn.lock
 
 coverage/
 .nyc*
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -194,7 +194,7 @@ export abstract class LuaTranspiler {
             case ts.SyntaxKind.ThrowStatement:
                 return this.transpileThrow(node as ts.ThrowStatement);
             case ts.SyntaxKind.ContinueStatement:
-                return this.transpileContinue();
+                return this.transpileContinue(node as ts.ContinueStatement);
             case ts.SyntaxKind.TypeAliasDeclaration:
             case ts.SyntaxKind.InterfaceDeclaration:
             case ts.SyntaxKind.EndOfFileToken:
@@ -316,8 +316,12 @@ export abstract class LuaTranspiler {
         }
     }
 
-    public transpileContinue(): string {
-        return this.indent + `goto __continue${this.loopStack[this.loopStack.length - 1]}\n`;
+    public transpileContinue(node: ts.ContinueStatement): string {
+        throw new TranspileError(
+            `Unsupported continue statement, ` +
+            `continue is not supported in Lua ${this.options.luaTarget}.`,
+            node
+        );
     }
 
     public transpileIf(node: ts.IfStatement): string {
@@ -352,7 +356,6 @@ export abstract class LuaTranspiler {
         result += this.transpileStatement(node.statement);
         this.popIndent();
         result += this.indent + "end\n";
-        result += this.indent + `::__continue${this.loopStack.pop()}::\n`;
         return result;
     }
 
diff --git a/src/targets/Transpiler.51.ts b/src/targets/Transpiler.51.ts
@@ -4,4 +4,5 @@ import { TSHelper as tsHelper } from "../TSHelper";
 import * as ts from "typescript";
 
 export class LuaTranspiler51 extends LuaTranspiler {
+
 }
diff --git a/src/targets/Transpiler.52.ts b/src/targets/Transpiler.52.ts
@@ -4,5 +4,25 @@ import { LuaTranspiler51 } from "./Transpiler.51";
 import * as ts from "typescript";
 
 export class LuaTranspiler52 extends LuaTranspiler51 {
+    public transpileLoopBody(
+        node: ts.WhileStatement
+            | ts.DoStatement
+            | ts.ForStatement
+            | ts.ForOfStatement
+            | ts.ForInStatement
+    ): string {
+        this.loopStack.push(this.genVarCounter);
+        this.genVarCounter++;
+        let result = this.indent + "do\n";
+        this.pushIndent();
+        result += this.transpileStatement(node.statement);
+        this.popIndent();
+        result += this.indent + "end\n";
+        result += this.indent + `::__continue${this.loopStack.pop()}::\n`;
+        return result;
+    }
 
+    public transpileContinue(node: ts.ContinueStatement): string {
+        return this.indent + `goto __continue${this.loopStack[this.loopStack.length - 1]}\n`;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@ import { TSHelper as tsHelper } from "../TSHelper";`
`4`	`4`	`import * as ts from "typescript";`
`5`	`5`
`6`	`6`	`export class LuaTranspiler51 extends LuaTranspiler {`
	`7`	`+`
`7`	`8`	`}`