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

Use std::variant and automatic allocation for file stack node data

Browse Source
This commit is contained in:
Rangi42
2024-02-28 13:49:12 -05:00
committed by Sylvie
parent e1ac51d7da
commit 0cc49782ab
4 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/link/main.cpp
View File

@@ -7,9 +7,12 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <variant>
#include <vector>
#include "link/assign.hpp"
#include "link/object.hpp"
@@ -48,6 +51,26 @@ FILE *linkerScript;
static uint32_t nbErrors = 0;
std::vector<uint32_t> &FileStackNode::iters() {
assert(std::holds_alternative<std::vector<uint32_t>>(data));
return std::get<std::vector<uint32_t>>(data);
}
std::vector<uint32_t> const &FileStackNode::iters() const {
assert(std::holds_alternative<std::vector<uint32_t>>(data));
return std::get<std::vector<uint32_t>>(data);
}
std::string &FileStackNode::name() {
assert(std::holds_alternative<std::string>(data));
return std::get<std::string>(data);
}
std::string const &FileStackNode::name() const {
assert(std::holds_alternative<std::string>(data));
return std::get<std::string>(data);
}
// Helper function to dump a file stack to stderr
std::string const *dumpFileStack(struct FileStackNode const *node)
{
@@ -57,15 +80,15 @@ std::string const *dumpFileStack(struct FileStackNode const *node)
lastName = dumpFileStack(node->parent);
// REPT nodes use their parent's name
if (node->type != NODE_REPT)
lastName = node->name;
lastName = &node->name();
fprintf(stderr, "(%" PRIu32 ") -> %s", node->lineNo, lastName->c_str());
if (node->type == NODE_REPT) {
for (uint32_t iter : *node->iters)
for (uint32_t iter : node->iters())
fprintf(stderr, "::REPT~%" PRIu32, iter);
}
} else {
assert(node->type != NODE_REPT);
lastName = node->name;
lastName = &node->name();
fputs(lastName->c_str(), stderr);
}