summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2023-04-11 10:18:18 -0400
committerGitHub <noreply@github.com>2023-04-11 10:18:18 -0400
commit20ea33f3321738e7c1b4cad7bdcaedcdb54dd0f0 (patch)
tree899484670ffacf3e884b5d670e2cc8ed6d5259e3 /tools
parentd934bbcc5702ebd8964f65b1708c239c29320103 (diff)
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.
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-test/slang-test-main.cpp5
-rw-r--r--tools/slang-unit-test/unit-test-file-system.cpp3
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 51c618187..e7d2db94d 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -6,6 +6,7 @@
#include "../../source/core/slang-hex-dump-util.h"
#include "../../source/core/slang-type-text-util.h"
#include "../../source/core/slang-memory-arena.h"
+#include "../../source/core/slang-castable.h"
#include "../../source/compiler-core/slang-artifact-desc-util.h"
#include "../../source/compiler-core/slang-artifact-helper.h"
@@ -2286,7 +2287,7 @@ static TestResult runCPPCompilerSharedLibrary(TestContext* context, TestInput& i
return TestResult::Fail;
}
- auto diagnostics = findAssociated<IArtifactDiagnostics>(artifact);
+ auto diagnostics = findAssociatedRepresentation<IArtifactDiagnostics>(artifact);
if (diagnostics && SLANG_FAILED(diagnostics->getResult()))
{
@@ -2412,7 +2413,7 @@ static TestResult runCPPCompilerExecute(TestContext* context, TestInput& input)
String actualOutput;
- auto diagnostics = findAssociated<IArtifactDiagnostics>(artifact);
+ auto diagnostics = findAssociatedRepresentation<IArtifactDiagnostics>(artifact);
// If the actual compilation failed, then the output will be the summary
if (diagnostics && SLANG_FAILED(diagnostics->getResult()))
diff --git a/tools/slang-unit-test/unit-test-file-system.cpp b/tools/slang-unit-test/unit-test-file-system.cpp
index d7f613f65..05892b10b 100644
--- a/tools/slang-unit-test/unit-test-file-system.cpp
+++ b/tools/slang-unit-test/unit-test-file-system.cpp
@@ -9,8 +9,7 @@
#include "../../source/core/slang-deflate-compression-system.h"
#include "../../source/core/slang-lz4-compression-system.h"
-
-#include "../../source/core/slang-destroyable.h"
+#include "../../source/core/slang-castable.h"
#include "../../source/core/slang-io.h"