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

Merge pull request #402 from dbrotz/fix-386

Browse Source 
Fix nested if statements that don't have following whitespace
This commit is contained in:
Eldred Habert
2019-08-29 22:06:10 +02:00
committed by GitHub
parent ce05cb5683 8f287eeef9
commit 3cc7981c82
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/asm/asmy.y
View File

@@ -9,6 +9,7 @@
%{ %{
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -289,16 +290,21 @@ static void copymacro(void)
yyskipbytes(ulNewMacroSize + 4); yyskipbytes(ulNewMacroSize + 4);
} }
static bool endsIf(char c)
{
return isWhiteSpace(c) || c == '(' || c == '{';
}
static uint32_t isIf(char *s) static uint32_t isIf(char *s)
{ {
return (strncasecmp(s, "IF", 2) == 0) return (strncasecmp(s, "IF", 2) == 0)
&& isWhiteSpace(s[-1]) && isWhiteSpace(s[2]); && isWhiteSpace(s[-1]) && endsIf(s[2]);
} }
static uint32_t isElif(char *s) static uint32_t isElif(char *s)
{ {
return (strncasecmp(s, "ELIF", 4) == 0) return (strncasecmp(s, "ELIF", 4) == 0)
&& isWhiteSpace(s[-1]) && isWhiteSpace(s[4]); && isWhiteSpace(s[-1]) && endsIf(s[4]);
} }
static uint32_t isElse(char *s) static uint32_t isElse(char *s)

18
test/asm/nested-if.asm Normal file
View File

@@ -0,0 +1,18 @@
if 0
if(1)
endc
if 1
endc
if{x}
endc
endc
if 1
else
if(1)
endc
if 1
endc
if{x}
endc
endc

0
test/asm/nested-if.out Normal file
View File

0
test/asm/nested-if.out.pipe Normal file
View File