From 20ea33f3321738e7c1b4cad7bdcaedcdb54dd0f0 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
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.
---
 build/visual-studio/core/core.vcxproj              | 10 ++--------
 build/visual-studio/core/core.vcxproj.filters      | 22 ++--------------------
 build/visual-studio/slang-rt/slang-rt.vcxproj      | 10 ++--------
 .../slang-rt/slang-rt.vcxproj.filters              | 22 ++--------------------
 4 files changed, 8 insertions(+), 56 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj
index d67dc94d9..dafde44ea 100644
--- a/build/visual-studio/core/core.vcxproj
+++ b/build/visual-studio/core/core.vcxproj
@@ -272,9 +272,7 @@
     <ClInclude Include="..\..\..\source\core\slang-basic.h" />
     <ClInclude Include="..\..\..\source\core\slang-blob.h" />
     <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-list-impl.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-list.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-castable.h" />
     <ClInclude Include="..\..\..\source\core\slang-char-encode.h" />
     <ClInclude Include="..\..\..\source\core\slang-char-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-chunked-list.h" />
@@ -284,7 +282,6 @@
     <ClInclude Include="..\..\..\source\core\slang-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-crypto.h" />
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" />
-    <ClInclude Include="..\..\..\source\core\slang-destroyable.h" />
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h" />
     <ClInclude Include="..\..\..\source\core\slang-exception.h" />
     <ClInclude Include="..\..\..\source\core\slang-file-system.h" />
@@ -295,7 +292,6 @@
     <ClInclude Include="..\..\..\source\core\slang-http.h" />
     <ClInclude Include="..\..\..\source\core\slang-implicit-directory-collector.h" />
     <ClInclude Include="..\..\..\source\core\slang-io.h" />
-    <ClInclude Include="..\..\..\source\core\slang-lazy-castable-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-linked-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" />
@@ -342,8 +338,7 @@
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-blob.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-castable-list-impl.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-castable-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-castable.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-command-line.cpp" />
@@ -355,7 +350,6 @@
     <ClCompile Include="..\..\..\source\core\slang-http.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-implicit-directory-collector.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-io.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-file-system.cpp" />
diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters
index 5e0df7483..8ad3e42d5 100644
--- a/build/visual-studio/core/core.vcxproj.filters
+++ b/build/visual-studio/core/core.vcxproj.filters
@@ -30,13 +30,7 @@
     <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-list-impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-util.h">
+    <ClInclude Include="..\..\..\source\core\slang-castable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-char-encode.h">
@@ -66,9 +60,6 @@
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-destroyable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -99,9 +90,6 @@
     <ClInclude Include="..\..\..\source\core\slang-io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-lazy-castable-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-linked-list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -236,10 +224,7 @@
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-castable-list-impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-castable-util.cpp">
+    <ClCompile Include="..\..\..\source\core\slang-castable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp">
@@ -275,9 +260,6 @@
     <ClCompile Include="..\..\..\source\core\slang-io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj
index 7f9a4c9aa..ed0f60443 100644
--- a/build/visual-studio/slang-rt/slang-rt.vcxproj
+++ b/build/visual-studio/slang-rt/slang-rt.vcxproj
@@ -284,9 +284,7 @@
     <ClInclude Include="..\..\..\source\core\slang-basic.h" />
     <ClInclude Include="..\..\..\source\core\slang-blob.h" />
     <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-list-impl.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-list.h" />
-    <ClInclude Include="..\..\..\source\core\slang-castable-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-castable.h" />
     <ClInclude Include="..\..\..\source\core\slang-char-encode.h" />
     <ClInclude Include="..\..\..\source\core\slang-char-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-chunked-list.h" />
@@ -296,7 +294,6 @@
     <ClInclude Include="..\..\..\source\core\slang-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-crypto.h" />
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" />
-    <ClInclude Include="..\..\..\source\core\slang-destroyable.h" />
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h" />
     <ClInclude Include="..\..\..\source\core\slang-exception.h" />
     <ClInclude Include="..\..\..\source\core\slang-file-system.h" />
@@ -307,7 +304,6 @@
     <ClInclude Include="..\..\..\source\core\slang-http.h" />
     <ClInclude Include="..\..\..\source\core\slang-implicit-directory-collector.h" />
     <ClInclude Include="..\..\..\source\core\slang-io.h" />
-    <ClInclude Include="..\..\..\source\core\slang-lazy-castable-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-linked-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" />
@@ -355,8 +351,7 @@
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-blob.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-castable-list-impl.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-castable-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-castable.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-command-line.cpp" />
@@ -368,7 +363,6 @@
     <ClCompile Include="..\..\..\source\core\slang-http.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-implicit-directory-collector.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-io.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-file-system.cpp" />
diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters
index 72d5bb088..9ae64d433 100644
--- a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters
+++ b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters
@@ -30,13 +30,7 @@
     <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-list-impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-castable-util.h">
+    <ClInclude Include="..\..\..\source\core\slang-castable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-char-encode.h">
@@ -66,9 +60,6 @@
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-destroyable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -99,9 +90,6 @@
     <ClInclude Include="..\..\..\source\core\slang-io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-lazy-castable-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-linked-list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -239,10 +227,7 @@
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-castable-list-impl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-castable-util.cpp">
+    <ClCompile Include="..\..\..\source\core\slang-castable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-char-encode.cpp">
@@ -278,9 +263,6 @@
     <ClCompile Include="..\..\..\source\core\slang-io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-lazy-castable-list.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3