From c51f1e27f0e307a80a57a840b2337e3226b3c2be Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 16 Nov 2021 08:54:55 -0500 Subject: Support around JSON-RPC (#2014) * #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. Co-authored-by: Yong He --- source/compiler-core/slang-json-rpc.cpp | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 source/compiler-core/slang-json-rpc.cpp (limited to 'source/compiler-core/slang-json-rpc.cpp') diff --git a/source/compiler-core/slang-json-rpc.cpp b/source/compiler-core/slang-json-rpc.cpp new file mode 100644 index 000000000..15da92ff0 --- /dev/null +++ b/source/compiler-core/slang-json-rpc.cpp @@ -0,0 +1,48 @@ +#include "slang-json-rpc.h" + +namespace Slang { + +// https://www.jsonrpc.org/specification + +// m_sourceManager.initialize(nullptr, nullptr); +// m_diagnosticSink.init(&m_sourceManager, &JSONLexer::calcLexemeLocation); + +/* static */SlangResult JSONRPCUtil::parseJSON(const UnownedStringSlice& slice, JSONContainer* container, DiagnosticSink* sink, JSONValue& outValue) +{ + SourceManager* sourceManager = sink->getSourceManager(); + + // Now need to parse as JSON + String contents(slice); + SourceFile* sourceFile = sourceManager->createSourceFileWithString(PathInfo::makeUnknown(), contents); + SourceView* sourceView = sourceManager->createSourceView(sourceFile, nullptr, SourceLoc()); + + JSONLexer lexer; + lexer.init(sourceView, sink); + + JSONBuilder builder(container); + + JSONParser parser; + SLANG_RETURN_ON_FAIL(parser.parse(&lexer, sourceView, &builder, sink)); + + outValue = builder.getRootValue(); + return SLANG_OK; +} + +SlangResult JSONRPCUtil::parseJSONAndConsume(HTTPPacketConnection* connection, JSONContainer* container, DiagnosticSink* sink, JSONValue& outValue) +{ + if (!connection->hasContent()) + { + return SLANG_FAIL; + } + + auto content = connection->getContent(); + + UnownedStringSlice text((const char*)content.begin(), content.getCount()); + SlangResult res = parseJSON(text, container, sink, outValue); + + // Consume the content + connection->consumeContent(); + return res; +} + +} // namespace Slang -- cgit v1.2.3