From e26385f591f03e46ba6d46e29adbcc015bbdf828 Mon Sep 17 00:00:00 2001
From: Jaime Humberto Macias Bustamante <jamextreme140@outlook.com>
Date: Mon, 5 May 2025 21:42:02 -0700
Subject: [PATCH] Fixed superClass calling + special operations

Fixed not being able to do "+=" on Custom Classes and getters and setters on constructor.

Also, fixed not being able to call functions from a CustomClass super class.
---
 hscript/Interp.hx                  | 61 +++++++++++++++++++++++++++---
 hscript/customclass/CustomClass.hx | 22 +++++++----
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/hscript/Interp.hx b/hscript/Interp.hx
index 3a4e97b..a149f50 100644
--- a/hscript/Interp.hx
+++ b/hscript/Interp.hx
@@ -432,8 +432,28 @@ class Interp {
 		var v;
 		switch (Tools.expr(e1)) {
 			case EIdent(id):
-				var l = locals.get(id);
 				v = fop(expr(e1), expr(e2));
+				// Make sure setting superclass/static fields directly works.
+				// Also ensures property functions are accounted for.
+				if(_inCustomClass) {
+					if (_proxy.__class.hasField(id)) {
+						_proxy.__class.hset(id, v);
+						return v;
+					}
+					else if (_proxy.superClass != null && _proxy.superHasField(id)) {
+						Reflect.setProperty(_proxy.superClass, id, v);
+						return v;
+					}
+					else if (_proxy.hasVar(id)) {
+						_proxy.hset(id, v);
+						return v;
+					}
+					else if ((_proxy.superClass == null && _proxy.__class.classDecl.extend != null)) {
+						_proxy.cacheSuperField(id, v);
+						return v;
+					}
+				}
+				var l = locals.get(id);
 				if (l == null) {
 					if(_hasScriptObject && !varExists(id)) {
 						var instanceHasField = __instanceFields.contains(id);
@@ -495,6 +515,33 @@ class Interp {
 			case EField(e, f, s):
 				var obj = expr(e);
 				if(s && obj == null) return null;
+
+				if(_inCustomClass) {
+					switch(Tools.expr(e)) {
+						case EIdent(_id):
+							if (_id == 'this') {
+								if (_proxy.hasField(f)) {
+									v = fop(get(obj, f), expr(e2));
+									_proxy.hset(f, v);
+									return v;
+								}
+								if (_proxy.superClass != null) {
+									if(_proxy.superHasField(f)) {
+										v = fop(get(obj, f), expr(e2));
+										Reflect.setProperty(_proxy.superClass, f, v);
+										return v;
+									}
+								}
+								else if(_proxy.superClass == null && _proxy.__class.classDecl.extend != null){
+									// Caches the declaration to set it once superClass is created
+									v = fop(get(obj, f), expr(e2));
+									_proxy.cacheSuperField(f, v);
+									return v;
+								}
+							}
+						default:
+					}
+				}
 				v = fop(get(obj, f), expr(e2));
 				v = set(obj, f, v);
 			case EArray(e, index):
@@ -699,16 +746,18 @@ class Interp {
 
 		// Custom Class
 		if (_inCustomClass) {
-			// We are calling a LOCAL function from the same module.
-			if (_proxy.__class.hasField(id)) {
-				// Static access
+			// Static access
+			if (_proxy.__class.hasField(id)) 
 				return _proxy.__class.hget(id);
-			}
+			
+			if (_proxy.hasVar(id)) 
+				return _proxy.hget(id);
+			// We are calling a LOCAL function from the same module.
 			if (_proxy.hasFunction(id)) {
 				_nextCallObject = _proxy;
 				return _proxy.resolveField(id);
 			}
-			else if (_proxy.superHasField(id)) {
+			if (_proxy.superHasField(id)) {
 				_nextCallObject = _proxy.superClass;
 				return Reflect.getProperty(_proxy.superClass, id);
 			} else {
diff --git a/hscript/customclass/CustomClass.hx b/hscript/customclass/CustomClass.hx
index f5c5d6e..58ce639 100644
--- a/hscript/customclass/CustomClass.hx
+++ b/hscript/customclass/CustomClass.hx
@@ -229,24 +229,32 @@ class CustomClass implements IHScriptCustomAccessBehaviour {
 				// Purge the function from the cache so it is not called again.
 				purgeFunction(name);
 			}
-		} else {
+		} 
+		else {
 			var fixedArgs = [];
-			var fixedName = '_HX_SUPER__${name}';
 			for (a in args) {
 				if ((a is CustomClass)) {
-					var customClass:CustomClass = cast(a, CustomClass).superClass;
+					var customClass:CustomClass = cast(a, CustomClass);
 					fixedArgs.push(customClass.superClass != null ? customClass.getSuperclass() : customClass);
 				} else {
 					fixedArgs.push(a);
 				}
 			}
-			var superFn = Reflect.field(superClass, fixedName);
-			if (superFn == null) {
+			var superFn:Function = null;
+			if(superClass is CustomClass) {
+				superFn = cast(superClass, CustomClass).hget(name);
+			}
+			else {
+				var fixedName = '_HX_SUPER__${name}';
+				superFn = Reflect.field(superClass, fixedName);
+			}
+			
+			if (superFn == null || !Reflect.isFunction(superFn)) {
 				this.interp.error(ECustom('Error while calling function super.${name}(): EInvalidAccess'
 					+ '\n'
 					+ 'InvalidAccess error: Super function "${name}" does not exist! Define it or call the correct superclass function.'));
 			}
-			r = Reflect.callMethod(superClass, superFn, fixedArgs);
+			r = Reflect.callMethod(superClass is CustomClass ? null : superClass, superFn, fixedArgs);
 		}
 		return r;
 	}
@@ -295,7 +303,7 @@ class CustomClass implements IHScriptCustomAccessBehaviour {
 		// Reflect.hasField(this, name) is REALLY expensive so we use a cache.
 		if (__superClassFieldList == null) {
 			var realFields = Reflect.fields(superClass).concat(Type.getInstanceFields(Type.getClass(superClass)));
-			__superClassFieldList.concat(realFields);
+			__superClassFieldList = realFields;
 		}
 
 		return __superClassFieldList.indexOf(name) != -1;