topchetoeu/ppc-lang
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: relative include paths taken into account

Browse Source
This commit is contained in:
TopchetoEU 2023-01-27 14:13:41 +02:00
parent 048d5716ea
commit 5d9e6e1002
No known key found for this signature in database
GPG Key ID: 5ED5FFB2A3F5DB21
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lsinc.cc
View File

@ -37,7 +37,7 @@ fs::path find_file(fs::path original, fs::path include) {
return original; return original;
} }
bool get_import(std::string line, std::string &import) { bool get_import(std::string line, fs::path root, fs::path &import) {
if (line.rfind("#include") != 0) return false; if (line.rfind("#include") != 0) return false;
line = line.substr(8); line = line.substr(8);
trim(line); trim(line);
@ -45,7 +45,13 @@ bool get_import(std::string line, std::string &import) {
if (line[0] == '<') return false; if (line[0] == '<') return false;
if (line[0] == '"') { if (line[0] == '"') {
if (line[line.length() - 1] != '"') throw "Invalid import syntax."s; if (line[line.length() - 1] != '"') throw "Invalid import syntax."s;
import = line.substr(1, line.length() - 2); auto path = line.substr(1, line.length() - 2);
if (path.rfind("./") == 0 || path.rfind(".\\") == 0) {
import = root / path.substr(2);
}
else import = path;
return true; return true;
} }
@ -64,8 +70,8 @@ void get_imports(fs::path file, fs::path include, std::set<fs::path> &res) {
std::string line; std::string line;
while (read_line(f, line)) { while (read_line(f, line)) {
std::string import; fs::path import;
if (get_import(line, import)) { if (get_import(line, file.parent_path(), import)) {
auto child = find_file(import, include); auto child = find_file(import, include);
res.emplace(child); res.emplace(child);
get_imports(child, include, res); get_imports(child, include, res);