better lookup of symbols while inside %namesp

totalspectrum · totalspectrum · commit 282988e71b24 · 2025-03-07T10:03:40.000-04:00
diff --git a/Test/Expect/bin_namesp.obj b/Test/Expect/bin_namesp.obj
diff --git a/Test/bin_namesp.spin2 b/Test/bin_namesp.spin2
@@ -0,0 +1,23 @@
+{Spin2_v50}
+CON pin_base = 40
+
+DAT
+	org
+a
+	jmp  #\foo.a
+	long 0
+b
+	long @@@a
+
+	%namesp foo
+a
+	jmp  #\a
+b
+	long $100 + pin_base
+	long @@@a
+	
+	%namesp
+c
+	long @@@foo.b
+	long $FFFF
+
diff --git a/expr.c b/expr.c
@@ -167,7 +167,8 @@ LookupSymbolInFunc(Function *func, const char *name)
         sym = LookupSymbolInTable(&func->localsyms, name);
     } else if (current->name_space) {
         sym = LookupSymbolInTable(current->name_space, name);
-    } else {
+    }
+    if (!sym) {
         sym = LookupSymbolInTable(&current->objsyms, name);
     }
     if (!sym) {
