Added compiler-core project (#1775)

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

* Split out compiler-core initially with just slang-source-loc.cpp

* More lexer, name, token to compiler-core.

* Split Lexer and Core diagnostics.

* Move slang-file-system to core.

* Add slang-file-system to core.

* More DownstreamCompiler into compiler-core

* Fix typo.

* Add compiler-core to bootstrap proj.

* Small fixes to premake

* For linux try with compiler-core

* Remove compiler-core from examples.

* Added NameConventionUtil to compiler-core

* Add global function to CharUtil to *hopefully* avoid linking issue.

* Hack to make linkage of CharUtil work on linux.

7 files changed, 14 insertions, 137 deletions

diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj
index 2f48f93eb..648e296f3 100644
--- a/build/visual-studio/core/core.vcxproj
+++ b/build/visual-studio/core/core.vcxproj
@@ -183,11 +183,10 @@
     <ClInclude Include="..\..\..\source\core\slang-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h" />
-    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h" />
     <ClInclude Include="..\..\..\source\core\slang-exception.h" />
+    <ClInclude Include="..\..\..\source\core\slang-file-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-free-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-func-ptr.h" />
-    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-hash.h" />
     <ClInclude Include="..\..\..\source\core\slang-hex-dump-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-io.h" />
@@ -196,8 +195,6 @@
     <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-math.h" />
     <ClInclude Include="..\..\..\source\core\slang-memory-arena.h" />
-    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h" />
-    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h" />
     <ClInclude Include="..\..\..\source\core\slang-offset-container.h" />
     <ClInclude Include="..\..\..\source\core\slang-platform.h" />
     <ClInclude Include="..\..\..\source\core\slang-process-util.h" />
@@ -222,10 +219,8 @@
     <ClInclude Include="..\..\..\source\core\slang-type-traits.h" />
     <ClInclude Include="..\..\..\source\core\slang-uint-set.h" />
     <ClInclude Include="..\..\..\source\core\slang-virtual-object-pool.h" />
-    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-writer.h" />
     <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h" />
-    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp" />
@@ -233,15 +228,12 @@
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-free-list.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-io.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-platform.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-random-generator.cpp" />
@@ -260,11 +252,9 @@
     <ClCompile Include="..\..\..\source\core\slang-token-reader.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-type-text-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-writer.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-zip-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\..\..\source\core\core.natvis" />
diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters
index 5e63e4681..669b831a7 100644
--- a/build/visual-studio/core/core.vcxproj.filters
+++ b/build/visual-studio/core/core.vcxproj.filters
@@ -48,10 +48,10 @@
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h">
+    <ClInclude Include="..\..\..\source\core\slang-exception.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-exception.h">
+    <ClInclude Include="..\..\..\source\core\slang-file-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-free-list.h">
@@ -60,9 +60,6 @@
     <ClInclude Include="..\..\..\source\core\slang-func-ptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-hash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -87,12 +84,6 @@
     <ClInclude Include="..\..\..\source\core\slang-memory-arena.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-offset-container.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -165,18 +156,12 @@
     <ClInclude Include="..\..\..\source\core\slang-virtual-object-pool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-writer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp">
@@ -194,15 +179,12 @@
     <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp">
+    <ClCompile Include="..\..\..\source\core\slang-file-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-free-list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -215,12 +197,6 @@
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -275,9 +251,6 @@
     <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-writer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -287,9 +260,6 @@
     <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\..\..\source\core\core.natvis">
diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
index ff2403239..eef3ca1ac 100644
--- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
+++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
@@ -162,22 +162,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-file-system.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-lexer.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-name.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-token.h" />
     <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostic-defs.h" />
     <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-name.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-token.cpp" />
     <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.cpp" />
     <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-main.cpp" />
   </ItemGroup>
@@ -185,6 +173,9 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\compiler-core\compiler-core.vcxproj">
+      <Project>{12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
index 83789882f..56ba63ca4 100644
--- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
+++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
@@ -9,24 +9,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-file-system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-name.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostic-defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -35,24 +17,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-name.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj
index 27c64c7cb..07a1dd3ef 100644
--- a/build/visual-studio/slang-test/slang-test.vcxproj
+++ b/build/visual-studio/slang-test/slang-test.vcxproj
@@ -192,6 +192,9 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\compiler-core\compiler-core.vcxproj">
+      <Project>{12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index eb0a8e819..714c318de 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -217,7 +217,6 @@
     <ClInclude Include="..\..\..\source\slang\slang-emit-precedence.h" />
     <ClInclude Include="..\..\..\source\slang\slang-emit-source-writer.h" />
     <ClInclude Include="..\..\..\source\slang\slang-emit.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-file-system.h" />
     <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h" />
     <ClInclude Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.h" />
     <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h" />
@@ -275,12 +274,10 @@
     <ClInclude Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir.h" />
     <ClInclude Include="..\..\..\source\slang\slang-legalize-types.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-lexer.h" />
     <ClInclude Include="..\..\..\source\slang\slang-lookup.h" />
     <ClInclude Include="..\..\..\source\slang\slang-lower-to-ir.h" />
     <ClInclude Include="..\..\..\source\slang\slang-mangle.h" />
     <ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-name.h" />
     <ClInclude Include="..\..\..\source\slang\slang-options.h" />
     <ClInclude Include="..\..\..\source\slang\slang-parameter-binding.h" />
     <ClInclude Include="..\..\..\source\slang\slang-parser.h" />
@@ -302,10 +299,7 @@
     <ClInclude Include="..\..\..\source\slang\slang-serialize-types.h" />
     <ClInclude Include="..\..\..\source\slang\slang-serialize-value-type-info.h" />
     <ClInclude Include="..\..\..\source\slang\slang-serialize.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h" />
     <ClInclude Include="..\..\..\source\slang\slang-syntax.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-token-defs.h" />
-    <ClInclude Include="..\..\..\source\slang\slang-token.h" />
     <ClInclude Include="..\..\..\source\slang\slang-type-layout.h" />
     <ClInclude Include="..\..\..\source\slang\slang-type-system-shared.h" />
     <ClInclude Include="..\..\..\source\slang\slang-value-reflect.h" />
@@ -350,7 +344,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-emit-source-writer.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-emit-spirv.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-emit.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-include-system.cpp" />
@@ -407,12 +400,10 @@
     <ClCompile Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-lookup.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-mangle.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-name.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-options.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-parameter-binding.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-parser.cpp" />
@@ -430,11 +421,9 @@
     <ClCompile Include="..\..\..\source\slang\slang-serialize-source-loc.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-serialize-types.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-serialize.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-stdlib-api.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-stdlib.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-syntax.cpp" />
-    <ClCompile Include="..\..\..\source\slang\slang-token.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-type-system-shared.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp" />
@@ -452,6 +441,9 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\compiler-core\compiler-core.vcxproj">
+      <Project>{12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\miniz\miniz.vcxproj">
       <Project>{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}</Project>
     </ProjectReference>
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index e0eaa9f21..00b9a44c2 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -102,9 +102,6 @@
     <ClInclude Include="..\..\..\source\slang\slang-emit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-file-system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -276,9 +273,6 @@
     <ClInclude Include="..\..\..\source\slang\slang-legalize-types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-lookup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -291,9 +285,6 @@
     <ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-name.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -357,18 +348,9 @@
     <ClInclude Include="..\..\..\source\slang\slang-serialize.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-syntax.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-token-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\slang\slang-token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-type-layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -497,9 +479,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-emit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -668,9 +647,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-lookup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -683,9 +659,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-name.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -737,9 +710,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-serialize.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-stdlib-api.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -749,9 +719,6 @@
     <ClCompile Include="..\..\..\source\slang\slang-syntax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\slang\slang-token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>