From 5fde038b1a6b3c8b335cd5b380c3ee8d15403052 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 31 Mar 2021 13:11:49 -0400 Subject: 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. --- source/core/slang-string-util.cpp | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) (limited to 'source/core/slang-string-util.cpp') diff --git a/source/core/slang-string-util.cpp b/source/core/slang-string-util.cpp index 6ce75f3f0..b4c767c87 100644 --- a/source/core/slang-string-util.cpp +++ b/source/core/slang-string-util.cpp @@ -445,4 +445,76 @@ SLANG_FORCE_INLINE static bool _isDigit(char c) return SLANG_OK; } +static char _getHexChar(int v) +{ + return (v <= 9) ? char(v + '0') : char(v - 10 + 'A'); +} + +static char _getEscapedChar(char c) +{ + switch (c) + { + case '\b': return 'b'; + case '\f': return 'f'; + case '\n': return 'n'; + case '\r': return 'r'; + case '\a': return 'a'; + case '\t': return 't'; + case '\v': return 'v'; + case '\'': return '\''; + case '\"': return '"'; + case '\\': return '\\'; + default: return 0; + } +} + +/* static */void StringUtil::appendEscaped(const UnownedStringSlice& slice, StringBuilder& out) +{ + const char* start = slice.begin(); + const char* cur = start; + const char*const end = slice.end(); + + for (; cur < end; ++cur) + { + const char c = *cur; + const char escapedChar = _getEscapedChar(c); + + if (escapedChar) + { + // Flush + if (start < cur) + { + out.append(start, end); + } + out.appendChar('\\'); + out.appendChar(escapedChar); + + start = cur + 1; + } + else if ( c < ' ' || c > 126) + { + // Flush + if (start < cur) + { + out.append(start, end); + } + + char buf[5] = "\\0x0"; + + buf[3] = _getHexChar((int(c) >> 4) & 0xf); + buf[4] = _getHexChar(c & 0xf); + + out.append(buf, buf + 4); + + start = cur + 1; + } + } + + if (start < end) + { + out.append(start, end); + } +} + + } // namespace Slang -- cgit v1.2.3