Skip to content

[FIX] Add checks for returns in loop bodies #538

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
AbnormalPoof merged 1 commit into from
Oct 6, 2026
Merged

[FIX] Add checks for returns in loop bodies #538

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
6 changes: 5 additions & 1 deletion polymod/hscript/_internal/PolymodBaseClassMacro.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PolymodBaseClassMacro
/**
* A list of package name prefixes for which this macro should not be executed.
*/
public static final PACKAGE_FILTERS:Array<String> = ['polymod.', 'hxd.', 'hl.'];
public static final PACKAGE_FILTERS:Array<String> = ['polymod.', 'hl.'];

static function useBridge():Bool
{
Expand Down Expand Up @@ -230,6 +230,10 @@ class PolymodBaseClassMacro
findValidReturn(ret) ?? cases.filter((c) -> findValidReturn(c?.expr) != null)[0]?.expr;
case ETry(expr, catches):
findValidReturn(expr) ?? catches.filter((c) -> findValidReturn(c?.expr) != null)[0]?.expr;
case EFor(_, expr):
findValidReturn(expr);
case EWhile(_, e, _):
findValidReturn(e);
default:
null;
}
Expand Down
Loading