diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-05-25 20:58:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 20:58:43 -0400 |
| commit | 7d1b8ac13faf80ed56b37243480d097059da5aab (patch) | |
| tree | 6613b13983083d16b8945c6d92b1f4f1d1fb2501 /build/visual-studio/compiler-core | |
| parent | 89f67d9c626fa193dba4adafcb54e46b13aa5e98 (diff) | |
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.
Diffstat (limited to 'build/visual-studio/compiler-core')
| -rw-r--r-- | build/visual-studio/compiler-core/compiler-core.vcxproj | 5 | ||||
| -rw-r--r-- | build/visual-studio/compiler-core/compiler-core.vcxproj.filters | 15 |
2 files changed, 20 insertions, 0 deletions
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> |