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 --- tests/diagnostics/variable-redeclaration.slang.expected | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests/diagnostics/variable-redeclaration.slang.expected') diff --git a/tests/diagnostics/variable-redeclaration.slang.expected b/tests/diagnostics/variable-redeclaration.slang.expected index d49c4512f..03bed580b 100644 --- a/tests/diagnostics/variable-redeclaration.slang.expected +++ b/tests/diagnostics/variable-redeclaration.slang.expected @@ -1,14 +1,24 @@ result code = -1 standard error = { tests/diagnostics/variable-redeclaration.slang(14): error 30200: declaration of 'gA' conflicts with existing declaration +static Texture2D gA; + ^~ tests/diagnostics/variable-redeclaration.slang(12): note: see previous declaration of 'gA' tests/diagnostics/variable-redeclaration.slang(44): error 30200: declaration of 'f' conflicts with existing declaration + float f; + ^ tests/diagnostics/variable-redeclaration.slang(43): note: see previous declaration of 'f' tests/diagnostics/variable-redeclaration.slang(51): error 30200: declaration of 'size' conflicts with existing declaration + float size) + ^~~~ tests/diagnostics/variable-redeclaration.slang(50): note: see previous declaration of 'size' tests/diagnostics/variable-redeclaration.slang(21): error 30200: declaration of 'y' conflicts with existing declaration + int y = x; + ^ tests/diagnostics/variable-redeclaration.slang(20): note: see previous declaration of 'y' tests/diagnostics/variable-redeclaration.slang(53): error 39999: ambiguous reference to 'size' + return size; + ^~~~ tests/diagnostics/variable-redeclaration.slang(51): note 39999: candidate: size tests/diagnostics/variable-redeclaration.slang(50): note 39999: candidate: size } -- cgit v1.2.3