Skip to content

Fix contextual function call transform cubic complexity #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 1 commit into from
Jul 19, 2019
Merged

Fix contextual function call transform cubic complexity #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3971,10 +3971,6 @@ export class LuaTransformer {
);
} else {
const parameters = this.transformArguments(node.arguments, signature);
let table = this.transformExpression(node.expression.expression);
if (tstl.isTableExpression(table)) {
table = tstl.createParenthesizedExpression(table);
}
const signatureDeclaration = signature && signature.getDeclaration();
if (
!signatureDeclaration ||
Expand All @@ -3983,6 +3979,11 @@ export class LuaTransformer {
// table:name()
return this.transformContextualCallExpression(node, parameters);
} else {
let table = this.transformExpression(node.expression.expression);
if (tstl.isTableExpression(table)) {
table = tstl.createParenthesizedExpression(table);
}

// table.name()
const callPath = tstl.createTableIndexExpression(
table,
Expand Down Expand Up @@ -4024,7 +4025,6 @@ export class LuaTransformer {
transformedArguments: tstl.Expression[]
): ExpressionVisitResult {
const left = ts.isCallExpression(node) ? node.expression : node.tag;
const leftHandSideExpression = this.transformExpression(left);
if (
ts.isPropertyAccessExpression(left) &&
!luaKeywords.has(left.name.text) &&
Expand Down Expand Up @@ -4064,7 +4064,8 @@ export class LuaTransformer {
} else if (ts.isIdentifier(left)) {
const context = this.isStrict ? tstl.createNilLiteral() : tstl.createIdentifier("_G");
transformedArguments.unshift(context);
return tstl.createCallExpression(leftHandSideExpression, transformedArguments, node);
const expression = this.transformExpression(left);
return tstl.createCallExpression(expression, transformedArguments, node);
} else {
throw TSTLErrors.UnsupportedKind("Left Hand Side Call Expression", left.kind, left);
}
Expand Down