From efa2c8f41aa5cd2c27990fd9b57ea0eff06976e7 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 21 Dec 2018 11:00:28 -0500 Subject: Feature/remove app context (#765) * Remove AppContext. Use StdChannels to hold writers, and TestToolUtil to hold test tool specific functionality. * StdChannels -> StdWriters * getStdOut -> getOut, getStdError -> getError --- tools/slang-test/slangc-tool.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/slang-test/slangc-tool.cpp') diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp index 3085e2ab5..bf1bb8c28 100644 --- a/tools/slang-test/slangc-tool.cpp +++ b/tools/slang-test/slangc-tool.cpp @@ -7,19 +7,19 @@ SLANG_API void spSetCommandLineCompilerMode(SlangCompileRequest* request); static void _diagnosticCallback(char const* message, void* /*userData*/) { - auto stdError = AppContext::getStdError(); + auto stdError = StdWriters::getError(); stdError.put(message); stdError.flush(); } -SlangResult SlangCTool::innerMain(AppContext* appContext, SlangSession* session, int argc, const char*const* argv) +SlangResult SlangCTool::innerMain(StdWriters* stdWriters, SlangSession* session, int argc, const char*const* argv) { SlangCompileRequest* compileRequest = spCreateCompileRequest(session); spSetDiagnosticCallback(compileRequest, &_diagnosticCallback, nullptr); spSetCommandLineCompilerMode(compileRequest); // Do any app specific configuration - appContext->configureRequest(compileRequest); + stdWriters->setRequestWriters(compileRequest); { const SlangResult res = spProcessCommandLineArguments(compileRequest, &argv[1], argc - 1); @@ -45,7 +45,7 @@ SlangResult SlangCTool::innerMain(AppContext* appContext, SlangSession* session, #ifndef _DEBUG catch (Exception & e) { - AppContext::getStdOut().print("internal compiler error: %S\n", e.Message.ToWString().begin()); + StdWriters::getOut().print("internal compiler error: %S\n", e.Message.ToWString().begin()); res = SLANG_FAIL; } #endif -- cgit v1.2.3