Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Transpiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,14 @@ export abstract class LuaTranspiler {
return result;
}

// Implemented in 5.1 and overridden in 5.2 (and onwards)
public transpileVariableDestructuring(value: string): string {
throw new TranspileError(
`transpileVariableDestructuring must be implemented!`,
null
);
}

public transpileVariableDeclaration(node: ts.VariableDeclaration): string {
if (ts.isIdentifier(node.name)) {
// Find variable identifier
Expand All @@ -1298,20 +1306,20 @@ export abstract class LuaTranspiler {
}
} else if (ts.isArrayBindingPattern(node.name)) {
// Destructuring type
const value = this.transpileExpression(node.initializer);

// Disallow ellipsis destruction
if (node.name.elements.some(elem => !ts.isBindingElement(elem) || elem.dotDotDotToken !== undefined)) {
throw new TranspileError(`Ellipsis destruction is not allowed.`, node);
}

const vars = node.name.elements.map(e => this.transpileArrayBindingElement(e)).join(",");
const value = this.transpileExpression(node.initializer);

// Don't unpack TupleReturn decorated functions
if (tsHelper.isTupleReturnCall(node.initializer, this.checker)) {
return `local ${vars}=${value}\n`;
} else {
return `local ${vars}=table.unpack(${value})\n`;
return `local ${vars}=${this.transpileVariableDestructuring(value)}\n`;
}
} else {
throw new TranspileError(
Expand Down
5 changes: 4 additions & 1 deletion src/targets/Transpiler.51.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ import { TSHelper as tsHelper } from "../TSHelper";
import * as ts from "typescript";

export class LuaTranspiler51 extends LuaTranspiler {

/** @override */
public transpileVariableDestructuring(value: string): string {
return `unpack(${value})`;
}
}
5 changes: 5 additions & 0 deletions src/targets/Transpiler.52.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,9 @@ export class LuaTranspiler52 extends LuaTranspiler51 {
return `bit32.arshift(${lhs},${rhs})`;
}
}

/** @override */
public transpileVariableDestructuring(value: string): string {
return `table.unpack(${value})`;
}
}
1 change: 0 additions & 1 deletion test/translation/lua/assignmentDestructing.lua

This file was deleted.

3 changes: 0 additions & 3 deletions test/translation/ts/assignmentDestructing.ts

This file was deleted.

30 changes: 30 additions & 0 deletions test/unit/assignmentDestructuring.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Expect, Test, TestCase } from "alsatian";
import { LuaTarget } from "../../src/Transpiler";
import * as util from "../src/util";

export class AssignmentDestructuringTests {

private readonly assignmentDestruturingTs = `
declare function myFunc(): [number, string];
let [a, b] = myFunc();`;

@Test("Assignment destructuring [5.1]")
public assignmentDestructuring51() {
// Transpile
const lua = util.transpileString(
this.assignmentDestruturingTs, {luaTarget: LuaTarget.Lua51, luaLibImport: "none"}
);
// Assert
Expect(lua).toBe(`local a,b=unpack(myFunc())`);
}

@Test("Assignment destructuring [5.2]")
public tupleDestructing52() {
// Transpile
const lua = util.transpileString(
this.assignmentDestruturingTs, {luaTarget: LuaTarget.Lua52, luaLibImport: "none"}
);
// Assert
Expect(lua).toBe(`local a,b=table.unpack(myFunc())`);
}
}