From b953fbf314d0aa2ed978a9a448b54f684d4bbbd3 Mon Sep 17 00:00:00 2001 From: josh11b Date: Fri, 10 Nov 2023 12:48:46 -0800 Subject: [PATCH] Subexpr -> SubExpr (#3383) --- toolchain/diagnostics/diagnostic_kind.def | 2 +- toolchain/parse/handle_expression.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolchain/diagnostics/diagnostic_kind.def b/toolchain/diagnostics/diagnostic_kind.def index cb7697f786bc..626e8e619d93 100644 --- a/toolchain/diagnostics/diagnostic_kind.def +++ b/toolchain/diagnostics/diagnostic_kind.def @@ -74,7 +74,7 @@ CARBON_DIAGNOSTIC_KIND(ExpectedVarAfterReturned) CARBON_DIAGNOSTIC_KIND(ExpectedVariableDecl) CARBON_DIAGNOSTIC_KIND(ExpectedVariableName) CARBON_DIAGNOSTIC_KIND(OperatorRequiresParentheses) -CARBON_DIAGNOSTIC_KIND(StatementOperatorAsSubexpr) +CARBON_DIAGNOSTIC_KIND(StatementOperatorAsSubExpr) CARBON_DIAGNOSTIC_KIND(UnaryOperatorRequiresParentheses) CARBON_DIAGNOSTIC_KIND(UnaryOperatorHasWhitespace) CARBON_DIAGNOSTIC_KIND(UnaryOperatorRequiresWhitespace) diff --git a/toolchain/parse/handle_expression.cpp b/toolchain/parse/handle_expression.cpp index 96ca6004eea4..dcaf0bfa0c53 100644 --- a/toolchain/parse/handle_expression.cpp +++ b/toolchain/parse/handle_expression.cpp @@ -6,11 +6,11 @@ namespace Carbon::Parse { -static auto DiagnoseStatementOperatorAsSubexpr(Context& context) -> void { - CARBON_DIAGNOSTIC(StatementOperatorAsSubexpr, Error, +static auto DiagnoseStatementOperatorAsSubExpr(Context& context) -> void { + CARBON_DIAGNOSTIC(StatementOperatorAsSubExpr, Error, "Operator `{0}` can only be used as a complete statement.", Lex::TokenKind); - context.emitter().Emit(*context.position(), StatementOperatorAsSubexpr, + context.emitter().Emit(*context.position(), StatementOperatorAsSubExpr, context.PositionKind()); } @@ -37,7 +37,7 @@ auto HandleExpr(Context& context) -> void { context.PositionKind()); } else { // This operator wouldn't be allowed even if parenthesized. - DiagnoseStatementOperatorAsSubexpr(context); + DiagnoseStatementOperatorAsSubExpr(context); } } else { // Check that this operator follows the proper whitespace rules. @@ -210,7 +210,7 @@ auto HandleExprLoop(Context& context) -> void { context.emitter().Emit(*context.position(), OperatorRequiresParentheses); } else { // This operator wouldn't be allowed even if parenthesized. - DiagnoseStatementOperatorAsSubexpr(context); + DiagnoseStatementOperatorAsSubExpr(context); } state.has_error = true; } else {