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

Enable catching invalid macro arg 0

Browse Source
This commit is contained in:
ISSOtm
2020-08-15 15:26:22 +02:00
parent 9081feab51
commit 08867b3cec
1 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/asm/lexer.c
View File

@@ -725,7 +725,7 @@ static int peek(uint8_t distance)
distance++; distance++;
lexerState->macroArgScanDistance++; lexerState->macroArgScanDistance++;
c = peekInternal(distance); c = peekInternal(distance);
if (c == '@' || (c >= '1' && c <= '9')) { if (c == '@' || (c >= '0' && c <= '9')) {
/* Expand the argument and return its first character */ /* Expand the argument and return its first character */
char const *str = expandMacroArg(c, distance - 1); char const *str = expandMacroArg(c, distance - 1);
@@ -1677,9 +1677,11 @@ static int yylex_RAW(void)
*/ */
static int skipIfBlock(bool toEndc) static int skipIfBlock(bool toEndc)
{ {
dbgPrint("Skipping IF block (toEndc = %s)\n", toEndc ? "true" : "false");
lexer_SetMode(LEXER_NORMAL); lexer_SetMode(LEXER_NORMAL);
int startingDepth = nIFDepth; int startingDepth = nIFDepth;
int token; int token;
bool atLineStart = lexerState->atLineStart;
/* Prevent expanding macro args in this state by enabling capture to nothing */ /* Prevent expanding macro args in this state by enabling capture to nothing */
lexerState->capturing = true; lexerState->capturing = true;
@@ -1687,23 +1689,65 @@ static int skipIfBlock(bool toEndc)
lexerState->captureBuf = NULL; lexerState->captureBuf = NULL;
for (;;) { for (;;) {
bool atLineStart = lexerState->atLineStart; if (atLineStart) {
int c;
token = yylex(); for (;;) {
if (token == 0) { /* Pass EOF through */ c = peek(0);
break; if (!isWhitespace(c))
} else if (atLineStart && token == T_POP_IF) { /* Increase nesting */ break;
nIFDepth++; shiftChars(1);
} else if (atLineStart && nIFDepth == startingDepth) { /* An occasion to finish? */ }
if (token == T_POP_ENDC || (!toEndc && (token == T_POP_ELIF
|| token == T_POP_ELSE))) if (startsIdentifier(c)) {
break; shiftChars(1);
} else if (atLineStart && token == T_POP_ENDC) { /* Decrease nesting */ token = readIdentifier(c);
nIFDepth--; switch (token) {
case T_POP_IF:
nIFDepth++;
break;
case T_POP_ELIF:
case T_POP_ELSE:
if (toEndc) /* Ignore ELIF and ELSE, go to ENDC */
break;
/* fallthrough */
case T_POP_ENDC:
if (nIFDepth == startingDepth)
goto finish;
if (token == T_POP_ENDC)
nIFDepth--;
}
}
atLineStart = false;
} }
/* Read chars until EOL */
do {
int c = nextChar();
if (c == EOF) {
token = 0;
goto finish;
} else if (c == '\\') {
/* Unconditionally skip the next char, including line conts */
c = nextChar();
} else if (c == '\r' || c == '\n') {
atLineStart = true;
}
if (c == '\r' || c == '\n')
/* Do this both on line continuations and plain EOLs */
lexerState->lineNo++;
/* Handle CRLF */
if (c == '\r' && peek(0) == '\n')
shiftChars(1);
} while (!atLineStart);
} }
finish:
lexerState->capturing = false; lexerState->capturing = false;
lexerState->atLineStart = false;
return token; return token;
} }