summaryrefslogtreecommitdiffstats
path: root/source/compiler-core/slang-json-native.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-11-19 10:22:56 -0500
committerGitHub <noreply@github.com>2021-11-19 10:22:56 -0500
commit87eb789ae03cbd7a79d5433cefb37f10bec86753 (patch)
treedcf634615a59ba3a927e92e5597c2335f31b341a /source/compiler-core/slang-json-native.cpp
parent1d5f815b3964edee8a2d701e1a6cc078c89d677f (diff)
Improvements to JSON/RTTI (#2022)
* #include an absolute path didn't work - because paths were taken to always be relative. * Use 'Process' to communicate with an command line tool. * Remove slang-win-stream * Tidy up windows ProcessUtil. * First version of BufferedReadStream. * Windows working IPC for steams. * Test proxy count option. * Split Process/ProcessUtil. Process is platform dependant. ProcessUtil are functions that are platform independent. * First implementation of Unix Process interface. * Unix process compiles on cygwin. * Fix typo in unix process. * Separate unix pipe stream error of invalid access, from pipe availability. * Fix in standard line extraction. * Make fd non blocking. * Fix issues with Windows Process streams. * Added UnixPipe. * Some fixes around UnixPipeStream. * Make a unix stream closed explicit. * Hack to debug linux process/stream. * Revert to old linux pipe handling. * Pass executable path for unit tests. Split out CommandLine into own source. * Small improvements in process/command line. * Check process behavior with crash. * Make stderr and stdout unbuffered for crash testing. * Only turn disable buffering in crash test. * Disable crash test on CI. * Fix crash on clang/linux. * Enable crash test. Remove _appendBuffer as can use StreamUtil functionality. * Added inital processing for http headers. * Small improvements to HttpHeader. * First pass HTTPPacketConnection working on windows. * Enable other Process communication tests. * Update comments. * WIP JSON RPC. * Add terminate to Process. Made JSONRPC a Util. * Small tidy up around HTTPPacketConnection. * Improve process termination options. * WIP for test-server. * Add diagnostics error handling to test-server. * Improved JSON support. Parsing/creating JSON-RPC messages. * WIP JSONRPC parsing. * First pass RttiInfo support. * WIP converting between JSON/native types. * Project files. * Split out RttiUtil. Made RttiInfo constuction thread safe. * WIP RTTI<->JSON. * Add diagnostics to JSON<->native conversions. * Make RttiInfo for structs globals. Avoids problem around derived types (like pointers), being able to cause an abort. * Add pointer support to RTTI. Fixed some compilation issues on linux. * Add fixed array support. * Added Rtti unit test. * Add rtti unit test. * Split out quoted/unquoted key handling. Fix bugs in JSON value/container. Added JSON native test. * Make default array allocator use malloc/free. Remove the new[] handler (doesn't work on visuals studio). * Fix for linux warning. * Remove some test code. * Fix issues on x86 win. * Fix warning on aarch64. * Fix some bugs in JSON parsing/handling. Make Rtti work copy/dtor/ctor struct types. * Testing JSON<->native with fixed array. Make makeArrayView explicit if it's just a single value. Added array type. * Fix getting arrayView. * Improve JSON diagnostic name.
Diffstat (limited to 'source/compiler-core/slang-json-native.cpp')
-rw-r--r--source/compiler-core/slang-json-native.cpp46
1 files changed, 46 insertions, 0 deletions
diff --git a/source/compiler-core/slang-json-native.cpp b/source/compiler-core/slang-json-native.cpp
index 5b2fb5db4..9c972eba3 100644
--- a/source/compiler-core/slang-json-native.cpp
+++ b/source/compiler-core/slang-json-native.cpp
@@ -203,6 +203,33 @@ SlangResult JSONToNativeConverter::convert(const JSONValue& in, const RttiInfo*
return SLANG_OK;
}
+ case RttiInfo::Kind::FixedArray:
+ {
+ if (in.getKind() != JSONValue::Kind::Array)
+ {
+ return SLANG_FAIL;
+ }
+ const FixedArrayRttiInfo* fixedArrayRttiInfo = static_cast<const FixedArrayRttiInfo*>(rttiInfo);
+ const auto elementType = fixedArrayRttiInfo->m_elementType;
+ const Index elementCount = Index(fixedArrayRttiInfo->m_elementCount);
+ const auto elementSize = elementType->m_size;
+
+ auto srcArray = m_container->getArray(in);
+
+ if (srcArray.getCount() > elementCount)
+ {
+ m_sink->diagnose(in.loc, JSONDiagnostics::tooManyElementsForArray, srcArray.getCount(), elementCount);
+ return SLANG_FAIL;
+ }
+
+ Byte* dstEles = (Byte*)out;
+ for (Index i = 0; i < elementCount; ++i, dstEles += elementSize)
+ {
+ SLANG_RETURN_ON_FAIL(convert(srcArray[i], elementType, dstEles));
+ }
+
+ return SLANG_OK;
+ }
case RttiInfo::Kind::Dictionary:
{
// We can *only* serialize this into a straight JSON object iff the key is a string-like type
@@ -341,6 +368,25 @@ SlangResult NativeToJSONConverter::convert(const RttiInfo* rttiInfo, const void*
out = m_container->createArray(dstValues.getBuffer(), count);
return SLANG_OK;
}
+ case RttiInfo::Kind::FixedArray:
+ {
+ const FixedArrayRttiInfo* fixedArrayRttiInfo = static_cast<const FixedArrayRttiInfo*>(rttiInfo);
+ const auto elementType = fixedArrayRttiInfo->m_elementType;
+ const auto elementCount = Index(fixedArrayRttiInfo->m_elementCount);
+ const auto elementSize = elementType->m_size;
+
+ List<JSONValue> dstValues;
+ dstValues.setCount(elementCount);
+
+ const Byte* src = (const Byte*)in;
+ for (Index i = 0; i < elementCount; ++i, src += elementSize)
+ {
+ SLANG_RETURN_ON_FAIL(convert(elementType, src, dstValues[i]));
+ }
+
+ out = m_container->createArray(dstValues.getBuffer(), elementCount);
+ return SLANG_OK;
+ }
case RttiInfo::Kind::Dictionary:
{
const DictionaryRttiInfo* listRttiInfo = static_cast<const DictionaryRttiInfo*>(rttiInfo);