Fix path bug

spicelang · Dec 15, 2023 · d6171de · d6171de
1 parent 8ab9b69
commit d6171de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/driver/Driver.cpp b/src/driver/Driver.cpp
@@ -102,6 +102,10 @@ void Driver::init() {
  * Initialize the cli options based on the input of the user
  */
 void Driver::enrich() {
+  // Make path of given main source file canonical and relative
+  cliOptions.mainSourceFile = std::filesystem::canonical(cliOptions.mainSourceFile);
+  cliOptions.mainSourceFile = std::filesystem::path(cliOptions.mainSourceFile);
+
   // Propagate llvm args to llvm
   if (!cliOptions.llvmArgs.empty()) {
     const std::vector<std::string> result = CommonUtil::split("llvm " + cliOptions.llvmArgs);

diff --git a/src/importcollector/ImportCollector.cpp b/src/importcollector/ImportCollector.cpp
@@ -39,7 +39,9 @@ std::any ImportCollector::visitImportStmt(ImportStmtNode *node) {
     basePath = sourceFile->filePath.parent_path() / node->importPath;
   }
   basePath.make_preferred();
-  basePath = std::filesystem::relative(std::filesystem::weakly_canonical(basePath));
+  basePath = std::filesystem::weakly_canonical(basePath).lexically_relative(std::filesystem::current_path());
+  if (!basePath.native().starts_with('.'))
+    basePath = "." / basePath;
 
   // Format: /dir/to/path/file.spice
   std::filesystem::path defaultPath = basePath;

diff --git a/test/test-files/typechecker/imports/error-circular-import/exception.out b/test/test-files/typechecker/imports/error-circular-import/exception.out
@@ -1,4 +1,4 @@
-[Error|Semantic] test-files/typechecker/imports/error-circular-import/source2.spice:1:1:
+[Error|Semantic] ./test-files/typechecker/imports/error-circular-import/source2.spice:1:1:
 Circular import detected: Circular import detected while importing 'source.spice'
 
 1  import "source" as s;