Skip to content

Implemented try/catch and throw #334

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 2 commits into from
Jan 13, 2019
+43 −5
Merged

Implemented try/catch and throw #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e5ee9b
Implemented try/catch and throw
Perryvw Jan 12, 2019
e9060cf
PR adjustments
Perryvw Jan 13, 2019
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
48 changes: 43 additions & 5 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,12 +1350,50 @@ export class LuaTransformer {
return tstl.createBreakStatement(undefined, breakStatement);
}

public transformTryStatement(arg0: ts.TryStatement): StatementVisitResult {
throw new Error("Method not implemented.");
public transformTryStatement(statement: ts.TryStatement): StatementVisitResult {
const pCall = tstl.createIdentifier("pcall");
const tryBlock = this.transformBlock(statement.tryBlock);
const tryResult = tstl.createIdentifier("____TS_try");

const returnVariables = statement.catchClause && statement.catchClause.variableDeclaration
? [tryResult, this.transformIdentifier(statement.catchClause.variableDeclaration.name as ts.Identifier)]
: [tryResult];

const catchAssignment = tstl.createVariableDeclarationStatement(
returnVariables,
tstl.createCallExpression(pCall, [tstl.createFunctionExpression(tryBlock)])
);

const result: tstl.Statement[] = [catchAssignment];

if (statement.catchClause) {
const notTryResult = tstl.createUnaryExpression(tryResult, tstl.SyntaxKind.NotOperator);
result.push(tstl.createIfStatement(notTryResult, this.transformBlock(statement.catchClause.block)));
}

if (statement.finallyBlock) {
result.push(...this.transformBlock(statement.finallyBlock).statements);
}

return tstl.createDoStatement(
result,
undefined,
statement
);
}

public transformThrowStatement(arg0: ts.ThrowStatement): StatementVisitResult {
throw new Error("Method not implemented.");
public transformThrowStatement(statement: ts.ThrowStatement): StatementVisitResult {
const type = this.checker.getTypeAtLocation(statement.expression);
if (tsHelper.isStringType(type)) {
const error = tstl.createIdentifier("error");
return tstl.createExpressionStatement(
tstl.createCallExpression(error, [this.transformExpression(statement.expression)]),
undefined,
statement
);
} else {
throw TSTLErrors.InvalidThrowExpression(statement.expression);
}
}

public transformContinueStatement(statement: ts.ContinueStatement): StatementVisitResult {
Expand Down Expand Up @@ -2889,7 +2927,7 @@ export class LuaTransformer {
}

private createLocalOrGlobalDeclaration(
lhs: tstl.Identifier,
lhs: tstl.Identifier | tstl.Identifier[],
rhs: tstl.Expression,
parent?: tstl.Node,
tsOriginal?: ts.Node
Expand Down