From c420df319fee740f03565b939434fa15650d55bb Mon Sep 17 00:00:00 2001 From: Villezen Date: Thu, 12 Nov 2026 02:48:13 +0200 Subject: [PATCH] Fix arguments named name or v in extended classes --- hscript/macros/ClassExtendMacro.hx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hscript/macros/ClassExtendMacro.hx b/hscript/macros/ClassExtendMacro.hx index efbb55a1..cccc84e7 100644 --- a/hscript/macros/ClassExtendMacro.hx +++ b/hscript/macros/ClassExtendMacro.hx @@ -261,12 +261,12 @@ class ClassExtendMacro { if (returns) { overrideExpr = macro { - var name:String = $v{name}; + var __fieldName:String = $v{name}; - if (__interp != null && __class__fields.contains(name)) { - var v:Dynamic = null; - if (Reflect.isFunction(v = __interp.variables.get(name))) { - return v($a{arguments}); + if (__interp != null && __class__fields.contains(__fieldName)) { + var __function:Dynamic = null; + if (Reflect.isFunction(__function = __interp.variables.get(__fieldName))) { + return __function($a{arguments}); } } @@ -274,12 +274,12 @@ class ClassExtendMacro { }; } else { overrideExpr = macro { - var name:String = $v{name}; + var __fieldName:String = $v{name}; - if (__interp != null && __class__fields.contains(name)) { - var v:Dynamic = null; - if (Reflect.isFunction(v = __interp.variables.get(name))) { - v($a{arguments}); + if (__interp != null && __class__fields.contains(__fieldName)) { + var __function:Dynamic = null; + if (Reflect.isFunction(__function = __interp.variables.get(__fieldName))) { + __function($a{arguments}); return; } }