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

Remove EQUS callbacks for symbols

Browse Source 
They're no longer used since `__FILE__` was removed
This commit is contained in:
Rangi42
2024-03-03 21:26:44 -05:00
parent ba183e900b
commit 13904dc536
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm/symbol.hpp
View File

@@ -40,7 +40,6 @@ struct Symbol {
int32_t (*numCallback)(); // If isNumeric() and hasCallback int32_t (*numCallback)(); // If isNumeric() and hasCallback
std::string_view *macro; // For SYM_MACRO std::string_view *macro; // For SYM_MACRO
std::string *equs; // For SYM_EQUS std::string *equs; // For SYM_EQUS
char const *(*strCallback)(); // For SYM_EQUS if hasCallback
}; };
uint32_t ID; // ID of the symbol in the object file (-1 if none) uint32_t ID; // ID of the symbol in the object file (-1 if none)
@@ -61,7 +60,6 @@ struct Symbol {
int32_t getValue() const; int32_t getValue() const;
uint32_t getConstantValue() const; uint32_t getConstantValue() const;
char const *getStringValue() const { return hasCallback ? strCallback() : equs->c_str(); }
}; };
void sym_ForEach(void (*func)(Symbol &)); void sym_ForEach(void (*func)(Symbol &));

4
src/asm/lexer.cpp
View File

@@ -1262,7 +1262,7 @@ static char const *readInterpolation(size_t depth)
if (!sym) { if (!sym) {
error("Interpolated symbol \"%s\" does not exist\n", symName); error("Interpolated symbol \"%s\" does not exist\n", symName);
} else if (sym->type == SYM_EQUS) { } else if (sym->type == SYM_EQUS) {
fmt.printString(buf, sizeof(buf), sym->getStringValue()); fmt.printString(buf, sizeof(buf), sym->equs->c_str());
return buf; return buf;
} else if (sym->isNumeric()) { } else if (sym->isNumeric()) {
fmt.printNumber(buf, sizeof(buf), sym->getConstantValue()); fmt.printNumber(buf, sizeof(buf), sym->getConstantValue());
@@ -1894,7 +1894,7 @@ static int yylex_NORMAL()
Symbol const *sym = sym_FindExactSymbol(yylval.symName); Symbol const *sym = sym_FindExactSymbol(yylval.symName);
if (sym && sym->type == SYM_EQUS) { if (sym && sym->type == SYM_EQUS) {
char const *s = sym->getStringValue(); char const *s = sym->equs->c_str();
assert(s); assert(s);
if (s[0]) if (s[0])