gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work around a crash when '@' is interpreted as a macro name.

Browse Source
This commit is contained in:
Anthony J. Bentley
2015-01-22 21:12:57 -07:00
parent 4f8cf84ed4
commit 361f1ac50b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/asm/asmy.y
View File

@@ -540,7 +540,7 @@ macro : T_ID {
yy_set_state(LEX_STATE_NORMAL); yy_set_state(LEX_STATE_NORMAL);
if (!fstk_RunMacro($1)) { if (!fstk_RunMacro($1)) {
yyerror("Macro '%s' not defined", $1); fatalerror("Macro '%s' not defined", $1);
} }
}; };

2
src/asm/fstack.c
View File

@@ -255,6 +255,8 @@ fstk_RunMacro(char *s)
sym_UseNewMacroArgs(); sym_UseNewMacroArgs();
nCurrentStatus = STAT_isMacro; nCurrentStatus = STAT_isMacro;
strcpy(tzCurrentFileName, s); strcpy(tzCurrentFileName, s);
if (sym->pMacro == NULL)
return 0;
pCurrentMacro = sym; pCurrentMacro = sym;
CurrentFlexHandle = CurrentFlexHandle =
yy_scan_bytes(pCurrentMacro->pMacro, yy_scan_bytes(pCurrentMacro->pMacro,