Fix bug where macro names can be treated as numeric symbols (gbdev#1653)

Rangi42 · Feb 8, 2025 · 177a3ab · 177a3ab
1 parent 4c916b8
commit 177a3ab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/src/asm/rpn.cpp b/src/asm/rpn.cpp
@@ -75,6 +75,9 @@ void Expression::makeSymbol(std::string const &symName) {
 	if (Symbol *sym = sym_FindScopedSymbol(symName); sym_IsPC(sym) && !sect_GetSymbolSection()) {
 		error("PC has no value outside of a section\n");
 		data = 0;
+	} else if (sym && !sym->isNumeric() && !sym->isLabel()) {
+		error("'%s' is not a numeric symbol\n", symName.c_str());
+		data = 0;
 	} else if (!sym || !sym->isConstant()) {
 		isSymbol = true;
 

diff --git a/test/asm/non-numeric-symbol.asm b/test/asm/non-numeric-symbol.asm
@@ -0,0 +1,11 @@
+MACRO mac
+ENDM
+
+DEF n EQU mac
+DEF v = 2 + mac
+DEF k RB mac * 2
+
+SECTION "test", ROM0
+db mac
+dw 2 + mac
+dl mac * 2
diff --git a/test/asm/non-numeric-symbol.err b/test/asm/non-numeric-symbol.err
@@ -0,0 +1,13 @@
+error: non-numeric-symbol.asm(4):
+    'mac' is not a numeric symbol
+error: non-numeric-symbol.asm(5):
+    'mac' is not a numeric symbol
+error: non-numeric-symbol.asm(6):
+    'mac' is not a numeric symbol
+error: non-numeric-symbol.asm(9):
+    'mac' is not a numeric symbol
+error: non-numeric-symbol.asm(10):
+    'mac' is not a numeric symbol
+error: non-numeric-symbol.asm(11):
+    'mac' is not a numeric symbol
+error: Assembly aborted (6 errors)!