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::variant for file stack nodes

Browse Source
This commit is contained in:
Rangi42
2024-02-25 09:25:02 -05:00
committed by Sylvie
parent 4b2294292a
commit cf42d035f2
3 changed files with 95 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/asm/output.cpp
View File

@@ -62,14 +62,9 @@ static void putstring(char const *s, FILE *f)
void out_RegisterNode(struct FileStackNode *node)
{
// If node is not already registered, register it (and parents), and give it a unique ID
while (node->ID == (uint32_t)-1) {
for (; node && node->ID == (uint32_t)-1; node = node->parent) {
node->ID = fileStackNodes.size();
fileStackNodes.push_front(node);
// Also register the node's parents
node = node->parent;
if (!node)
break;
}
}
@@ -336,14 +331,14 @@ static void writeFileStackNode(struct FileStackNode const *node, FILE *f)
putlong(node->lineNo, f);
putc(node->type, f);
if (node->type != NODE_REPT) {
putstring(((struct FileStackNamedNode const *)node)->name.c_str(), f);
putstring(node->name().c_str(), f);
} else {
struct FileStackReptNode const *reptNode = (struct FileStackReptNode const *)node;
std::vector<uint32_t> const &nodeIters = node->iters();
putlong(reptNode->iters.size(), f);
putlong(nodeIters.size(), f);
// Iters are stored by decreasing depth, so reverse the order for output
for (uint32_t i = reptNode->iters.size(); i--; )
putlong(reptNode->iters[i], f);
for (uint32_t i = nodeIters.size(); i--; )
putlong(nodeIters[i], f);
}
}