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

macro_UndefUniqueID uses 0 to mean \@ is undefined

Browse Source
This commit is contained in:
Rangi
2022-08-30 16:50:34 -04:00
parent fa13611bbf
commit a52a00a9ca
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm/macro.h
View File

@@ -31,6 +31,7 @@ uint32_t macro_GetUniqueID(void);
char const *macro_GetUniqueIDStr(void); char const *macro_GetUniqueIDStr(void);
void macro_SetUniqueID(uint32_t id); void macro_SetUniqueID(uint32_t id);
uint32_t macro_UseNewUniqueID(void); uint32_t macro_UseNewUniqueID(void);
uint32_t macro_UndefUniqueID(void);
void macro_ShiftCurrentArgs(int32_t count); void macro_ShiftCurrentArgs(int32_t count);
uint32_t macro_NbArgs(void); uint32_t macro_NbArgs(void);

6
src/asm/fstack.c
View File

@@ -336,8 +336,7 @@ void fstk_RunInclude(char const *path)
fatalerror("Failed to set up lexer for file include\n"); fatalerror("Failed to set up lexer for file include\n");
lexer_SetStateAtEOL(contextStack->lexerState); lexer_SetStateAtEOL(contextStack->lexerState);
// We're back at top-level, so most things are reset // We're back at top-level, so most things are reset
contextStack->uniqueID = 0; contextStack->uniqueID = macro_UndefUniqueID();
macro_SetUniqueID(0);
} }
void fstk_RunMacro(char const *macroName, struct MacroArgs *args) void fstk_RunMacro(char const *macroName, struct MacroArgs *args)
@@ -539,8 +538,7 @@ void fstk_Init(char const *mainPath, size_t maxDepth)
context->parent = NULL; context->parent = NULL;
context->lexerState = state; context->lexerState = state;
context->uniqueID = 0; context->uniqueID = macro_UndefUniqueID();
macro_SetUniqueID(0);
context->nbReptIters = 0; context->nbReptIters = 0;
context->forValue = 0; context->forValue = 0;
context->forStep = 0; context->forStep = 0;

8
src/asm/macro.c
View File

@@ -166,7 +166,13 @@ void macro_SetUniqueID(uint32_t id)
uint32_t macro_UseNewUniqueID(void) uint32_t macro_UseNewUniqueID(void)
{ {
macro_SetUniqueID(++maxUniqueID); macro_SetUniqueID(++maxUniqueID);
return maxUniqueID; return uniqueID;
}
uint32_t macro_UndefUniqueID(void)
{
macro_SetUniqueID(0);
return uniqueID;
} }
void macro_ShiftCurrentArgs(int32_t count) void macro_ShiftCurrentArgs(int32_t count)