diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-04-01 13:39:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 10:39:11 -0700 |
| commit | fa31d21ba92669a521a7768467246918e3947e02 (patch) | |
| tree | af98a593e24bc6309ac4d11a59562be4b22c93d7 /tools | |
| parent | 3f1632a1450a5879f337b4bd178e48880cd583f8 (diff) | |
Added compiler-core project (#1775)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Split out compiler-core initially with just slang-source-loc.cpp
* More lexer, name, token to compiler-core.
* Split Lexer and Core diagnostics.
* Move slang-file-system to core.
* Add slang-file-system to core.
* More DownstreamCompiler into compiler-core
* Fix typo.
* Add compiler-core to bootstrap proj.
* Small fixes to premake
* For linux try with compiler-core
* Remove compiler-core from examples.
* Added NameConventionUtil to compiler-core
* Add global function to CharUtil to *hopefully* avoid linking issue.
* Hack to make linkage of CharUtil work on linux.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/slang-cpp-extractor/slang-cpp-extractor-main.cpp | 12 | ||||
| -rw-r--r-- | tools/slang-test/parse-diagnostic-util.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/parse-diagnostic-util.h | 3 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 14 | ||||
| -rw-r--r-- | tools/slang-test/test-context.h | 3 |
5 files changed, 17 insertions, 17 deletions
diff --git a/tools/slang-cpp-extractor/slang-cpp-extractor-main.cpp b/tools/slang-cpp-extractor/slang-cpp-extractor-main.cpp index a2fd4cb25..d7928d953 100644 --- a/tools/slang-cpp-extractor/slang-cpp-extractor-main.cpp +++ b/tools/slang-cpp-extractor/slang-cpp-extractor-main.cpp @@ -13,13 +13,13 @@ #include "../../source/core/slang-io.h" #include "../../source/core/slang-string-slice-pool.h" #include "../../source/core/slang-writer.h" -#include "../../source/core/slang-name-convention-util.h" +#include "../../source/core/slang-file-system.h" -#include "../../source/slang/slang-source-loc.h" -#include "../../source/slang/slang-lexer.h" -#include "../../source/slang/slang-diagnostics.h" -#include "../../source/slang/slang-file-system.h" -#include "../../source/slang/slang-name.h" +#include "../../source/compiler-core/slang-name-convention-util.h" +#include "../../source/compiler-core/slang-source-loc.h" +#include "../../source/compiler-core/slang-lexer.h" +#include "../../source/compiler-core/slang-diagnostic-sink.h" +#include "../../source/compiler-core/slang-name.h" #include "slang-cpp-extractor-diagnostics.h" diff --git a/tools/slang-test/parse-diagnostic-util.cpp b/tools/slang-test/parse-diagnostic-util.cpp index db16d0c7e..6e4eefab8 100644 --- a/tools/slang-test/parse-diagnostic-util.cpp +++ b/tools/slang-test/parse-diagnostic-util.cpp @@ -11,7 +11,7 @@ #include "../../source/core/slang-byte-encode-util.h" #include "../../source/core/slang-char-util.h" -#include "../../source/core/slang-downstream-compiler.h" +#include "../../source/compiler-core/slang-downstream-compiler.h" using namespace Slang; diff --git a/tools/slang-test/parse-diagnostic-util.h b/tools/slang-test/parse-diagnostic-util.h index 13d1bdf70..07df7a14d 100644 --- a/tools/slang-test/parse-diagnostic-util.h +++ b/tools/slang-test/parse-diagnostic-util.h @@ -4,9 +4,10 @@ #define PARSE_DIAGNOSTIC_UTIL_H #include "../../source/core/slang-string-util.h" -#include "../../source/core/slang-downstream-compiler.h" #include "../../source/core/slang-string.h" +#include "../../source/compiler-core/slang-downstream-compiler.h" + #include "../../slang-com-ptr.h" struct ParseDiagnosticUtil diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 8586ed108..cac852b51 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -11,22 +11,18 @@ #include "../../source/core/slang-string-util.h" #include "../../source/core/slang-byte-encode-util.h" #include "../../source/core/slang-char-util.h" - -using namespace Slang; +#include "../../source/core/slang-process-util.h" +#include "../../source/core/slang-render-api-util.h" #include "directory-util.h" -#include "../../source/core/slang-render-api-util.h" #include "test-context.h" #include "test-reporter.h" #include "options.h" #include "slangc-tool.h" #include "parse-diagnostic-util.h" -#include "../../source/core/slang-downstream-compiler.h" - -#include "../../source/core/slang-nvrtc-compiler.h" - -#include "../../source/core/slang-process-util.h" +#include "../../source/compiler-core/slang-downstream-compiler.h" +#include "../../source/compiler-core/slang-nvrtc-compiler.h" #define STB_IMAGE_IMPLEMENTATION #include "external/stb/stb_image.h" @@ -39,6 +35,8 @@ using namespace Slang; #define SLANG_PRELUDE_NAMESPACE CPPPrelude #include "../../prelude/slang-cpp-types.h" +using namespace Slang; + // Options for a particular test struct TestOptions { diff --git a/tools/slang-test/test-context.h b/tools/slang-test/test-context.h index 46a42f3fa..a4b92790b 100644 --- a/tools/slang-test/test-context.h +++ b/tools/slang-test/test-context.h @@ -9,7 +9,8 @@ #include "../../source/core/slang-dictionary.h" #include "../../source/core/slang-test-tool-util.h" #include "../../source/core/slang-render-api-util.h" -#include "../../source/core/slang-downstream-compiler.h" + +#include "../../source/compiler-core/slang-downstream-compiler.h" #include "../../slang-com-ptr.h" |
