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 #440 from ISSOtm/nested_brackets

Browse Source 
Allow nested bracketed symbols
This commit is contained in:
Eldred Habert
2019-11-03 16:40:34 +01:00
committed by GitHub
parent c568b3a976 cdd8200936
commit 192f2de704
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/asm/lexer.c
View File

@@ -666,6 +666,11 @@ size_t yylex_ReadBracketedSymbol(char *dest, size_t index)
i += length; i += length;
else else
fatalerror("Illegal character escape '%c'", ch); fatalerror("Illegal character escape '%c'", ch);
} else if (ch == '{') {
/* Handle nested symbols */
++pLexBuffer;
i += yylex_ReadBracketedSymbol(sym, i);
--pLexBuffer;
} else if (ch == ':' && !mode) { /* Only grab 1st colon */ } else if (ch == ':' && !mode) { /* Only grab 1st colon */
/* Use a whitelist of modes, which does prevent the /* Use a whitelist of modes, which does prevent the
* use of some features such as precision, * use of some features such as precision,

5
test/asm/nested-brackets.asm Normal file
View File

@@ -0,0 +1,5 @@
STRING equs "OK"
WRAPPER equs "TRIN"
PRINTT "{S{WRAPPER}G}\n"
PRINTT "{S{WRAPPER}G"

3
test/asm/nested-brackets.out Normal file
View File

@@ -0,0 +1,3 @@
ERROR: nested-brackets.asm(5):
Missing }
OK