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

Support line continuations in main scope

Browse Source
This commit is contained in:
ISSOtm
2020-08-16 03:08:31 +02:00
parent 3f5f9bcaf0
commit e4f2fad215
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/asm/lexer.c
View File

@@ -896,13 +896,14 @@ static void readLineContinuation(void)
shiftChars(1); shiftChars(1);
} else if (c == '\r' || c == '\n') { } else if (c == '\r' || c == '\n') {
shiftChars(1); shiftChars(1);
if (c == '\r' && peek(0) == '\n')
shiftChars(1);
if (!lexerState->expansions if (!lexerState->expansions
|| lexerState->expansions->distance) { || lexerState->expansions->distance)
lexerState->lineNo++; lexerState->lineNo++;
}
return; return;
} else { } else {
error("Begun line continuation, but encountered character %s\n", error("Begun line continuation, but encountered character '%s'\n",
print(c)); print(c));
return; return;
} }
@@ -1536,7 +1537,28 @@ static int yylex_NORMAL(void)
case EOF: case EOF:
return 0; return 0;
/* Handle identifiers... or error out */ /* Handle escapes */
case '\\':
c = peek(0);
switch (c) {
case ' ':
case '\r':
case '\n':
readLineContinuation();
break;
case EOF:
error("Illegal character escape at end of input\n");
break;
default:
shiftChars(1);
error("Illegal character escape '%s'\n", print(c));
}
break;
/* Handle identifiers and escapes... or error out */
default: default:
if (startsIdentifier(c)) { if (startsIdentifier(c)) {