From 369279e91dde1b056d8d0e3bb83e7ba3f96321af Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 12 Feb 2021 14:31:56 -0500 Subject: Diagnostic location highlighting (#1700) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP: First pass in supporting output of line error information. * Add support for lexing to better be able to indicate SourceLocation information. * Fix lexer usage in DiagnosticSink in C++ extractor. * Update diagnostics tests to have line location info. * Fixed test expected output that now have source location information in them. * Better handling of tab. * Fix test expected results for tabbing change. * DiagnosticLexer -> DiagnosticSink::SourceLocationLexer Added line continuation tests. * Fix typo. * Added String::appendRepeatedChar * Change to rerun tests. Co-authored-by: Tim Foley --- source/core/slang-string.cpp | 12 ++++++++++++ source/core/slang-string.h | 7 +++++++ 2 files changed, 19 insertions(+) (limited to 'source/core') diff --git a/source/core/slang-string.cpp b/source/core/slang-string.cpp index 4b1ec4c84..a7374d8ba 100644 --- a/source/core/slang-string.cpp +++ b/source/core/slang-string.cpp @@ -362,6 +362,18 @@ namespace Slang } } + void String::appendRepeatedChar(char chr, Index count) + { + SLANG_ASSERT(count >= 0); + if (count > 0) + { + char* chars = prepareForAppend(count); + // Set all space to repeated chr. + ::memset(chars, chr, sizeof(char) * count); + appendInPlace(chars, count); + } + } + void String::appendChar(char c) { const auto oldLength = getLength(); diff --git a/source/core/slang-string.h b/source/core/slang-string.h index e57718d40..3fb184ac7 100644 --- a/source/core/slang-string.h +++ b/source/core/slang-string.h @@ -100,6 +100,10 @@ namespace Slang { return slice.m_begin >= m_begin && slice.m_end <= m_end; } + bool isMemoryContained(const char* pos) const + { + return pos >= m_begin && pos <= m_end; + } Index getLength() const { @@ -439,6 +443,9 @@ namespace Slang /// Append a character (to remove ambiguity with other integral types) void appendChar(char chr); + /// Append the specified char count times + void appendRepeatedChar(char chr, Index count); + String(const char* str) { append(str); -- cgit v1.2.3