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

Fix not shifting CRLF at end of raw lines

Browse Source 
Fixes line reporting errors on Windows
This commit is contained in:
ISSOtm
2020-12-10 15:21:32 +01:00
parent af530859f0
commit 21b58b08b8
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/asm/lexer.c
View File

@@ -1777,7 +1777,7 @@ static int yylex_RAW(void)
if (c == EOF) if (c == EOF)
return 0; return 0;
shiftChars(1); shiftChars(1);
if (c == '\r' && peek(0) == '\r') if (c == '\r' && peek(0) == '\n')
shiftChars(1); shiftChars(1);
return c == ',' ? T_COMMA : T_NEWLINE; return c == ',' ? T_COMMA : T_NEWLINE;
} }
@@ -2033,10 +2033,8 @@ void lexer_CaptureRept(char **capture, size_t *size)
error("Unterminated REPT block\n"); error("Unterminated REPT block\n");
lexerState->capturing = false; lexerState->capturing = false;
goto finish; goto finish;
} else if (c == '\n') { } else if (c == '\n' || c == '\r') {
break; if (c == '\r' && peek(0) == '\n')
} else if (c == '\r') {
if (peek(0) == '\n')
shiftChars(1); shiftChars(1);
break; break;
} }