Unify error message when read method field

vshaxe · Jun 18, 2024 · ece6460 · ece6460
1 parent efd35a5
commit ece6460
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/hld/Eval.hx b/hld/Eval.hx
@@ -1331,7 +1331,9 @@ class Eval {
 				return ptr == null ? AUndef(f.t) : AAddr(ptr.offset(offset), f.t);
 			}
 			var f = p.methods.get(name);
-			if( f != null && ptr != null ) {
+			if( f != null ) {
+				if( ptr == null )
+					return AUndef(f.t);
 				// HMethod
 				var vt = readPointer(ptr);
 				var vobj = readPointer(vt.offset(align.ptr));
@@ -1340,7 +1342,11 @@ class Eval {
 				return AMethod(v, readPointer(vmethods.offset(f.index * align.ptr)), f.t);
 			}
 			var f = p.methods.get("get_"+name);
-			if( f != null && ptr != null && allowEvalGetters ) {
+			if( f != null ) {
+				if( ptr == null )
+					return AUndef(f.t);
+				if( !allowEvalGetters )
+					throw "Eval not allowed get_" + name + "()";
 				var f = readFieldAddress(v, "get_"+name);
 				switch( f ) {
 				case AMethod(obj, ptr, HFun(ft)) if( ft.args.length == 1 ):