Fixed JIT using table.unpack (#258)

lolleko · Perryvw · commit 3054adb90b42 · 2018-10-20T16:36:45.000+02:00
* Fixed JIT using table.unpack

sry

* Fixed test for JIT unpack

* Moved transpileDestructingAssignmentValue from 5.1 to 5.0
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1623,7 +1623,7 @@ export abstract class LuaTranspiler {
     }
 
     public transpileDestructingAssignmentValue(node: ts.Expression): string {
-        throw TSTLErrors.UnsupportedForTarget("Destructing statements", this.options.luaTarget, node);
+        return `unpack(${this.transpileExpression(node)})`;
     }
 
     public transpileVariableDeclaration(node: ts.VariableDeclaration): string {
diff --git a/src/targets/Transpiler.51.ts b/src/targets/Transpiler.51.ts
@@ -4,8 +4,5 @@ import { TSHelper as tsHelper } from "../TSHelper";
 import * as ts from "typescript";
 
 export class LuaTranspiler51 extends LuaTranspiler {
-    /** @override */
-    public transpileDestructingAssignmentValue(node: ts.Expression): string {
-        return `unpack(${this.transpileExpression(node)})`;
-    }
+
 }
diff --git a/src/targets/Transpiler.JIT.ts b/src/targets/Transpiler.JIT.ts
@@ -37,6 +37,6 @@ export class LuaTranspilerJIT extends LuaTranspiler52 {
 
     /** @override */
     public transpileDestructingAssignmentValue(node: ts.Expression): string {
-        return `table.unpack(${this.transpileExpression(node)})`;
+        return `unpack(${this.transpileExpression(node)})`;
     }
 }
diff --git a/test/unit/assignmentDestructuring.spec.ts b/test/unit/assignmentDestructuring.spec.ts
@@ -35,6 +35,6 @@ export class AssignmentDestructuringTests {
             this.assignmentDestruturingTs, {luaTarget: LuaTarget.LuaJIT, luaLibImport: "none"}
         );
         // Assert
-        Expect(lua).toBe(`local a,b=table.unpack(myFunc());`);
+        Expect(lua).toBe(`local a,b=unpack(myFunc());`);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1623,7 +1623,7 @@ export abstract class LuaTranspiler {`
`1623`	`1623`	`}`
`1624`	`1624`
`1625`	`1625`	`public transpileDestructingAssignmentValue(node: ts.Expression): string {`
`1626`		`- throw TSTLErrors.UnsupportedForTarget("Destructing statements", this.options.luaTarget, node);`
	`1626`	+ return `unpack(${this.transpileExpression(node)})`;
`1627`	`1627`	`}`
`1628`	`1628`
`1629`	`1629`	`public transpileVariableDeclaration(node: ts.VariableDeclaration): string {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +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`		`- /** @override */`
`8`		`- public transpileDestructingAssignmentValue(node: ts.Expression): string {`
`9`		- return `unpack(${this.transpileExpression(node)})`;
`10`		`- }`
	`7`	`+`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ export class LuaTranspilerJIT extends LuaTranspiler52 {`
`37`	`37`
`38`	`38`	`/** @override */`
`39`	`39`	`public transpileDestructingAssignmentValue(node: ts.Expression): string {`
`40`		- return `table.unpack(${this.transpileExpression(node)})`;
	`40`	+ return `unpack(${this.transpileExpression(node)})`;
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ export class AssignmentDestructuringTests {`
`35`	`35`	`this.assignmentDestruturingTs, {luaTarget: LuaTarget.LuaJIT, luaLibImport: "none"}`
`36`	`36`	`);`
`37`	`37`	`// Assert`
`38`		- Expect(lua).toBe(`local a,b=table.unpack(myFunc());`);
	`38`	+ Expect(lua).toBe(`local a,b=unpack(myFunc());`);
`39`	`39`	`}`
`40`	`40`	`}`