diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-03-31 13:11:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 13:11:49 -0400 |
| commit | 5fde038b1a6b3c8b335cd5b380c3ee8d15403052 (patch) | |
| tree | 27975331c960edc405a5294031fd6a4a79eff964 /source/slang/slang-source-loc.cpp | |
| parent | 5fefb120e0c2469563e937f4ee39b391d7678cdf (diff) | |
Support for __LINE__ and __FILE__ in preprocessor (#1772)
* #include an absolute path didn't work - because paths were taken to always be relative.
* First pass support for __LINE__ and __FILE__.
* Test include handling with __FILE__
Fix diagnostic compare when input is empty.
* Fix some issues in preprocessor handling of special macros like __LINE__
Add a more complex test.
* Use CONCAT2 in tests, because preprocessor doesn't quite get parameter expansion correct.
* Make __FILE__ and __LINE__ behave more like Clang/Gcc.
* A test for preprocessor bug.
* Fix __LINE__ and __FILE__ in macro expansion, should be initiating location.
* Fix some comments.
* Small tidy up around builtin macros.
* Small improvements for macro type names.
Escape found paths.
Diffstat (limited to 'source/slang/slang-source-loc.cpp')
| -rw-r--r-- | source/slang/slang-source-loc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/slang/slang-source-loc.cpp b/source/slang/slang-source-loc.cpp index 3f9f8ad31..4b589fbf3 100644 --- a/source/slang/slang-source-loc.cpp +++ b/source/slang/slang-source-loc.cpp @@ -66,9 +66,9 @@ void PathInfo::appendDisplayName(StringBuilder& out) const case Type::FromString: case Type::FoundPath: { - // TODO(JS): We might want to escape the path here if necessary + out.appendChar('"'); - out << foundPath; + StringUtil::appendEscaped(foundPath.getUnownedSlice(), out); out.appendChar('"'); break; } |
