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

Remove extra entry in error stack on macro not defined (#394)

Browse Source 
While working on #392, I noticed that the macro-@ test (as well
as the line-continuation test, but for that one see #393)
printed an additional '@(-1)' entry which doesn't make sense.
This commit is contained in:
Eldred Habert
2019-08-30 02:14:21 +02:00
committed by GitHub
parent 05becf3f4b
commit 12d82eb768
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/asm/fstack.c
View File

@@ -318,7 +318,7 @@ uint32_t fstk_RunMacro(char *s)
{ {
struct sSymbol *sym = sym_FindMacro(s); struct sSymbol *sym = sym_FindMacro(s);
if (sym == NULL) if (sym == NULL || sym->pMacro == NULL)
return 0; return 0;
pushcontext(); pushcontext();
@@ -328,9 +328,6 @@ uint32_t fstk_RunMacro(char *s)
nCurrentStatus = STAT_isMacro; nCurrentStatus = STAT_isMacro;
strcpy(tzCurrentFileName, s); strcpy(tzCurrentFileName, s);
if (sym->pMacro == NULL)
return 0;
pCurrentMacro = sym; pCurrentMacro = sym;
CurrentFlexHandle = yy_scan_bytes(pCurrentMacro->pMacro, CurrentFlexHandle = yy_scan_bytes(pCurrentMacro->pMacro,
strlen(pCurrentMacro->pMacro)); strlen(pCurrentMacro->pMacro));

2
test/asm/macro-@.out
View File

@@ -1,2 +1,2 @@
ERROR: macro-@.asm(1) -> @(-1): ERROR: macro-@.asm(1):
Macro '@' not defined Macro '@' not defined

2
test/asm/macro-@.out.pipe
View File

@@ -1,2 +1,2 @@
ERROR: -(1) -> @(-1): ERROR: -(1):
Macro '@' not defined Macro '@' not defined