diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-04-29 09:01:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 09:01:46 -0400 |
| commit | 972bd3c4c24b06501c52127416afb763a066b8ad (patch) | |
| tree | e3874d4952ac557d5c323bb1e43be4584c100afc /source/slang/slang-preprocessor.cpp | |
| parent | 541d1cab81d895c406fc33cb476e37ce8a6a9702 (diff) | |
Support for escaped paths in tools (#1823)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Split out StringEscapeUtil.
* Added StringEscapeUtil.
* Fix typo in unix quoting type.
* Small comment improvements.
* Try to fix linux linking issue.
* Fix typo.
* Attempt to fix linux link issue.
* Update VS proj even though nothing really changed.
* Fix another typo issue.
* Fix for windows issue.
Fixed bug.
* Make separate Utils for escaping.
* Fix typo.
* Split out into StringEscapeHandler.
* Windows shell does handle removing quotes (so remove code to remove them).
* Handle unescaping if not initiating using the shell.
* Slight improvement around shell like decoding.
* Simplify command extraction.
* Add shared-library category type.
* Fix bug in command extraction.
* Typo in transcendental category.
* Enable unit-test on in smoke test category.
* Make parsing failing output as a failing test.
* Fixes for transcendental tests. Disable tests that do not work.
* Changed category parsing.
* Removed the TestResult parameter from _gatherTestsForFile.
Made testsList only output.
* Remove testing if all tests were disabled.
* Fix typo.
* Disable path canonical test on linux because CI issue.
Diffstat (limited to 'source/slang/slang-preprocessor.cpp')
| -rw-r--r-- | source/slang/slang-preprocessor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/slang/slang-preprocessor.cpp b/source/slang/slang-preprocessor.cpp index bc78e4d31..7bee5afd2 100644 --- a/source/slang/slang-preprocessor.cpp +++ b/source/slang/slang-preprocessor.cpp @@ -1051,9 +1051,8 @@ static void MaybeBeginMacroExpansion( // We need to escape to a string newToken.type = TokenType::StringLiteral; - buf.appendChar('"'); - StringUtil::appendEscaped(humaneSourceLoc.pathInfo.foundPath.getUnownedSlice(), buf); - buf.appendChar('"'); + auto escapeHandler = StringEscapeUtil::getHandler(StringEscapeUtil::Style::Cpp); + StringEscapeUtil::appendQuoted(escapeHandler, humaneSourceLoc.pathInfo.foundPath.getUnownedSlice(), buf); } // We are going to keep the actual text in the slice pool, so it stays in scope |