mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Update basic diagnostic capitalization/punctuation (#4328)
This is a primarily automated change:
- Search & replace for capitalization
-
`(CARBON_DIAGNOSTIC\((?:\n\s+)?\w+,(?:\n\s+)?\s\w+,(?:\n\s+)?\s")([A-Z])`
- `$1\L$2`
- Search & replace for period
-
`(CARBON_DIAGNOSTIC\((?:\n\s+)?\w+,(?:\n\s+)?\s\w+,(?:\n\s+)?\s"(?:[^)]|\n)+)\.("[,)])`
- `$1$2`
- Limited search & replace for `ERROR: ` -> `error: ` in streamed things
- Leaving a TODO for command_line because there's more cleanup that can
be done there
- Modify diagnostic_consumer.cpp
- ERROR -> error
- WARNING -> warning
---------
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
co-authored by
Richard Smith
parent
7f6d684b29
commit
e7aebbe581
+4
-4
@@ -10,24 +10,24 @@
|
||||
|
||||
fn F() {
|
||||
if (a)
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:5: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:5: error: expected braced code block
|
||||
// CHECK:STDERR: if (b)
|
||||
// CHECK:STDERR: ^~
|
||||
// CHECK:STDERR:
|
||||
if (b)
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:7: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:7: error: expected braced code block
|
||||
// CHECK:STDERR: c;
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
c;
|
||||
else
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:7: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+4]]:7: error: expected braced code block
|
||||
// CHECK:STDERR: d;
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
d;
|
||||
else
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+3]]:5: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_else_unbraced.carbon:[[@LINE+3]]:5: error: expected braced code block
|
||||
// CHECK:STDERR: e;
|
||||
// CHECK:STDERR: ^
|
||||
e;
|
||||
|
||||
+5
-5
@@ -9,27 +9,27 @@
|
||||
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/if/fail_errors.carbon
|
||||
|
||||
fn F() {
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:6: ERROR: Expected `(` after `if`.
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:6: error: expected `(` after `if`
|
||||
// CHECK:STDERR: if a {}
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
if a {}
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:7: ERROR: Expected expression.
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:7: error: expected expression
|
||||
// CHECK:STDERR: if () {}
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
if () {}
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:9: ERROR: Unexpected tokens before `)`.
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+4]]:9: error: unexpected tokens before `)`
|
||||
// CHECK:STDERR: if (b c) {}
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
if (b c) {}
|
||||
if (d)
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+7]]:1: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+7]]:1: error: expected braced code block
|
||||
// CHECK:STDERR: }
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+3]]:1: ERROR: Expected expression.
|
||||
// CHECK:STDERR: fail_errors.carbon:[[@LINE+3]]:1: error: expected expression
|
||||
// CHECK:STDERR: }
|
||||
// CHECK:STDERR: ^
|
||||
}
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/if/fail_missing_cond.carbon
|
||||
|
||||
fn F() {
|
||||
// CHECK:STDERR: fail_missing_cond.carbon:[[@LINE+3]]:6: ERROR: Expected `(` after `if`.
|
||||
// CHECK:STDERR: fail_missing_cond.carbon:[[@LINE+3]]:6: error: expected `(` after `if`
|
||||
// CHECK:STDERR: if {
|
||||
// CHECK:STDERR: ^
|
||||
if {
|
||||
|
||||
+3
-3
@@ -9,15 +9,15 @@
|
||||
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/if/fail_square_brackets.carbon
|
||||
|
||||
fn F() {
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+11]]:6: ERROR: Expected `(` after `if`.
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+11]]:6: error: expected `(` after `if`
|
||||
// CHECK:STDERR: if [] {}
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+7]]:7: ERROR: Expected expression.
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+7]]:7: error: expected expression
|
||||
// CHECK:STDERR: if [] {}
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+3]]:7: ERROR: Expected `;` in array type.
|
||||
// CHECK:STDERR: fail_square_brackets.carbon:[[@LINE+3]]:7: error: expected `;` in array type
|
||||
// CHECK:STDERR: if [] {}
|
||||
// CHECK:STDERR: ^
|
||||
if [] {}
|
||||
|
||||
+3
-3
@@ -11,17 +11,17 @@
|
||||
|
||||
fn F() {
|
||||
if (a)
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+4]]:5: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+4]]:5: error: expected braced code block
|
||||
// CHECK:STDERR: if (b)
|
||||
// CHECK:STDERR: ^~
|
||||
// CHECK:STDERR:
|
||||
if (b)
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+4]]:7: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+4]]:7: error: expected braced code block
|
||||
// CHECK:STDERR: if (c)
|
||||
// CHECK:STDERR: ^~
|
||||
// CHECK:STDERR:
|
||||
if (c)
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+3]]:9: ERROR: Expected braced code block.
|
||||
// CHECK:STDERR: fail_unbraced.carbon:[[@LINE+3]]:9: error: expected braced code block
|
||||
// CHECK:STDERR: d;
|
||||
// CHECK:STDERR: ^
|
||||
d;
|
||||
|
||||
Reference in New Issue
Block a user