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

Use std::shared_ptr for MacroArgs

Browse Source
This commit is contained in:
Rangi42
2024-03-22 10:02:22 -04:00
committed by Sylvie
parent e255af9e10
commit b85c5cde8f
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/asm/fstack.cpp
View File

@@ -35,7 +35,7 @@ struct Context {
// Note that several contexts can share the same unique ID (since `INCLUDE` preserves its
// parent's, and likewise "back-propagates" a unique ID if requested), hence using `shared_ptr`.
std::shared_ptr<std::string> uniqueIDStr;
MacroArgs *macroArgs = nullptr; // Macro args are *saved* here
std::shared_ptr<MacroArgs> macroArgs = nullptr; // Macro args are *saved* here
uint32_t nbReptIters = 0;
bool isForLoop = false;
int32_t forValue = 0;
@@ -285,7 +285,7 @@ static void runPreIncludeFile() {
lexer_SetState(&context.lexerState);
}
void fstk_RunMacro(std::string const &macroName, MacroArgs &args) {
void fstk_RunMacro(std::string const &macroName, std::shared_ptr<MacroArgs> args) {
Symbol *macro = sym_FindExactSymbol(macroName);
if (!macro) {
@@ -325,7 +325,7 @@ void fstk_RunMacro(std::string const &macroName, MacroArgs &args) {
context.lexerState, "MACRO", macroView->data(), macroView->size(), macro->fileLine
);
lexer_SetStateAtEOL(&context.lexerState);
macro_UseNewArgs(&args);
macro_UseNewArgs(args);
}
static bool newReptContext(int32_t reptLineNo, char const *body, size_t size) {