From 0b51ea6bb54b1d8a12695ccc2c259fd591069791 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Mon, 3 Oct 2022 21:09:16 -0400
Subject: IMutableFileSystem::saveFileBlob (#2427)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Remove ref count for Entry in RiffFileSystem.
Free up backing Entry types (to work around Dictionary not doing this).

* Some small improvements to RiffFileSystem.

* Add testing for file systems.

* Split out MemoryFileSystem.

* Add some documentation around different FileSystems.

* Small tiry up - removing unused headers, fixing some comments.
Use StringBlob::moveCreate where appropriate.

* Small improvement to MemoryFileSystem.
Improve documentation comments a little.

* Added PathKind

* * Make MemoryFileSystem not have implicit directories
* Make RelativeFileSystem only allow access to files in file system (kind of like chroot)
* Added Path::simplifyAbsolute
* Special handling for root of MemoryFileSystem
* Improvements around paths for different impls

* More improvements around RelativeFileSystem.
Special case root handling.

* Test archive serialization.
Move testinf from compression.
Remove the implicit directory test -> doesn't work on all file systems.

* Small optimization that removes need for check for a parent unless an item is being *created*.

* Add implicit path testing.

* Add support for saveFileBlob
Add testing for saveFileBlob

* Removed TemporaryFileSet
Added PlatformUtil::outputDebugMessage

* Some small improvements around RelativeFileSystem.

* Split out ImplicitDirectoryCollector so can use without requiring compression systems.

* Split out StringSliceIndexMap into own files.
---
 source/compiler-core/slang-artifact-handler-impl.cpp |  8 ++++----
 source/compiler-core/slang-include-system.cpp        |  2 +-
 source/compiler-core/slang-source-loc.cpp            | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source/compiler-core')

diff --git a/source/compiler-core/slang-artifact-handler-impl.cpp b/source/compiler-core/slang-artifact-handler-impl.cpp
index d7c3f02b6..9bf4313a9 100644
--- a/source/compiler-core/slang-artifact-handler-impl.cpp
+++ b/source/compiler-core/slang-artifact-handler-impl.cpp
@@ -176,12 +176,12 @@ SlangResult DefaultArtifactHandler::_createOSFile(IArtifact* artifact, ArtifactK
 				path = UnownedStringSlice(extRep->getPath());
 				break;
 			}
-			case OSPathKind::Canonical:
+			case OSPathKind::OperatingSystem:
 			{
-				ComPtr<ISlangBlob> canonicalPathBlob;
-				if (SLANG_SUCCEEDED(system->getCanonicalPath(extRep->getPath(), canonicalPathBlob.writeRef())))
+				ComPtr<ISlangBlob> osPathBlob;
+				if (SLANG_SUCCEEDED(system->getPath(PathKind::OperatingSystem, extRep->getPath(), osPathBlob.writeRef())))
 				{
-					path = StringUtil::getString(canonicalPathBlob);
+					path = StringUtil::getString(osPathBlob);
 				}
 				break;
 			}
diff --git a/source/compiler-core/slang-include-system.cpp b/source/compiler-core/slang-include-system.cpp
index ebfc8db05..f0a850a81 100644
--- a/source/compiler-core/slang-include-system.cpp
+++ b/source/compiler-core/slang-include-system.cpp
@@ -68,7 +68,7 @@ SlangResult IncludeSystem::findFile(SlangPathType fromPathType, const String& fr
 String IncludeSystem::simplifyPath(const String& path)
 {
     ComPtr<ISlangBlob> simplifiedPath;
-    if (SLANG_FAILED(m_fileSystemExt->getSimplifiedPath(path.getBuffer(), simplifiedPath.writeRef())))
+    if (SLANG_FAILED(m_fileSystemExt->getPath(PathKind::Simplified, path.getBuffer(), simplifiedPath.writeRef())))
     {
         return path;
     }
diff --git a/source/compiler-core/slang-source-loc.cpp b/source/compiler-core/slang-source-loc.cpp
index ac6589e76..95c6f5db3 100644
--- a/source/compiler-core/slang-source-loc.cpp
+++ b/source/compiler-core/slang-source-loc.cpp
@@ -419,15 +419,15 @@ String SourceFile::calcVerbosePath() const
 
     if (fileSystemExt)
     {
-        String canonicalPath;
-        ComPtr<ISlangBlob> canonicalPathBlob;
-        if (SLANG_SUCCEEDED(fileSystemExt->getCanonicalPath(m_pathInfo.foundPath.getBuffer(), canonicalPathBlob.writeRef())))
+        String displayPath;
+        ComPtr<ISlangBlob> displayPathBlob;
+        if (SLANG_SUCCEEDED(fileSystemExt->getPath(PathKind::Display, m_pathInfo.foundPath.getBuffer(), displayPathBlob.writeRef())))
         {
-            canonicalPath = StringUtil::getString(canonicalPathBlob);
+            displayPath = StringUtil::getString(displayPathBlob);
         }
-        if (canonicalPath.getLength() > 0)
+        if (displayPath.getLength() > 0)
         {
-            return canonicalPath;
+            return displayPath;
         }
     }
 
-- 
cgit v1.2.3