summaryrefslogtreecommitdiff
path: root/source/slang/slang-options.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-05-22 16:03:30 -0400
committerGitHub <noreply@github.com>2021-05-22 16:03:30 -0400
commit34a1ff5226a526cc17c5baecd63637f69c324fc7 (patch)
tree3bbaf2a2812bc121210d0b1142a303e6aab01a68 /source/slang/slang-options.cpp
parent7f8a9994d0bd99a171a1daa0bce46d92c02ccffd (diff)
Improvements in -X support (#1852)
* #include an absolute path didn't work - because paths were taken to always be relative. * Added SourceLoc handling for command line parsing. * Fix typo in debug. * Fix issue around the DiagnosticSink used in options parsing not having a writer available - by having DiagnosticSink parenting. * Small rename for clarity. * WIP extracting command line args for downstream tools. * Unit tests/bug fixes around extracting args. * Use DownstreamArgs in the EndToEndCompileRequest * Passing downstream compiler options downstream. * Fix issue with endToEndReq being nullptr. * Fix issue with diagnostics number change. * Small improvements to how the source line is displayed if it's too long. Default to 120, as suggested in previous review. * Make render test use x-args parsing and CommandArgReader. * Added missing diagnostics. * More DownstreamArgs to linkage so can be seen by 'components'. Added dxc-x-arg test. * Used combination of name and args instead of two Lists, which whilst equivalent was perhaps a little confusing. * Added documentation for -X support. * Added test for x-args parsing diagnostic. Improved diagnostic with list of known names. * Fix issues from merge. * Fix lookup for -matrix-layout-column-major in render test. * Remove commented out line.
Diffstat (limited to 'source/slang/slang-options.cpp')
-rw-r--r--source/slang/slang-options.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp
index f4cd2e4ef..00372ca3c 100644
--- a/source/slang/slang-options.cpp
+++ b/source/slang/slang-options.cpp
@@ -410,7 +410,7 @@ struct OptionsParser
DiagnosticSink* requestSink = requestImpl->getSink();
- CommandLineContext* cmdLineContext = requestImpl->m_downstreamArgs.getContext();
+ CommandLineContext* cmdLineContext = requestImpl->getLinkage()->m_downstreamArgs.getContext();
// Why create a new DiagnosticSink?
// We *don't* want the lexer that comes as default (it's for Slang source!)
@@ -437,9 +437,6 @@ struct OptionsParser
parseSink.setFlag(DiagnosticSink::Flag::SourceLocationLine);
}
- // We don't know how big the terminal is.. let's guess 120 for now
- parseSink.setSourceLineMaxLength(120);
-
// All diagnostics will also be sent to requestSink
parseSink.setParentSink(requestSink);
@@ -451,8 +448,11 @@ struct OptionsParser
// Doing so will allocate some SourceLoc space from the CommandLineContext.
args.setArgs(argv, argc);
- // Before we do anything else lets strip out all of the downstream arguments.
- SLANG_RETURN_ON_FAIL(requestImpl->m_downstreamArgs.stripDownstreamArgs(args, 0, sink));
+ {
+ auto linkage = requestImpl->getLinkage();
+ // Before we do anything else lets strip out all of the downstream arguments.
+ SLANG_RETURN_ON_FAIL(linkage->m_downstreamArgs.stripDownstreamArgs(args, 0, sink));
+ }
CommandLineReader reader(&args, sink);