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

Update basic diagnostic capitalization/punctuation (#4328)

Browse Source 
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:
Jon Ross-Perkins
2024-09-19 21:32:53 +00:00
committed by GitHub
co-authored by Richard Smith
parent 7f6d684b29
commit e7aebbe581
578 changed files with 2166 additions and 2173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_match.cpp
+10 -10
View File
@@ -12,7 +12,7 @@ namespace Carbon::Parse {
// have a larger look at this code and how it produces parse errors. This may be
// good to re-examine when someone is working on implementing match checking.
static auto DiagnoseMatchParseTODO(Context& context) -> void {
CARBON_DIAGNOSTIC(MatchParseTODO, Error, "TODO: Improve match parsing.");
CARBON_DIAGNOSTIC(MatchParseTODO, Error, "TODO: improve match parsing");
context.emitter().Emit(*context.position(), MatchParseTODO);
}
@@ -24,7 +24,7 @@ static auto HandleStatementsBlockStart(Context& context, State finish,
if (!context.PositionIs(Lex::TokenKind::EqualGreater)) {
if (!state.has_error) {
CARBON_DIAGNOSTIC(ExpectedMatchCaseArrow, Error,
"Expected `=>` introducing statement block.");
"expected `=>` introducing statement block");
context.emitter().Emit(*context.position(), ExpectedMatchCaseArrow);
}
@@ -40,7 +40,7 @@ static auto HandleStatementsBlockStart(Context& context, State finish,
if (!context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
if (!state.has_error) {
CARBON_DIAGNOSTIC(ExpectedMatchCaseBlock, Error,
"Expected `{{` after `=>`.");
"expected `{{` after `=>`");
context.emitter().Emit(*context.position(), ExpectedMatchCaseBlock);
}
@@ -57,7 +57,7 @@ static auto HandleStatementsBlockStart(Context& context, State finish,
static auto EmitUnexpectedTokenAndRecover(Context& context) -> void {
CARBON_DIAGNOSTIC(UnexpectedTokenInMatchCasesBlock, Error,
"Unexpected `{0}`; expected `case`, `default` or `}`.",
"unexpected `{0}`; expected `case`, `default` or `}`",
Lex::TokenKind);
context.emitter().Emit(*context.position(), UnexpectedTokenInMatchCasesBlock,
context.PositionKind());
@@ -81,7 +81,7 @@ auto HandleMatchConditionFinish(Context& context) -> void {
if (!context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
if (!state.has_error) {
CARBON_DIAGNOSTIC(ExpectedMatchCasesBlock, Error,
"Expected `{{` starting block with cases.");
"expected `{{` starting block with cases");
context.emitter().Emit(*context.position(), ExpectedMatchCasesBlock);
}
@@ -98,7 +98,7 @@ auto HandleMatchConditionFinish(Context& context) -> void {
state.has_error = false;
if (context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
CARBON_DIAGNOSTIC(ExpectedMatchCases, Error, "Expected cases.");
CARBON_DIAGNOSTIC(ExpectedMatchCases, Error, "expected cases");
context.emitter().Emit(*context.position(), ExpectedMatchCases);
state.has_error = true;
}
@@ -127,10 +127,10 @@ auto HandleMatchCaseLoopAfterDefault(Context& context) -> void {
Lex::TokenKind kind = context.PositionKind();
if (kind == Lex::TokenKind::Case or kind == Lex::TokenKind::Default) {
CARBON_DIAGNOSTIC(UnreachableMatchCase, Error, "Unreachable case; `{0}{1}",
Lex::TokenKind, std::string);
context.emitter().Emit(*context.position(), UnreachableMatchCase, kind,
"` occurs after the `default`");
CARBON_DIAGNOSTIC(UnreachableMatchCase, Error,
"unreachable case; `{0}` occurs after the `default`",
Lex::TokenKind);
context.emitter().Emit(*context.position(), UnreachableMatchCase, kind);
context.ReturnErrorOnState();
context.PushState(State::MatchCaseLoopAfterDefault);