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

Capture termination status is equivalent to not having reached EOF

Browse Source 
This avoids the need for a separate `terminated` flag
This commit is contained in:
Rangi
2021-04-20 09:25:27 -04:00
committed by Eldred Habert
parent 7a587eb7d6
commit a727a0f81f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/asm/lexer.c
View File

@@ -2341,9 +2341,8 @@ bool lexer_CaptureRept(struct CaptureBody *capture)
capture->lineNo = lexer_GetLineNo(); capture->lineNo = lexer_GetLineNo();
char *captureStart = startCapture(); char *captureStart = startCapture();
bool terminated = false;
unsigned int level = 0; unsigned int level = 0;
int c; int c = EOF;
/* /*
* Due to parser internals, it reads the EOL after the expression before calling this. * Due to parser internals, it reads the EOL after the expression before calling this.
@@ -2373,7 +2372,6 @@ bool lexer_CaptureRept(struct CaptureBody *capture)
* We know we have read exactly "ENDR", not e.g. an EQUS * We know we have read exactly "ENDR", not e.g. an EQUS
*/ */
lexerState->captureSize -= strlen("ENDR"); lexerState->captureSize -= strlen("ENDR");
terminated = true;
goto finish; goto finish;
} }
level--; level--;
@@ -2401,7 +2399,9 @@ finish:
lexerState->disableMacroArgs = false; lexerState->disableMacroArgs = false;
lexerState->disableInterpolation = false; lexerState->disableInterpolation = false;
lexerState->atLineStart = false; lexerState->atLineStart = false;
return terminated;
/* Returns true if an ENDR terminated the block, false if it reached EOF first */
return c != EOF;
} }
bool lexer_CaptureMacroBody(struct CaptureBody *capture) bool lexer_CaptureMacroBody(struct CaptureBody *capture)
@@ -2409,8 +2409,7 @@ bool lexer_CaptureMacroBody(struct CaptureBody *capture)
capture->lineNo = lexer_GetLineNo(); capture->lineNo = lexer_GetLineNo();
char *captureStart = startCapture(); char *captureStart = startCapture();
bool terminated = false; int c = EOF;
int c;
/* If the file is `mmap`ed, we need not to unmap it to keep access to the macro */ /* If the file is `mmap`ed, we need not to unmap it to keep access to the macro */
if (lexerState->isMmapped) if (lexerState->isMmapped)
@@ -2437,7 +2436,6 @@ bool lexer_CaptureMacroBody(struct CaptureBody *capture)
* We know we have read exactly "ENDM", not e.g. an EQUS * We know we have read exactly "ENDM", not e.g. an EQUS
*/ */
lexerState->captureSize -= strlen("ENDM"); lexerState->captureSize -= strlen("ENDM");
terminated = true;
goto finish; goto finish;
} }
} }
@@ -2463,5 +2461,7 @@ finish:
lexerState->disableMacroArgs = false; lexerState->disableMacroArgs = false;
lexerState->disableInterpolation = false; lexerState->disableInterpolation = false;
lexerState->atLineStart = false; lexerState->atLineStart = false;
return terminated;
/* Returns true if an ENDM terminated the block, false if it reached EOF first */
return c != EOF;
} }