From d74b8f0497f3e7109e4e70e63863d0e3375249fb Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 21 Aug 2023 16:59:18 -0700 Subject: [PATCH] Fix diagnostic messages that don't end in a period. (#3127) --- toolchain/semantics/semantics_context.cpp | 5 +++-- .../semantics/testdata/array/fail_undefined_bound.carbon | 2 +- toolchain/semantics/testdata/basics/fail_name_lookup.carbon | 2 +- toolchain/semantics/testdata/if/fail_scope.carbon | 2 +- .../semantics/testdata/index/fail_name_not_found.carbon | 2 +- .../semantics/testdata/index/fail_negative_indexing.carbon | 2 +- .../testdata/namespace/fail_unresolved_scope.carbon | 2 +- .../testdata/struct/fail_access_into_invalid.carbon | 2 +- toolchain/semantics/testdata/var/fail_init_with_self.carbon | 2 +- .../semantics/testdata/var/fail_lookup_outside_scope.carbon | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/toolchain/semantics/semantics_context.cpp b/toolchain/semantics/semantics_context.cpp index c7281a20fe12..8b5a134ae137 100644 --- a/toolchain/semantics/semantics_context.cpp +++ b/toolchain/semantics/semantics_context.cpp @@ -44,7 +44,8 @@ SemanticsContext::SemanticsContext(const TokenizedBuffer& tokens, auto SemanticsContext::TODO(ParseTree::Node parse_node, std::string label) -> bool { - CARBON_DIAGNOSTIC(SemanticsTodo, Error, "Semantics TODO: {0}", std::string); + CARBON_DIAGNOSTIC(SemanticsTodo, Error, "Semantics TODO: `{0}`.", + std::string); emitter_->Emit(parse_node, SemanticsTodo, std::move(label)); return false; } @@ -91,7 +92,7 @@ auto SemanticsContext::DiagnoseDuplicateName(ParseTree::Node parse_node, auto SemanticsContext::DiagnoseNameNotFound(ParseTree::Node parse_node, SemanticsStringId name_id) -> void { - CARBON_DIAGNOSTIC(NameNotFound, Error, "Name `{0}` not found", + CARBON_DIAGNOSTIC(NameNotFound, Error, "Name `{0}` not found.", llvm::StringRef); emitter_->Emit(parse_node, NameNotFound, semantics_ir_->GetString(name_id)); } diff --git a/toolchain/semantics/testdata/array/fail_undefined_bound.carbon b/toolchain/semantics/testdata/array/fail_undefined_bound.carbon index 658436b51d57..15d4403f8803 100644 --- a/toolchain/semantics/testdata/array/fail_undefined_bound.carbon +++ b/toolchain/semantics/testdata/array/fail_undefined_bound.carbon @@ -4,7 +4,7 @@ // // AUTOUPDATE -// CHECK:STDERR: fail_undefined_bound.carbon:[[@LINE+3]]:14: Semantics TODO: HandleArrayExpressionWithoutBounds +// CHECK:STDERR: fail_undefined_bound.carbon:[[@LINE+3]]:14: Semantics TODO: `HandleArrayExpressionWithoutBounds`. // CHECK:STDERR: var a: [i32; ]; // CHECK:STDERR: ^ var a: [i32; ]; diff --git a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon index e5cb40f76702..950b2d732164 100644 --- a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon @@ -5,7 +5,7 @@ // AUTOUPDATE fn Main() { - // CHECK:STDERR: fail_name_lookup.carbon:[[@LINE+3]]:3: Name `x` not found + // CHECK:STDERR: fail_name_lookup.carbon:[[@LINE+3]]:3: Name `x` not found. // CHECK:STDERR: x; // CHECK:STDERR: ^ x; diff --git a/toolchain/semantics/testdata/if/fail_scope.carbon b/toolchain/semantics/testdata/if/fail_scope.carbon index 4330b88698e5..c153ef49f60a 100644 --- a/toolchain/semantics/testdata/if/fail_scope.carbon +++ b/toolchain/semantics/testdata/if/fail_scope.carbon @@ -9,7 +9,7 @@ fn VarScope(b: bool) -> i32 { var n: i32 = 2; return n; } - // CHECK:STDERR: fail_scope.carbon:[[@LINE+3]]:10: Name `n` not found + // CHECK:STDERR: fail_scope.carbon:[[@LINE+3]]:10: Name `n` not found. // CHECK:STDERR: return n; // CHECK:STDERR: ^ return n; diff --git a/toolchain/semantics/testdata/index/fail_name_not_found.carbon b/toolchain/semantics/testdata/index/fail_name_not_found.carbon index f437b5147cc8..f212e9a41e13 100644 --- a/toolchain/semantics/testdata/index/fail_name_not_found.carbon +++ b/toolchain/semantics/testdata/index/fail_name_not_found.carbon @@ -5,7 +5,7 @@ // AUTOUPDATE fn Main() { - // CHECK:STDERR: fail_name_not_found.carbon:[[@LINE+3]]:16: Name `a` not found + // CHECK:STDERR: fail_name_not_found.carbon:[[@LINE+3]]:16: Name `a` not found. // CHECK:STDERR: var b: i32 = a[0]; // CHECK:STDERR: ^ var b: i32 = a[0]; diff --git a/toolchain/semantics/testdata/index/fail_negative_indexing.carbon b/toolchain/semantics/testdata/index/fail_negative_indexing.carbon index fab912197d3f..9de914e4612b 100644 --- a/toolchain/semantics/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/semantics/testdata/index/fail_negative_indexing.carbon @@ -5,7 +5,7 @@ // AUTOUPDATE var a: (i32, i32) = (12, 6); -// CHECK:STDERR: fail_negative_indexing.carbon:[[@LINE+3]]:16: Semantics TODO: Handle - +// CHECK:STDERR: fail_negative_indexing.carbon:[[@LINE+3]]:16: Semantics TODO: `Handle -`. // CHECK:STDERR: var b: i32 = a[-10]; // CHECK:STDERR: ^ var b: i32 = a[-10]; diff --git a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon index 65d91e8df725..2f499ff85456 100644 --- a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon @@ -4,7 +4,7 @@ // // AUTOUPDATE -// CHECK:STDERR: fail_unresolved_scope.carbon:[[@LINE+3]]:4: Name `Foo` not found +// CHECK:STDERR: fail_unresolved_scope.carbon:[[@LINE+3]]:4: Name `Foo` not found. // CHECK:STDERR: fn Foo.Baz() { // CHECK:STDERR: ^ fn Foo.Baz() { diff --git a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon index f722190e7ea0..f07adf238ed6 100644 --- a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon @@ -5,7 +5,7 @@ // AUTOUPDATE -// CHECK:STDERR: fail_access_into_invalid.carbon:[[@LINE+3]]:10: Name `a` not found +// CHECK:STDERR: fail_access_into_invalid.carbon:[[@LINE+3]]:10: Name `a` not found. // CHECK:STDERR: fn F() { a.b; } // CHECK:STDERR: ^ fn F() { a.b; } diff --git a/toolchain/semantics/testdata/var/fail_init_with_self.carbon b/toolchain/semantics/testdata/var/fail_init_with_self.carbon index 71b38ba05f23..35521e4842ee 100644 --- a/toolchain/semantics/testdata/var/fail_init_with_self.carbon +++ b/toolchain/semantics/testdata/var/fail_init_with_self.carbon @@ -5,7 +5,7 @@ // AUTOUPDATE fn Main() { - // CHECK:STDERR: fail_init_with_self.carbon:[[@LINE+3]]:16: Name `x` not found + // CHECK:STDERR: fail_init_with_self.carbon:[[@LINE+3]]:16: Name `x` not found. // CHECK:STDERR: var x: i32 = x; // CHECK:STDERR: ^ var x: i32 = x; diff --git a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon index 5d4630c3eb40..79e6380bea2a 100644 --- a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon @@ -8,7 +8,7 @@ fn Main() { var x: i32; } -// CHECK:STDERR: fail_lookup_outside_scope.carbon:[[@LINE+3]]:14: Name `x` not found +// CHECK:STDERR: fail_lookup_outside_scope.carbon:[[@LINE+3]]:14: Name `x` not found. // CHECK:STDERR: var y: i32 = x; // CHECK:STDERR: ^ var y: i32 = x;