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 --- source/slangc/main.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source/slangc/main.cpp') diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp index c2d64730a..ae15b7d49 100644 --- a/source/slangc/main.cpp +++ b/source/slangc/main.cpp @@ -5,8 +5,7 @@ SLANG_API void spSetCommandLineCompilerMode(SlangCompileRequest* request); #include "../core/slang-io.h" -#include "../core/slang-app-context.h" -#include "../core/slang-writer.h" +#include "../core/slang-test-tool-util.h" using namespace Slang; @@ -16,7 +15,7 @@ static void diagnosticCallback( char const* message, void* /*userData*/) { - auto stdError = AppContext::getStdError(); + auto stdError = StdWriters::getError(); stdError.put(message); stdError.flush(); } @@ -27,9 +26,9 @@ static void diagnosticCallback( #define MAIN main #endif -SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(AppContext* appContext, SlangSession* session, int argc, const char*const* argv) +SLANG_TEST_TOOL_API SlangResult innerMain(StdWriters* stdWriters, SlangSession* session, int argc, const char*const* argv) { - AppContext::setSingleton(appContext); + StdWriters::setSingleton(stdWriters); SlangCompileRequest* compileRequest = spCreateCompileRequest(session); @@ -41,7 +40,7 @@ SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(AppContext* appContext, Slan spSetCommandLineCompilerMode(compileRequest); // Do any app specific configuration - appContext->configureRequest(compileRequest); + stdWriters->setRequestWriters(compileRequest); char const* appName = "slangc"; if (argc > 0) appName = argv[0]; @@ -70,7 +69,7 @@ SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(AppContext* appContext, Slan #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 @@ -85,10 +84,10 @@ int MAIN(int argc, char** argv) SlangResult res; { SlangSession* session = spCreateSession(nullptr); - res = innerMain(AppContext::initDefault(), session, argc, argv); + res = innerMain(StdWriters::initDefault(), session, argc, argv); spDestroySession(session); } - return AppContext::getReturnCode(res); + return TestToolUtil::getReturnCode(res); } #ifdef _WIN32 -- cgit v1.2.3