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

Reduce nesting depth in some functions (#1739)

Browse Source
This commit is contained in:
Rangi
2025-07-09 16:20:33 -04:00
committed by GitHub
parent 41ab5dff5a
commit 44f5b47bf0
1 changed files with 93 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
src/asm/lexer.cpp
View File

@@ -2287,61 +2287,10 @@ static Token skipIfBlock(bool toEndc) {
Defer reenableExpansions = scopedDisableExpansions(); Defer reenableExpansions = scopedDisableExpansions();
for (;;) { for (int c;; atLineStart = false) {
if (atLineStart) {
int c;
for (;; shiftChar()) {
c = peek();
if (!isWhitespace(c)) {
break;
}
}
if (startsIdentifier(c)) {
shiftChar();
switch (Token token = readIdentifier(c, false); token.type) {
case T_(POP_IF):
lexer_IncIFDepth();
break;
case T_(POP_ELIF):
if (lexer_ReachedELSEBlock()) {
// This should be redundant, as the parser handles this error first.
fatal("Found ELIF after an ELSE block"); // LCOV_EXCL_LINE
}
if (!toEndc && lexer_GetIFDepth() == startingDepth) {
return token;
}
break;
case T_(POP_ELSE):
if (lexer_ReachedELSEBlock()) {
fatal("Found ELSE after an ELSE block");
}
lexer_ReachELSEBlock();
if (!toEndc && lexer_GetIFDepth() == startingDepth) {
return token;
}
break;
case T_(POP_ENDC):
if (lexer_GetIFDepth() == startingDepth) {
return token;
}
lexer_DecIFDepth();
break;
default:
break;
}
}
atLineStart = false;
}
// Read chars until EOL // Read chars until EOL
do { while (!atLineStart) {
int c = nextChar(); c = nextChar();
if (c == EOF) { if (c == EOF) {
return Token(T_(YYEOF)); return Token(T_(YYEOF));
@@ -2357,7 +2306,55 @@ static Token skipIfBlock(bool toEndc) {
// Do this both on line continuations and plain EOLs // Do this both on line continuations and plain EOLs
nextLine(); nextLine();
} }
} while (!atLineStart); }
// Skip leading whitespace
for (;; shiftChar()) {
c = peek();
if (!isWhitespace(c)) {
break;
}
}
if (!startsIdentifier(c)) {
continue;
}
shiftChar();
switch (Token token = readIdentifier(c, false); token.type) {
case T_(POP_IF):
lexer_IncIFDepth();
break;
case T_(POP_ELIF):
if (lexer_ReachedELSEBlock()) {
// This should be redundant, as the parser handles this error first.
fatal("Found ELIF after an ELSE block"); // LCOV_EXCL_LINE
}
if (!toEndc && lexer_GetIFDepth() == startingDepth) {
return token;
}
break;
case T_(POP_ELSE):
if (lexer_ReachedELSEBlock()) {
fatal("Found ELSE after an ELSE block");
}
lexer_ReachELSEBlock();
if (!toEndc && lexer_GetIFDepth() == startingDepth) {
return token;
}
break;
case T_(POP_ENDC):
if (lexer_GetIFDepth() == startingDepth) {
return token;
}
lexer_DecIFDepth();
break;
default:
break;
}
} }
} }
@@ -2378,50 +2375,10 @@ static Token yylex_SKIP_TO_ENDR() {
Defer reenableExpansions = scopedDisableExpansions(); Defer reenableExpansions = scopedDisableExpansions();
for (;;) { for (int c;; atLineStart = false) {
if (atLineStart) {
int c;
for (;;) {
c = peek();
if (!isWhitespace(c)) {
break;
}
shiftChar();
}
if (startsIdentifier(c)) {
shiftChar();
switch (readIdentifier(c, false).type) {
case T_(POP_FOR):
case T_(POP_REPT):
depth++;
break;
case T_(POP_ENDR):
depth--;
// `lexer_CaptureRept` has already guaranteed that the `ENDR`s are balanced
assume(depth > 0);
break;
case T_(POP_IF):
lexer_IncIFDepth();
break;
case T_(POP_ENDC):
lexer_DecIFDepth();
break;
default:
break;
}
}
atLineStart = false;
}
// Read chars until EOL // Read chars until EOL
do { while (!atLineStart) {
int c = nextChar(); c = nextChar();
if (c == EOF) { if (c == EOF) {
return Token(T_(YYEOF)); return Token(T_(YYEOF));
@@ -2437,7 +2394,44 @@ static Token yylex_SKIP_TO_ENDR() {
// Do this both on line continuations and plain EOLs // Do this both on line continuations and plain EOLs
nextLine(); nextLine();
} }
} while (!atLineStart); }
// Skip whitespace
for (;;) {
c = peek();
if (!isWhitespace(c)) {
break;
}
shiftChar();
}
if (!startsIdentifier(c)) {
continue;
}
shiftChar();
switch (readIdentifier(c, false).type) {
case T_(POP_FOR):
case T_(POP_REPT):
depth++;
break;
case T_(POP_ENDR):
depth--;
// `lexer_CaptureRept` has already guaranteed that the `ENDR`s are balanced
assume(depth > 0);
break;
case T_(POP_IF):
lexer_IncIFDepth();
break;
case T_(POP_ENDC):
lexer_DecIFDepth();
break;
default:
break;
}
} }
} }