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 peek() some more

Browse Source
This commit is contained in:
Rangi42
2025-07-20 10:38:50 -04:00
parent 8d1b111692
commit 0681110647
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/asm/lexer.cpp
View File

@@ -599,6 +599,7 @@ static bool isMacroChar(char c) {
// forward declarations for readBracketedMacroArgNum // forward declarations for readBracketedMacroArgNum
static int peek(); static int peek();
static void shiftChar(); static void shiftChar();
static int nextChar();
static uint32_t readDecimalNumber(int initial); static uint32_t readDecimalNumber(int initial);
static uint32_t readBracketedMacroArgNum() { static uint32_t readBracketedMacroArgNum() {
@@ -682,7 +683,8 @@ static uint32_t readBracketedMacroArgNum() {
} }
} }
static std::shared_ptr<std::string> readMacroArg(char name) { static std::shared_ptr<std::string> readMacroArg() {
int name = nextChar();
if (name == '@') { if (name == '@') {
std::shared_ptr<std::string> str = fstk_GetUniqueIDStr(); std::shared_ptr<std::string> str = fstk_GetUniqueIDStr();
if (!str) { if (!str) {
@@ -814,15 +816,13 @@ static int peek() {
if (c == '\\' && !lexerState->disableMacroArgs) { if (c == '\\' && !lexerState->disableMacroArgs) {
// If character is a backslash, check for a macro arg // If character is a backslash, check for a macro arg
++lexerState->macroArgScanDistance; ++lexerState->macroArgScanDistance;
c = lexerState->peekCharAhead(); if (!isMacroChar(lexerState->peekCharAhead())) {
if (!isMacroChar(c)) { return c;
return '\\';
} }
shiftChar();
shiftChar(); shiftChar();
std::shared_ptr<std::string> str = readMacroArg(c); std::shared_ptr<std::string> str = readMacroArg();
// If the macro arg is invalid or an empty string, it cannot be expanded, // If the macro arg is invalid or an empty string, it cannot be expanded,
// so skip it and keep peeking. // so skip it and keep peeking.
if (!str || str->empty()) { if (!str || str->empty()) {
@@ -1519,8 +1519,7 @@ static void appendCharInLiteral(std::string &str, int c) {
case '8': case '8':
case '9': case '9':
case '<': case '<':
shiftChar(); if (std::shared_ptr<std::string> arg = readMacroArg(); arg) {
if (std::shared_ptr<std::string> arg = readMacroArg(c); arg) {
appendExpandedString(str, *arg); appendExpandedString(str, *arg);
} }
break; break;
@@ -2015,10 +2014,7 @@ static Token yylex_NORMAL() {
Symbol const *sym = sym_FindExactSymbol(std::get<std::string>(token.value)); Symbol const *sym = sym_FindExactSymbol(std::get<std::string>(token.value));
if (sym && sym->type == SYM_EQUS) { if (sym && sym->type == SYM_EQUS) {
std::shared_ptr<std::string> str = sym->getEqus(); beginExpansion(sym->getEqus(), sym->name);
assume(str);
beginExpansion(str, sym->name);
return yylex_NORMAL(); // Tail recursion return yylex_NORMAL(); // Tail recursion
} }
} }