gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +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

22
src/asm/lexer.cpp
View File

@@ -583,9 +583,10 @@ static std::shared_ptr<std::string> readMacroArg(char name) {
}
return str;
} else if (name == '#') {
auto str = macro_GetAllArgs();
MacroArgs *macroArgs = fstk_GetCurrentMacroArgs();
auto str = macroArgs ? macroArgs->getAllArgs() : nullptr;
if (!str) {
error("'\\#' cannot be used outside of a macro");
error("'\\#' cannot be used outside of a macro\n");
}
return str;
} else if (name == '<') {
@@ -595,7 +596,13 @@ static std::shared_ptr<std::string> readMacroArg(char name) {
return nullptr;
}
auto str = macro_GetArg(num);
MacroArgs *macroArgs = fstk_GetCurrentMacroArgs();
if (!macroArgs) {
error("'\\<%" PRIu32 ">' cannot be used outside of a macro\n", num);
return nullptr;
}
auto str = macroArgs->getArg(num);
if (!str) {
error("Macro argument '\\<%" PRIu32 ">' not defined\n", num);
}
@@ -605,7 +612,14 @@ static std::shared_ptr<std::string> readMacroArg(char name) {
return nullptr;
} else {
assert(name > '0' && name <= '9');
auto str = macro_GetArg(name - '0');
MacroArgs *macroArgs = fstk_GetCurrentMacroArgs();
if (!macroArgs) {
error("'\\%c' cannot be used outside of a macro\n", name);
return nullptr;
}
auto str = macroArgs->getArg(name - '0');
if (!str) {
error("Macro argument '\\%c' not defined\n", name);
}