From 7d1b8ac13faf80ed56b37243480d097059da5aab Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 25 May 2021 20:58:43 -0400
Subject: JSON Lexing and string encoding/decoding (#1858)

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

* WIP Json lexer.

* Check JSON Lex with unit test

* Add JSON escaping/unescaping of strings.

* Big fix encoding/decoding.

* Fix typo in JSON diagnostics.

* Fix typo.

* Better float testing.
---
 build/visual-studio/compiler-core/compiler-core.vcxproj   |  5 +++++
 .../compiler-core/compiler-core.vcxproj.filters           | 15 +++++++++++++++
 build/visual-studio/slang-test/slang-test.vcxproj         |  1 +
 build/visual-studio/slang-test/slang-test.vcxproj.filters |  3 +++
 4 files changed, 24 insertions(+)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj
index e6883900c..7d2ac6afa 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj
@@ -179,6 +179,9 @@
     <ClInclude Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-glslang-compiler.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-include-system.h" />
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-diagnostic-defs.h" />
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-diagnostics.h" />
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-lexer.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-lexer-diagnostic-defs.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-lexer.h" />
     <ClInclude Include="..\..\..\source\compiler-core\slang-misc-diagnostic-defs.h" />
@@ -201,6 +204,8 @@
     <ClCompile Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-glslang-compiler.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-include-system.cpp" />
+    <ClCompile Include="..\..\..\source\compiler-core\slang-json-diagnostics.cpp" />
+    <ClCompile Include="..\..\..\source\compiler-core\slang-json-lexer.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-lexer.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-name-convention-util.cpp" />
     <ClCompile Include="..\..\..\source\compiler-core\slang-name.cpp" />
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
index d35f9941c..243eecd5b 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
@@ -36,6 +36,15 @@
     <ClInclude Include="..\..\..\source\compiler-core\slang-include-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-diagnostic-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-diagnostics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\compiler-core\slang-json-lexer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\compiler-core\slang-lexer-diagnostic-defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -98,6 +107,12 @@
     <ClCompile Include="..\..\..\source\compiler-core\slang-include-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\compiler-core\slang-json-diagnostics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\compiler-core\slang-json-lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\source\compiler-core\slang-lexer.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 24d2f2ac1..22a8aae5f 100644
--- a/build/visual-studio/slang-test/slang-test.vcxproj
+++ b/build/visual-studio/slang-test/slang-test.vcxproj
@@ -183,6 +183,7 @@
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-compression.cpp" />
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-find-type-by-name.cpp" />
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-free-list.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-json.cpp" />
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-memory-arena.cpp" />
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-path.cpp" />
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-riff.cpp" />
diff --git a/build/visual-studio/slang-test/slang-test.vcxproj.filters b/build/visual-studio/slang-test/slang-test.vcxproj.filters
index 9b7138eef..1e5b6e4af 100644
--- a/build/visual-studio/slang-test/slang-test.vcxproj.filters
+++ b/build/visual-studio/slang-test/slang-test.vcxproj.filters
@@ -68,6 +68,9 @@
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-free-list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-json.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\tools\slang-test\unit-test-memory-arena.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3