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 peeking at macro args to be like peeking at interpolations

Browse Source
This commit is contained in:
Rangi42
2025-07-20 11:21:44 -04:00
parent 68ffb01cac
commit 0eed237517
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/asm/lexer.cpp
View File

@@ -816,22 +816,12 @@ static int peek() {
return c;
}
// If character is a macro arg char, do macro arg expansion
shiftChar();
std::shared_ptr<std::string> str = readMacroArg();
// If the macro arg is invalid or an empty string, it cannot be expanded,
// so skip it and keep peeking.
if (!str || str->empty()) {
return peek(); // Tail recursion
}
if (std::shared_ptr<std::string> str = readMacroArg(); str) {
beginExpansion(str, std::nullopt);
// Assuming macro args can't be recursive (I'll be damned if a way
// is found...), then we mark the entire macro arg as scanned.
lexerState->macroArgScanDistance += str->length();
return str->front();
}
return peek(); // Tail recursion
} else if (c == '{' && !lexerState->disableInterpolation) {
// If character is an open brace, do symbol interpolation
shiftChar();