Skip to content

Fix for repeat...until scoping #661

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 13, 2019
Merged

Fix for repeat...until scoping #661

Show file tree
Hide file tree
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
17 changes: 10 additions & 7 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,14 +2216,17 @@ export class LuaTransformer {
}

public transformDoStatement(statement: ts.DoStatement): StatementVisitResult {
return tstl.createRepeatStatement(
tstl.createBlock(this.transformLoopBody(statement)),
tstl.createUnaryExpression(
tstl.createParenthesizedExpression(this.transformExpression(statement.expression)),
const body = tstl.createDoStatement(this.transformLoopBody(statement));
let condition = this.transformExpression(statement.expression);
if (tstl.isUnaryExpression(condition) && condition.operator === tstl.SyntaxKind.NotOperator) {
condition = condition.operand;
} else {
condition = tstl.createUnaryExpression(
tstl.createParenthesizedExpression(condition),
tstl.SyntaxKind.NotOperator
),
statement
);
);
}
return tstl.createRepeatStatement(tstl.createBlock([body]), condition, statement);
}

public transformForStatement(statement: ts.ForStatement): StatementVisitResult {
Expand Down
4 changes: 3 additions & 1 deletion test/translation/__snapshots__/transformation.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ end"
exports[`Transformation (do) 1`] = `
"local e = 10
repeat
e = e - 1
do
e = e - 1
end
until not (e > 0)"
`;

Expand Down
36 changes: 36 additions & 0 deletions test/unit/loops.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,3 +981,39 @@ test.each([
).message
);
});

test("do...while", () => {
const code = `
let result = 0;
do {
++result;
} while (result < 2);
return result;
`;
expect(util.transpileAndExecute(code)).toBe(2);
});

test("do...while scoping", () => {
const code = `
let x = 0;
let result = 0;
do {
let x = 1;
++result;
} while (x === 0 && result < 2);
return result;
`;
expect(util.transpileAndExecute(code)).toBe(2);
});

test("do...while double-negation", () => {
const code = `
let result = 0;
do {
++result;
} while (!(result >= 2));
return result;
`;
expect(util.transpileString(code)).not.toMatch("not");
expect(util.transpileAndExecute(code)).toBe(2);
});