Update CustomClassHandler.hx

forgot to change this too...

hscript/Config.hx

@@ -21,9 +21,4 @@ class Config {
 	public static final DISALLOW_ABSTRACT_AND_ENUM = [
 
 	];
-
-	@:unreflective
-	public static final IMPORT_BLACKLIST:Array<String> = [
-		// "flixel.FlxG"
-	];
 }

hscript/Interp.hx

@@ -166,10 +166,10 @@ class Interp {
 	public var allowStaticVariables:Bool = false;
 	public var allowPublicVariables:Bool = false;
 
-	public var importBlocklist(get, never):Array<String>;
-	private inline function get_importBlocklist():Array<String> {
-		return Config.IMPORT_BLACKLIST;
-	}
+	// TODO: move this to an external class
+	public var importBlocklist:Array<String> = [
+		// "flixel.FlxG"
+	];
 
 	var usingHandler:UsingHandler;
 
@@ -643,7 +643,7 @@ class Interp {
 					case VPublic: getProperty(publicVariables.get(id), id, allowProperty);
 					case VStatic: getProperty(staticVariables.get(id), id, allowProperty);
 					case VScriptObject: isBypassAccessor ? UnsafeReflect.field(scriptObject, id) : UnsafeReflect.getProperty(scriptObject, id);
-					case VScriptObjectGetter: UnsafeReflect.callFieldUnsafe(scriptObject, 'get_$id', []);
+					case VScriptObjectGetter: UnsafeReflect.getProperty(scriptObject, 'get_$id')();
 					case VCustomClass: (cast scriptObject:IHScriptCustomAccessBehaviour).hget(id);
 					case VCustomClassBypass:
 						var obj:IHScriptCustomAccessBehaviour = cast scriptObject;
@@ -722,8 +722,7 @@ class Interp {
 					return UnsafeReflect.getProperty(scriptObject, id);
 				}
 			} else if (__instanceFields.contains('get_$id')) { // getter
-				    varLocationCache.set(id, VScriptObjectGetter);
-				    return UnsafeReflect.callFieldUnsafe(scriptObject, 'get_$id', []);
+				return UnsafeReflect.getProperty(scriptObject, 'get_$id')();
 			}
 		}
 		
@@ -818,6 +817,7 @@ class Interp {
 				
 				function importResolve(__clsName:String):Null<Dynamic> {
 					var _realClassName = getLocalImportRedirect(__clsName);
+					if(importBlocklist.contains(_realClassName)) return null;
 
 					var _cl = Type.resolveClass(_realClassName);
 					if(_cl == null) _cl = Type.resolveClass('${_realClassName}_HSC');
@@ -1134,7 +1134,7 @@ class Interp {
 						}
 						return fcall(obj, f, args);
 					default:
-					    return call(hasScriptObject ? scriptObject : null, expr(e), args);
+						return call(null, expr(e), args);
 				}
 			case EIf(econd, e1, e2):
 				return if (expr(econd) == true) expr(e1) else if (e2 == null) null else expr(e2);

hscript/Property.hx

@@ -135,7 +135,7 @@ class Property {
 				var fName:String = setterFunc;
 				if (!__allowWriteAccess && __allowSetGet) {
 					if (varExists(fName))
-						return callAccessor(fName, true, val);
+						return callAccessor(fName, val);
 					else
 						interp.error(ECustom('Method $fName required by property $name is missing'));
 				} else {
@@ -153,9 +153,10 @@ class Property {
 		return r = val;
 	}
 
-	private function callAccessor(f:String, isWrite:Bool = false, ?value:Dynamic):Dynamic {
+	private function callAccessor(f:String, ?value:Dynamic):Dynamic {
 		var fn = isStatic ? interp.staticVariables.get(f) : interp.variables.get(f);
 		var rt:Dynamic = null;
+		var isWrite:Bool = value != null;
 		if (fn != null && Reflect.isFunction(fn)) {
 			if (isWrite) __allowWriteAccess = true;
 			else __allowReadAccess = true;

hscript/macros/ClassExtendMacro.hx

@@ -483,9 +483,8 @@ class ClassExtendMacro {
 					if (__interp != null) {
 						if(__class__fields.contains(name)) {
 							var v:Dynamic = __interp.variables.get(name);
-							var ba:Bool = @:privateAccess __interp.isBypassAccessor;
 							if(v != null && v is hscript.Property) 
-								return cast(v, hscript.Property).get(ba);
+								return cast(v, hscript.Property).callGetter(name);
 							return v;
 						}
 						else @:privateAccess {
@@ -537,9 +536,8 @@ class ClassExtendMacro {
 					if (__interp != null) {
 						if(__class__fields.contains(name)) {
 							var v:Dynamic = __interp.variables.get(name);
-							var ba:Bool = @:privateAccess __interp.isBypassAccessor;
 							if(v != null && v is hscript.Property) 
-								return cast(v, hscript.Property).set(val, ba);
+								return cast(v, hscript.Property).callSetter(name, val);
 							__interp.variables.set(name, val);
 							return val;
 						}