Use existing superHasField function for the field cache

Author: NotHyper-474

polymod/hscript/_internal/PolymodAbstractScriptClass.hx

@@ -6,8 +6,6 @@ import haxe.ds.ObjectMap;
 @:access(polymod.hscript._internal.PolymodScriptClass)
 abstract PolymodAbstractScriptClass(PolymodScriptClass) from PolymodScriptClass
 {
-	static final fieldsCache:ObjectMap<Dynamic, Array<String>> = new ObjectMap();
-
 	private function resolveField(name:String):Dynamic
 	{
 		switch (name)
@@ -107,14 +105,13 @@ abstract PolymodAbstractScriptClass(PolymodScriptClass) from PolymodScriptClass
 					}
 				} else {
 					// Class object
-					try {
-						return getClassObjectField(this.superClass, name);
-					}
-					catch (e:String)
-					{
-						@:privateAccess this._interp.error(EInvalidAccess(name));
-						//throw "field '" + name + "' does not exist in script class '" + this.fullyQualifiedName + "' or super class '" + Type.getClassName(Type.getClass(this.superClass)) + "'";
+					if (this.superHasField(name) || this.superHasField('get_$name')) {
+						return Reflect.getProperty(this.superClass, name);
 					}
+
+					@:privateAccess this._interp.error(EInvalidAccess(name));
+					//throw "field '" + name + "' does not exist in script class '" + this.fullyQualifiedName + "' or super class '" + Type.getClassName(Type.getClass(this.superClass)) + "'";
+
 				}
 		}
 
@@ -179,7 +176,8 @@ abstract PolymodAbstractScriptClass(PolymodScriptClass) from PolymodScriptClass
 				}
 				else {
 					// Class object
-					if (setClassObjectField(this.superClass, name, value)) {
+					if (this.superHasField(name) || this.superHasField('set_$name')) {
+						Reflect.setProperty(this.superClass, name, value);
 						return value;
 					}
 
@@ -199,39 +197,4 @@ abstract PolymodAbstractScriptClass(PolymodScriptClass) from PolymodScriptClass
 			// throw "field '" + name + "' does not exist in script class '" + this.fullyQualifiedName + "' or super class '" + Type.getClassName(Type.getClass(this.superClass)) + "'";
 		}
 	}
-
-	private static function retrieveClassObjectFields(o:Dynamic):Array<String>
-	{
-		final superClassCls = Type.getClass(o);
-		if (superClassCls == null) throw "Provided object isn't a class";
-
-		var fields = fieldsCache.get(superClassCls);
-		if (fields == null)
-		{
-				fields = Type.getInstanceFields(superClassCls);
-				fieldsCache.set(superClassCls, fields);
-		}
-
-		return fields;
-	}
-
-	private static function getClassObjectField(o:Dynamic, field:String):Null<Dynamic>
-	{
-		var fields = retrieveClassObjectFields(o);
-		if (fields.contains(field) || fields.contains('get_$field'))
-			return Reflect.getProperty(o, field);
-
-		throw 'No such field $field';
-	}
-
-	private static function setClassObjectField(o:Dynamic, field:String, value:Dynamic):Bool
-	{
-		var fields = retrieveClassObjectFields(o);
-		if (fields.contains(field) || fields.contains('set_$field'))
-		{
-			Reflect.setProperty(o, field, value);
-			return true;
-		}
-		return false;
-	}
 }

polymod/hscript/_internal/PolymodScriptClass.hx

@@ -434,7 +434,9 @@ class PolymodScriptClass
 		// Reflect.hasField(this, name) is REALLY expensive so we use a cache.
 		if (__superClassFieldList == null)
 		{
-			__superClassFieldList = Reflect.fields(superClass).concat(Type.getInstanceFields(Type.getClass(superClass)));
+			var instanceFields = Type.getInstanceFields(Type.getClass(superClass));
+			__superClassFieldList = Reflect.fields(superClass);
+			__superClassFieldList = __superClassFieldList.concat(instanceFields.filter(f -> !__superClassFieldList.contains(f)));
 		}
 		return __superClassFieldList.indexOf(name) != -1;
 	}