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

Avoid use of goto in shiftChar

Browse Source
This commit is contained in:
Rangi42
2025-02-27 14:07:55 -05:00
parent d8192560b0
commit 2cdbb145da
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/asm/lexer.cpp
View File

@@ -862,22 +862,24 @@ static void shiftChar() {
lexerState->macroArgScanDistance--;
restart:
if (!lexerState->expansions.empty()) {
// Advance within the current expansion
if (Expansion &exp = lexerState->expansions.front(); exp.advance()) {
// When advancing would go past an expansion's end,
// move up to its parent and try again to advance
lexerState->expansions.pop_front();
goto restart;
}
} else {
// Advance within the file contents
if (lexerState->content.holds<ViewedContent>()) {
lexerState->content.get<ViewedContent>().offset++;
for (;;) {
if (!lexerState->expansions.empty()) {
// Advance within the current expansion
if (Expansion &exp = lexerState->expansions.front(); exp.advance()) {
// When advancing would go past an expansion's end,
// move up to its parent and try again to advance
lexerState->expansions.pop_front();
continue;
}
} else {
lexerState->content.get<BufferedContent>().advance();
// Advance within the file contents
if (lexerState->content.holds<ViewedContent>()) {
lexerState->content.get<ViewedContent>().offset++;
} else {
lexerState->content.get<BufferedContent>().advance();
}
}
return;
}
}
@@ -2114,7 +2116,7 @@ append:
}
}
finish:
finish: // Can't `break` out of a nested `for`-`switch`
// Trim right whitespace
auto rightPos = std::find_if_not(str.rbegin(), str.rend(), isWhitespace);
str.resize(rightPos.base() - str.begin());