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

Symbol names with more than two '.'s could be defined as constants

Browse Source 
Dot-only names could also trip an assertion in `make develop`
when used as labels
This commit is contained in:
Rangi42
2025-12-04 14:07:06 -05:00
committed by Rangi
parent ad3188f038
commit 752e2b3620
13 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/symbol.cpp
View File

@@ -53,6 +53,12 @@ bool sym_IsPC(Symbol const *sym) {
return sym == PCSymbol;
}
bool sym_IsDotScope(std::string const &symName) {
// Label scopes `.` and `..` are the only nonlocal identifiers that start with a dot.
// Three or more dots are considered a nonsensical local label.
return symName == "." || symName == "..";
}
void sym_ForEach(void (*callback)(Symbol &)) {
for (auto &it : symbols) {
callback(it.second);
@@ -215,8 +221,8 @@ static void redefinedError(Symbol const &sym) {
static void assumeAlreadyExpanded(std::string const &symName) {
// Either the symbol name is `Global.local` or entirely '.'s (for scopes `.` and `..`),
// but cannot be unqualified `.local`
assume(!symName.starts_with('.') || symName.find_first_not_of('.') == symName.npos);
// but cannot be unqualified `.local` or more than two '.'s
assume(!symName.starts_with('.') || sym_IsDotScope(symName));
}
static Symbol &createSymbol(std::string const &symName) {
@@ -253,7 +259,7 @@ static bool isAutoScoped(std::string const &symName) {
}
// Label scopes `.` and `..` are the only nonlocal identifiers that start with a dot
if (dotPos == 0 && symName.find_first_not_of('.') == symName.npos) {
if (sym_IsDotScope(symName)) {
return false;
}