Fix "using" classes calling their function on the wrong type

NotHyper-474 · NotHyper-474 · commit d05358a912a7 · 2025-10-10T16:10:24.000-03:00
diff --git a/polymod/hscript/_internal/PolymodInterpEx.hx b/polymod/hscript/_internal/PolymodInterpEx.hx
@@ -157,19 +157,19 @@ class PolymodInterpEx extends Interp
 
 		@:privateAccess
 		{
-			if (_proxy != null && _proxy._cachedUsingFunctions.exists(f))
+			if (func == null && _proxy != null && _proxy._cachedUsingFunctions.exists(f))
 			{
 				return _proxy._cachedUsingFunctions[f]([o].concat(args));
 			}
 		}
 
+		#if html5
 		// Workaround for an HTML5-specific issue.
 		// https://github.com/HaxeFoundation/haxe/issues/11298
 		if (func == null && f == "contains") {
 			func = get(o, "includes");
 		}
 
-		#if html5
 		// For web: remove is inlined so we have to use something else.
 		if (func == null && f == "remove")
 		{

Original file line number	Diff line number	Diff line change
`@@ -157,19 +157,19 @@ class PolymodInterpEx extends Interp`
`157`	`157`
`158`	`158`	`@:privateAccess`
`159`	`159`	`{`
`160`		`- if (_proxy != null && _proxy._cachedUsingFunctions.exists(f))`
	`160`	`+ if (func == null && _proxy != null && _proxy._cachedUsingFunctions.exists(f))`
`161`	`161`	`{`
`162`	`162`	`return _proxy._cachedUsingFunctions[f]([o].concat(args));`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
	`166`	`+ #if html5`
`166`	`167`	`// Workaround for an HTML5-specific issue.`
`167`	`168`	`// https://github.com/HaxeFoundation/haxe/issues/11298`
`168`	`169`	`if (func == null && f == "contains") {`
`169`	`170`	`func = get(o, "includes");`
`170`	`171`	`}`
`171`	`172`
`172`		`- #if html5`
`173`	`173`	`// For web: remove is inlined so we have to use something else.`
`174`	`174`	`if (func == null && f == "remove")`
`175`	`175`	`{`