diff --git a/toolchain/parser/parse_node_kind.def b/toolchain/parser/parse_node_kind.def index cec0bec11edb..d17a6cabc340 100644 --- a/toolchain/parser/parse_node_kind.def +++ b/toolchain/parser/parse_node_kind.def @@ -77,7 +77,7 @@ CARBON_PARSE_NODE_KIND(PostfixOperator) // Struct literals. CARBON_PARSE_NODE_KIND(StructLiteral) CARBON_PARSE_NODE_KIND(StructTypeLiteral) -CARBON_PARSE_NODE_KIND(StructLiteralOrTypeLiteralStart) +CARBON_PARSE_NODE_KIND(StructLiteralOrStructTypeLiteralStart) CARBON_PARSE_NODE_KIND(StructFieldDesignator) CARBON_PARSE_NODE_KIND(StructFieldValue) CARBON_PARSE_NODE_KIND(StructFieldType) diff --git a/toolchain/parser/parser.cpp b/toolchain/parser/parser.cpp index ac95457855e5..3b0e538c1cdf 100644 --- a/toolchain/parser/parser.cpp +++ b/toolchain/parser/parser.cpp @@ -428,7 +428,7 @@ auto Parser::HandleBraceExpressionState() -> void { CARBON_CHECK(ConsumeAndAddLeafNodeIf( TokenKind::OpenCurlyBrace(), - ParseNodeKind::StructLiteralOrTypeLiteralStart())); + ParseNodeKind::StructLiteralOrStructTypeLiteralStart())); if (!PositionIs(TokenKind::CloseCurlyBrace())) { PushState(ParserState::BraceExpressionParameterAsUnknown()); } diff --git a/toolchain/parser/testdata/basics/structs.carbon b/toolchain/parser/testdata/basics/structs.carbon index 823531013f1c..e852b39f2c5c 100644 --- a/toolchain/parser/testdata/basics/structs.carbon +++ b/toolchain/parser/testdata/basics/structs.carbon @@ -6,7 +6,7 @@ // RUN: %{carbon-run-parser} // CHECK:STDOUT: [ // CHECK:STDOUT: {kind: 'DeclaredName', text: 'x'}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'DesignatedName', text: 'a'}, // CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, @@ -18,7 +18,7 @@ // CHECK:STDOUT: {kind: 'StructFieldType', text: ':', subtree_size: 4}, // CHECK:STDOUT: {kind: 'StructTypeLiteral', text: '}', subtree_size: 11}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 13}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'DesignatedName', text: 'a'}, // CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: '1'}, @@ -33,16 +33,16 @@ // CHECK:STDOUT: {kind: 'DeclarationEnd', text: ';'}, // CHECK:STDOUT: {kind: 'VariableDeclaration', text: 'var', subtree_size: 27}, // CHECK:STDOUT: {kind: 'DeclaredName', text: 'y'}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2}, // CHECK:STDOUT: {kind: 'VariableInitializer', text: '=', subtree_size: 3}, // CHECK:STDOUT: {kind: 'DeclarationEnd', text: ';'}, // CHECK:STDOUT: {kind: 'VariableDeclaration', text: 'var', subtree_size: 9}, // CHECK:STDOUT: {kind: 'DeclaredName', text: 'z'}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'DesignatedName', text: 'n'}, // CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, @@ -50,7 +50,7 @@ // CHECK:STDOUT: {kind: 'StructComma', text: ','}, // CHECK:STDOUT: {kind: 'StructTypeLiteral', text: '}', subtree_size: 7}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 9}, -// CHECK:STDOUT: {kind: 'StructLiteralOrTypeLiteralStart', text: '{'}, +// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, // CHECK:STDOUT: {kind: 'DesignatedName', text: 'n'}, // CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: '4'},