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

Rename to StructLiteralOrStructTypeLiteralStart (#2404)

Browse Source 
As requested
This commit is contained in:
Jon Ross-Perkins
2022-11-17 08:56:48 -08:00
committed by GitHub
parent e45ab50e5b
commit 5da32bd560
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/parse_node_kind.def
+1 -1
View File
@@ -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)
toolchain/parser/parser.cpp
+1 -1
View File
@@ -428,7 +428,7 @@ auto Parser::HandleBraceExpressionState() -> void {
CARBON_CHECK(ConsumeAndAddLeafNodeIf(
TokenKind::OpenCurlyBrace(),
ParseNodeKind::StructLiteralOrTypeLiteralStart()));
ParseNodeKind::StructLiteralOrStructTypeLiteralStart()));
if (!PositionIs(TokenKind::CloseCurlyBrace())) {
PushState(ParserState::BraceExpressionParameterAsUnknown());
}
toolchain/parser/testdata/basics/structs.carbon
Vendored
+6 -6
View File
@@ -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'},