Evaluate global before guessing current package

vshaxe · May 31, 2024 · 761439a · 761439a
1 parent 74fa9c6
commit 761439a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/hld/Eval.hx b/hld/Eval.hx
@@ -743,16 +743,20 @@ class Eval {
 			}
 		}
 
+		// global
+		var g = getGlobalAddress([name]);
+		if( g != ANone )
+			return g;
+
 		// global (current package)
 		if( tpack != null && tpack.length > 0 ) {
 			tpack.push(name);
 			var g = getGlobalAddress(tpack);
-			if( g != null )
+			if( g != ANone )
 				return g;
 		}
 
-		// global
-		return getGlobalAddress([name]);
+		return ANone;
 	}
 
 	function evalPath( path : Array<String> ) : Value {