From 34a1ff5226a526cc17c5baecd63637f69c324fc7 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Sat, 22 May 2021 16:03:30 -0400
Subject: 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.
---
 source/core/slang-token-reader.cpp | 9 ++++++---
 source/core/slang-token-reader.h   | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'source/core')

diff --git a/source/core/slang-token-reader.cpp b/source/core/slang-token-reader.cpp
index a15dcda9c..3be010751 100644
--- a/source/core/slang-token-reader.cpp
+++ b/source/core/slang-token-reader.cpp
@@ -1,7 +1,8 @@
 #include "slang-token-reader.h"
 
-namespace Slang
-{
+namespace Slang {
+namespace Misc {
+
     enum class TokenizeErrorType
     {
         InvalidCharacter, InvalidEscapeSequence
@@ -765,4 +766,6 @@ namespace Slang
         this->tokens = TokenizeText("", text);
         tokenPtr = 0;
     }
-}
+
+} // namespace Misc
+} // namespace Slang
diff --git a/source/core/slang-token-reader.h b/source/core/slang-token-reader.h
index 18b56f31f..0d59eea76 100644
--- a/source/core/slang-token-reader.h
+++ b/source/core/slang-token-reader.h
@@ -3,8 +3,9 @@
 
 #include "slang-basic.h"
 
-namespace Slang
-{
+namespace Slang {
+namespace Misc {
+
     /* NOTE! This TokenReader is NOT used by the main slang compiler !*/
 
     enum class TokenType
@@ -293,7 +294,9 @@ namespace Slang
             result.add(lastStr);
         return result;
     }
-}
+
+} // namespace Misc
+} // namespace Slang
 
 
 #endif
-- 
cgit v1.2.3