From 9e666a332aafeffdc15ceab6017fe377144a928b Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 7 Dec 2021 12:26:48 -0500 Subject: Support array args for JSON-RPC (#2046) * #include an absolute path didn't work - because paths were taken to always be relative. * Add ability to send/receive JSON-RPC params optionally as an array. * More array conversions to json-native. * Simplified setting up of 'CallStyle' on JSONRPCConnection. * Small simplification in JSONRPCConnection. * Small improvements around JSON-RPC connection. * Improve some comments. Kick CI build. --- tools/slang-test/test-context.cpp | 2 +- tools/test-server/test-server-main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/slang-test/test-context.cpp b/tools/slang-test/test-context.cpp index 2f0e23815..d5af41a78 100644 --- a/tools/slang-test/test-context.cpp +++ b/tools/slang-test/test-context.cpp @@ -128,7 +128,7 @@ SlangResult TestContext::_createJSONRPCConnection(RefPtr& out RefPtr connection = new HTTPPacketConnection(readStream, writeStream); RefPtr rpcConnection = new JSONRPCConnection; - SLANG_RETURN_ON_FAIL(rpcConnection->init(connection, process)); + SLANG_RETURN_ON_FAIL(rpcConnection->init(connection, JSONRPCConnection::CallStyle::Default, process)); out = rpcConnection; diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp index a32d8c542..b4eead664 100644 --- a/tools/test-server/test-server-main.cpp +++ b/tools/test-server/test-server-main.cpp @@ -371,7 +371,7 @@ SlangResult TestServer::_executeUnitTest(const JSONRPCCall& call) auto id = m_connection->getPersistentValue(call.id); TestServerProtocol::ExecuteUnitTestArgs args; - SLANG_RETURN_ON_FAIL(m_connection->toNativeOrSendError(call.params, &args, call.id)); + SLANG_RETURN_ON_FAIL(m_connection->toNativeArgsOrSendError(call.params, &args, call.id)); auto sink = m_connection->getSink(); @@ -443,7 +443,7 @@ SlangResult TestServer::_executeTool(const JSONRPCCall& call) TestServerProtocol::ExecuteToolTestArgs args; - SLANG_RETURN_ON_FAIL(m_connection->toNativeOrSendError(call.params, &args, id)); + SLANG_RETURN_ON_FAIL(m_connection->toNativeArgsOrSendError(call.params, &args, id)); auto sink = m_connection->getSink(); -- cgit v1.2.3