From 04a570f4a560052f07ebadd2b8c70238687fe469 Mon Sep 17 00:00:00 2001 From: Hyper_ <40342021+NotHyper-474@users.noreply.github.com> Date: Tue, 6 Oct 2026 17:18:47 -0300 Subject: [PATCH] Add checks for returns in loop bodies Fixes issues with building the `hxd` package. --- polymod/hscript/_internal/PolymodBaseClassMacro.hx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/polymod/hscript/_internal/PolymodBaseClassMacro.hx b/polymod/hscript/_internal/PolymodBaseClassMacro.hx index 02eee9a4..249bca34 100644 --- a/polymod/hscript/_internal/PolymodBaseClassMacro.hx +++ b/polymod/hscript/_internal/PolymodBaseClassMacro.hx @@ -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 = ['polymod.', 'hxd.', 'hl.']; + public static final PACKAGE_FILTERS:Array = ['polymod.', 'hl.']; static function useBridge():Bool { @@ -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; }