gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor macro args to be owned collectively by their fstack contexts

Browse Source
This commit is contained in:
Rangi42
2024-03-22 13:22:28 -04:00
committed by Sylvie
parent b85c5cde8f
commit 507439bc25
10 changed files with 78 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/asm/symbol.cpp
View File

@@ -43,11 +43,12 @@ void sym_ForEach(void (*callback)(Symbol &)) {
}
static int32_t Callback_NARG() {
if (!macro_HasCurrentArgs()) {
if (MacroArgs const *macroArgs = fstk_GetCurrentMacroArgs(); macroArgs) {
return macroArgs->nbArgs();
} else {
error("_NARG does not make sense outside of a macro\n");
return 0;
}
return macro_NbArgs();
}
static int32_t CallbackPC() {
@@ -147,7 +148,7 @@ Symbol *sym_FindScopedValidSymbol(std::string const &symName) {
return nullptr;
}
// `_NARG` has no value outside a macro
if (sym == _NARGSymbol && !macro_HasCurrentArgs()) {
if (sym == _NARGSymbol && !fstk_GetCurrentMacroArgs()) {
return nullptr;
}
return sym;