From 20ea33f3321738e7c1b4cad7bdcaedcdb54dd0f0 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 11 Apr 2023 10:18:18 -0400 Subject: Artifact simplification (#2781) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP simplifying artifact interface. * Use ContainedKind. * Remove LazyCastableList. Use ContainedKind for find. * Remove ICastableList. * Remove need for ICastableList. * Remove IArtifactContainer. * Small fixes. * Small improvements around Artifact. * Make explicit find is for *representations* that can cast. Fix bug in handling casting in lookup. * Made associated items artifacts too. * Small fixes. * Small improvements around writing a container. --- source/compiler-core/slang-artifact-helper.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'source/compiler-core/slang-artifact-helper.cpp') diff --git a/source/compiler-core/slang-artifact-helper.cpp b/source/compiler-core/slang-artifact-helper.cpp index c3b007d28..7f1bf1ea2 100644 --- a/source/compiler-core/slang-artifact-helper.cpp +++ b/source/compiler-core/slang-artifact-helper.cpp @@ -9,8 +9,7 @@ #include "../compiler-core/slang-slice-allocator.h" -#include "../core/slang-castable-list-impl.h" -#include "../core/slang-castable-util.h" +#include "../core/slang-castable.h" #include "../core/slang-file-system.h" #include "../core/slang-io.h" @@ -66,15 +65,6 @@ SlangResult DefaultArtifactHelper::createArtifact(const ArtifactDesc& desc, cons return SLANG_OK; } -SlangResult DefaultArtifactHelper::createArtifactContainer(const ArtifactDesc& desc, const char* inName, IArtifactContainer** outArtifactContainer) -{ - *outArtifactContainer = inName ? - ArtifactContainer::create(desc, UnownedStringSlice(inName)).detach() : - ArtifactContainer::create(desc).detach(); - - return SLANG_OK; -} - ArtifactKind DefaultArtifactHelper::getKindParent(ArtifactKind kind) { return getParent(kind); } UnownedStringSlice DefaultArtifactHelper::getKindName(ArtifactKind kind) { return getName(kind); } bool DefaultArtifactHelper::isKindDerivedFrom(ArtifactKind kind, ArtifactKind base) { return isDerivedFrom(kind, base); } @@ -124,19 +114,6 @@ void DefaultArtifactHelper::getCastable(ISlangUnknown* unk, ICastable** outCasta *outCastable = CastableUtil::getCastable(unk).detach(); } -SlangResult DefaultArtifactHelper::createCastableList(const Guid& guid, ICastableList** outList) -{ - auto list = new CastableList; - if (auto ptr = list->getInterface(guid)) - { - list->addRef(); - *outList = (ICastableList*)ptr; - return SLANG_OK; - } - delete list; - return SLANG_E_NO_INTERFACE; -} - SlangResult DefaultArtifactHelper::createOSFileArtifactRepresentation( IOSFileArtifactRepresentation::Kind kind, const CharSlice& path, IOSFileArtifactRepresentation* lockFile, IOSFileArtifactRepresentation** outRep) { -- cgit v1.2.3