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 lexer capture buffers

Browse Source
This commit is contained in:
Rangi42
2024-03-26 13:45:20 -04:00
committed by Sylvie
parent a68bebf4a2
commit bf0cabb3ea
6 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/asm/fstack.cpp
View File

@@ -281,11 +281,13 @@ static void newMacroContext(Symbol const &macro, std::shared_ptr<MacroArgs> macr
.macroArgs = macroArgs,
});
std::string_view view = macro.getMacro();
context.lexerState.setViewAsNextState("MACRO", view.data(), view.size(), macro.fileLine);
auto [body, size] = macro.getMacro();
context.lexerState.setViewAsNextState("MACRO", body, size, macro.fileLine);
}
static Context &newReptContext(int32_t reptLineNo, char const *body, size_t size, uint32_t count) {
static Context &newReptContext(
int32_t reptLineNo, std::shared_ptr<char const[]> body, size_t size, uint32_t count
) {
checkRecursionDepth();
Context &oldContext = contextStack.top();
@@ -347,7 +349,9 @@ void fstk_RunMacro(std::string const &macroName, std::shared_ptr<MacroArgs> macr
newMacroContext(*macro, macroArgs);
}
void fstk_RunRept(uint32_t count, int32_t reptLineNo, char const *body, size_t size) {
void fstk_RunRept(
uint32_t count, int32_t reptLineNo, std::shared_ptr<char const[]> body, size_t size
) {
if (count == 0)
return;
@@ -360,7 +364,7 @@ void fstk_RunFor(
int32_t stop,
int32_t step,
int32_t reptLineNo,
char const *body,
std::shared_ptr<char const[]> body,
size_t size
) {
if (Symbol *sym = sym_AddVar(symName, start); sym->type != SYM_VAR)