diff options
Diffstat (limited to 'source/compiler-core')
| -rw-r--r-- | source/compiler-core/slang-artifact-handler-impl.cpp | 8 | ||||
| -rw-r--r-- | source/compiler-core/slang-include-system.cpp | 2 | ||||
| -rw-r--r-- | source/compiler-core/slang-source-loc.cpp | 12 |
3 files changed, 11 insertions, 11 deletions
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; } } |
