gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 18:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store IF depth relative to each fstack context

Browse Source 
This disallows starting/ending an IF inside an
INCLUDEd file or a macro expansion
This commit is contained in:
Rangi
2021-01-08 16:28:51 -05:00
committed by Eldred Habert
parent 62bea23c49
commit cab9cb06a3
12 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/asm/parser.y
View File

@@ -563,7 +563,7 @@ conditional : if
;
if : T_POP_IF const T_NEWLINE {
nIFDepth++;
fstk_IncIFDepth();
executeElseBlock = !$2;
if (executeElseBlock)
lexer_SetMode(LEXER_SKIP_TO_ELIF);
@@ -571,7 +571,7 @@ if : T_POP_IF const T_NEWLINE {
;
elif : T_POP_ELIF const T_NEWLINE {
if (nIFDepth <= 0)
if (fstk_GetIFDepth() == 0)
fatalerror("Found ELIF outside an IF construct\n");
if (!executeElseBlock) {
@@ -585,7 +585,7 @@ elif : T_POP_ELIF const T_NEWLINE {
;
else : T_POP_ELSE T_NEWLINE {
if (nIFDepth <= 0)
if (fstk_GetIFDepth() == 0)
fatalerror("Found ELSE outside an IF construct\n");
if (!executeElseBlock)
@@ -594,10 +594,10 @@ else : T_POP_ELSE T_NEWLINE {
;
endc : T_POP_ENDC T_NEWLINE {
if (nIFDepth <= 0)
if (fstk_GetIFDepth() == 0)
fatalerror("Found ENDC outside an IF construct\n");
nIFDepth--;
fstk_DecIFDepth();
executeElseBlock = false;
}
;