From 0acc62fec0097b6cd9e73676d36b787667303502 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Fri, 21 Jul 2023 08:41:16 -0700 Subject: [PATCH] Clean up unnecessary Carbon:: uses in the node stack. (#3004) Not sure how I let these creep in. --- toolchain/semantics/semantics_node_stack.h | 67 +++++++++++----------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/toolchain/semantics/semantics_node_stack.h b/toolchain/semantics/semantics_node_stack.h index 7ba08d781611..95561eab4d62 100644 --- a/toolchain/semantics/semantics_node_stack.h +++ b/toolchain/semantics/semantics_node_stack.h @@ -241,45 +241,44 @@ class SemanticsNodeStack { // Translate a parse node kind to the enum ID kind it should always provide. static constexpr auto ParseNodeKindToIdKind(ParseNodeKind kind) -> IdKind { switch (kind) { - case Carbon::ParseNodeKind::CallExpression: - case Carbon::ParseNodeKind::CallExpressionStart: - case Carbon::ParseNodeKind::IfExpressionElse: - case Carbon::ParseNodeKind::InfixOperator: - case Carbon::ParseNodeKind::Literal: - case Carbon::ParseNodeKind::MemberAccessExpression: - case Carbon::ParseNodeKind::NameExpression: - case Carbon::ParseNodeKind::ParenExpression: - case Carbon::ParseNodeKind::PatternBinding: - case Carbon::ParseNodeKind::PrefixOperator: - case Carbon::ParseNodeKind::ShortCircuitOperand: - case Carbon::ParseNodeKind::StructFieldType: - case Carbon::ParseNodeKind::StructFieldValue: - case Carbon::ParseNodeKind::StructLiteral: - case Carbon::ParseNodeKind::StructTypeLiteral: + case ParseNodeKind::CallExpression: + case ParseNodeKind::CallExpressionStart: + case ParseNodeKind::IfExpressionElse: + case ParseNodeKind::InfixOperator: + case ParseNodeKind::Literal: + case ParseNodeKind::MemberAccessExpression: + case ParseNodeKind::NameExpression: + case ParseNodeKind::ParenExpression: + case ParseNodeKind::PatternBinding: + case ParseNodeKind::PrefixOperator: + case ParseNodeKind::ShortCircuitOperand: + case ParseNodeKind::StructFieldValue: + case ParseNodeKind::StructLiteral: + case ParseNodeKind::StructFieldType: + case ParseNodeKind::StructTypeLiteral: + case ParseNodeKind::TupleLiteral: return IdKind::SemanticsNodeId; - case Carbon::ParseNodeKind::TupleLiteral: - return IdKind::SemanticsNodeId; - case Carbon::ParseNodeKind::IfExpressionThen: - case Carbon::ParseNodeKind::IfStatementElse: - case Carbon::ParseNodeKind::ParameterList: + case ParseNodeKind::IfExpressionThen: + case ParseNodeKind::IfStatementElse: + case ParseNodeKind::ParameterList: return IdKind::SemanticsNodeBlockId; - case Carbon::ParseNodeKind::FunctionDefinitionStart: + case ParseNodeKind::FunctionDefinitionStart: return IdKind::SemanticsFunctionId; - case Carbon::ParseNodeKind::Name: + case ParseNodeKind::Name: return IdKind::SemanticsStringId; - case Carbon::ParseNodeKind::ReturnType: + case ParseNodeKind::ReturnType: return IdKind::SemanticsTypeId; - case Carbon::ParseNodeKind::CodeBlockStart: - case Carbon::ParseNodeKind::FunctionIntroducer: - case Carbon::ParseNodeKind::IfCondition: - case Carbon::ParseNodeKind::IfExpressionIf: - case Carbon::ParseNodeKind::ParameterListStart: - case Carbon::ParseNodeKind::ParenExpressionOrTupleLiteralStart: - case Carbon::ParseNodeKind::QualifiedDeclaration: - case Carbon::ParseNodeKind::ReturnStatementStart: - case Carbon::ParseNodeKind::StructLiteralOrStructTypeLiteralStart: - case Carbon::ParseNodeKind::VariableInitializer: - case Carbon::ParseNodeKind::VariableIntroducer: + case ParseNodeKind::CodeBlockStart: + case ParseNodeKind::FunctionIntroducer: + case ParseNodeKind::IfCondition: + case ParseNodeKind::IfExpressionIf: + case ParseNodeKind::ParameterListStart: + case ParseNodeKind::ParenExpressionOrTupleLiteralStart: + case ParseNodeKind::QualifiedDeclaration: + case ParseNodeKind::ReturnStatementStart: + case ParseNodeKind::StructLiteralOrStructTypeLiteralStart: + case ParseNodeKind::VariableInitializer: + case ParseNodeKind::VariableIntroducer: return IdKind::SoloParseNode; default: return IdKind::Unused;