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

Group pointer and size as a ContentSpan struct

Browse Source
This commit is contained in:
Rangi42
2024-03-26 23:47:33 -04:00
committed by Sylvie
parent bf0cabb3ea
commit 78801e324c
7 changed files with 59 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/symbol.cpp
View File

@@ -74,9 +74,9 @@ int32_t Symbol::getOutputValue() const {
}
}
std::pair<std::shared_ptr<char const []>, size_t> Symbol::getMacro() const {
assert((std::holds_alternative<std::pair<std::shared_ptr<char const[]>, size_t>>(data)));
return std::get<std::pair<std::shared_ptr<char const[]>, size_t>>(data);
ContentSpan const &Symbol::getMacro() const {
assert((std::holds_alternative<ContentSpan>(data)));
return std::get<ContentSpan>(data);
}
std::shared_ptr<std::string> Symbol::getEqus() const {
@@ -489,16 +489,14 @@ void sym_Export(std::string const &symName) {
}
// Add a macro definition
Symbol *sym_AddMacro(
std::string const &symName, int32_t defLineNo, std::shared_ptr<char const[]> body, size_t size
) {
Symbol *sym_AddMacro(std::string const &symName, int32_t defLineNo, ContentSpan const &span) {
Symbol *sym = createNonrelocSymbol(symName, false);
if (!sym)
return nullptr;
sym->type = SYM_MACRO;
sym->data = std::make_pair(body, size);
sym->data = span;
sym->src = fstk_GetFileStack();
// The symbol is created at the line after the `ENDM`,