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::vector for include paths

Browse Source
This commit is contained in:
Rangi42
2024-02-23 22:16:23 -05:00
committed by Sylvie
parent e4764e37b1
commit e98d1efee3
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/asm/fstack.cpp
View File

@@ -21,8 +21,6 @@
#include "error.hpp" #include "error.hpp"
#include "platform.hpp" // S_ISDIR (stat macro) #include "platform.hpp" // S_ISDIR (stat macro)
#define MAXINCPATHS 128
struct Context { struct Context {
struct FileStackNode *fileInfo; struct FileStackNode *fileInfo;
struct LexerState *lexerState; struct LexerState *lexerState;
@@ -37,8 +35,8 @@ struct Context {
static std::stack<struct Context> contextStack; static std::stack<struct Context> contextStack;
size_t maxRecursionDepth; size_t maxRecursionDepth;
static unsigned int nbIncPaths = 0; // The first include path for `fstk_FindFile` to try is none at all
static char const *includePaths[MAXINCPATHS]; static std::vector<std::string> includePaths = { "" };
static const char *preIncludeName; static const char *preIncludeName;
@@ -110,26 +108,11 @@ void fstk_AddIncludePath(char const *path)
{ {
if (path[0] == '\0') if (path[0] == '\0')
return; return;
if (nbIncPaths >= MAXINCPATHS) {
error("Too many include directories passed from command line\n");
return;
}
size_t len = strlen(path);
size_t allocSize = len + (path[len - 1] != '/') + 1;
char *str = (char *)malloc(allocSize);
if (!str) { std::string &str = includePaths.emplace_back(path);
// Attempt to continue without that path
error("Failed to allocate new include path: %s\n", strerror(errno));
return;
}
memcpy(str, path, len);
char *end = str + len - 1;
if (*end++ != '/') if (str.back() != '/')
*end++ = '/'; str += '/';
*end = '\0';
includePaths[nbIncPaths++] = str;
} }
void fstk_SetPreIncludeFile(char const *path) void fstk_SetPreIncludeFile(char const *path)
@@ -168,10 +151,8 @@ std::string *fstk_FindFile(char const *path)
if (!fullPath) { if (!fullPath) {
error("Failed to allocate string during include path search: %s\n", strerror(errno)); error("Failed to allocate string during include path search: %s\n", strerror(errno));
} else { } else {
for (size_t i = 0; i <= nbIncPaths; ++i) { for (std::string &str : includePaths) {
*fullPath = i ? includePaths[i - 1] : ""; *fullPath = str + path;
*fullPath += path;
if (isPathValid(fullPath->c_str())) { if (isPathValid(fullPath->c_str())) {
printDep(fullPath->c_str()); printDep(fullPath->c_str());
return fullPath; return fullPath;