carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 12:01:05 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Move diagnostic kind name to the end of the diagnostic. (#4437)

Browse Source 
Also surround it in square brackets rather than parentheses. This
matches the format used by Clang and GCC, and means diagnostics will
still match the `file:line:col: error: ` pattern used by some IDE tools.

Before:
```console
fail_builtins.carbon:11:11: error(AliasRequiresNameRef): alias initializer must be a name reference
```

After:
```console
fail_builtins.carbon:11:11: error: alias initializer must be a name reference [AliasRequiresNameRef]
```

Also tighten up test regex to only match on `STDERR` lines that list a
file name.
This commit is contained in:
Richard Smith
2024-10-23 16:56:23 +00:00
committed by GitHub
parent f206072216
commit 2e63da1a40
528 changed files with 1929 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/testdata/pointer/fail_pointer_type_in_expr.carbon
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/pointer/fail_pointer_type_in_expr.carbon
fn F() -> i32 {
// CHECK:STDERR: fail_pointer_type_in_expr.carbon:[[@LINE+3]]:14: error(OperatorRequiresParentheses): parentheses are required to disambiguate operator precedence
// CHECK:STDERR: fail_pointer_type_in_expr.carbon:[[@LINE+3]]:14: error: parentheses are required to disambiguate operator precedence [OperatorRequiresParentheses]
// CHECK:STDERR: return *i32*;
// CHECK:STDERR: ^
return *i32*;
toolchain/parse/testdata/pointer/fail_tuple_instead_of_compound_member_access.carbon
Vendored
+8 -8
View File
@@ -9,49 +9,49 @@
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/pointer/fail_tuple_instead_of_compound_member_access.carbon
fn F() {
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:6: error(ExpectedExpr): expected expression
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:6: error: expected expression [ExpectedExpr]
// CHECK:STDERR: x.();
// CHECK:STDERR: ^
// CHECK:STDERR:
x.();
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: y.(1,);
// CHECK:STDERR: ^
// CHECK:STDERR:
y.(1,);
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: z.(a, b);
// CHECK:STDERR: ^
// CHECK:STDERR:
z.(a, b);
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: w.(c d e ());
// CHECK:STDERR: ^
// CHECK:STDERR:
w.(c d e ());
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error(ExpectedExpr): expected expression
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:7: error: expected expression [ExpectedExpr]
// CHECK:STDERR: v->();
// CHECK:STDERR: ^
// CHECK:STDERR:
v->();
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: u->(f,);
// CHECK:STDERR: ^
// CHECK:STDERR:
u->(f,);
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+4]]:8: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: t->(2, 3);
// CHECK:STDERR: ^
// CHECK:STDERR:
t->(2, 3);
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+3]]:9: error(UnexpectedTokenInCompoundMemberAccess): expected `)`
// CHECK:STDERR: fail_tuple_instead_of_compound_member_access.carbon:[[@LINE+3]]:9: error: expected `)` [UnexpectedTokenInCompoundMemberAccess]
// CHECK:STDERR: s->(g h i ());
// CHECK:STDERR: ^
s->(g h i ());