Skip to content

fix break and continue inside sync try/catch blocks #1727

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

Open
pilaoda wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix break and continue inside sync try/catch blocks #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7579194
(transformation): rewrite try-catch-finally implementation to correct…
pilaoda May 28, 2026
9670111
(test): handle non-Error thrown values in executeJs
pilaoda May 28, 2026
b843c09
(transformation): rename catchPcall to catchCall for consistency with…
pilaoda May 28, 2026
812abde
refactor: extract helper and clarify elseBranch logic in sync try-catch
pilaoda May 28, 2026
5f38c9a
(transformation):
pilaoda May 28, 2026
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
6 changes: 3 additions & 3 deletions src/transformation/utils/scope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export interface Scope {
loopContinued?: LoopContinued;
functionReturned?: boolean;
asyncTryHasReturn?: boolean;
asyncTryHasBreak?: boolean;
asyncTryHasContinue?: LoopContinued;
tryHasBreak?: boolean;
tryHasContinue?: LoopContinued;
}

export interface HoistingResult {
Expand Down Expand Up @@ -96,7 +96,7 @@ export function findAsyncTryScopeInStack(context: TransformationContext): Scope
}

/** Like findAsyncTryScopeInStack, but also stops at Loop boundaries. */
export function findAsyncTryScopeBeforeLoop(context: TransformationContext): Scope | undefined {
export function findTryScopeBeforeLoop(context: TransformationContext): Scope | undefined {
for (const scope of walkScopesUp(context)) {
if (scope.type === ScopeType.Function || scope.type === ScopeType.Loop) return undefined;
if (scope.type === ScopeType.Try || scope.type === ScopeType.Catch) return scope;
Expand Down
11 changes: 5 additions & 6 deletions src/transformation/visitors/break-continue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import * as ts from "typescript";
import { LuaTarget } from "../../CompilerOptions";
import * as lua from "../../LuaAST";
import { FunctionVisitor } from "../context";
import { findAsyncTryScopeBeforeLoop, findScope, LoopContinued, ScopeType } from "../utils/scope";
import { isInAsyncFunction } from "../utils/typescript";
import { findScope, findTryScopeBeforeLoop, LoopContinued, ScopeType } from "../utils/scope";

export const transformBreakStatement: FunctionVisitor<ts.BreakStatement> = (breakStatement, context) => {
const tryScope = isInAsyncFunction(breakStatement) ? findAsyncTryScopeBeforeLoop(context) : undefined;
const tryScope = findTryScopeBeforeLoop(context);
if (tryScope) {
tryScope.asyncTryHasBreak = true;
tryScope.tryHasBreak = true;
return [
lua.createAssignmentStatement(
lua.createIdentifier("____hasBroken"),
Expand Down Expand Up @@ -40,9 +39,9 @@ export const transformContinueStatement: FunctionVisitor<ts.ContinueStatement> =
scope.loopContinued = continuedWith;
}

const tryScope = isInAsyncFunction(statement) ? findAsyncTryScopeBeforeLoop(context) : undefined;
const tryScope = findTryScopeBeforeLoop(context);
if (tryScope) {
tryScope.asyncTryHasContinue = continuedWith;
tryScope.tryHasContinue = continuedWith;
return [
lua.createAssignmentStatement(
lua.createIdentifier("____hasContinued"),
Expand Down
Loading
Loading