carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 19:20:13 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add initial support for parsing struct patterns (#7446)

Browse Source 
Implements parsing of struct patterns as per
https://github.com/carbon-language/carbon-lang/issues/6680.

This handles the full and short syntax given in the [design
doc](https://github.com/carbon-language/carbon-lang/blob/trunk/docs/design/pattern_matching.md#struct-patterns),
but the handling of the shorthand syntax may need to change as I move on
to implementing Check support (currently the shorthand is represented as
one of `LetBindingPattern`, `VarBindingPattern`, or `VariablePattern`).

This implementation assumes that the answer to
https://github.com/carbon-language/carbon-lang/issues/7404 is that
trailing commas are allowed in the struct pattern, except for the case
where an `_` is present, in which case the next token must be the
closing brace `}`.
This commit is contained in:
oli-ej
2026-07-30 16:37:46 +00:00
committed by GitHub
parent 8f224222a1
commit a683fb574b
21 changed files with 1999 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_pattern_list.cpp
+14
View File
@@ -35,6 +35,11 @@ auto HandleParseNode(Context& context, Parse::TuplePatternStartId node_id)
return HandlePatternListStart(context, node_id);
}
auto HandleParseNode(Context& context, Parse::StructPatternStartId node_id)
-> bool {
return context.TODO(node_id, "struct pattern start");
}
auto HandleParseNode(Context& context, Parse::ExplicitParamListStartId node_id)
-> bool {
context.full_pattern_stack().StartExplicitParamList();
@@ -129,6 +134,15 @@ auto HandleParseNode(Context& context, Parse::TuplePatternId node_id) -> bool {
return true;
}
auto HandleParseNode(Context& context, Parse::StructPatternId node_id) -> bool {
return context.TODO(node_id, "struct pattern");
}
auto HandleParseNode(Context& context,
Parse::StructPatternDesignatedFieldId node_id) -> bool {
return context.TODO(node_id, "struct pattern field");
}
auto HandleParseNode(Context& context, Parse::PatternListCommaId /*node_id*/)
-> bool {
EndExprRegionForPattern(context, context.node_stack());
toolchain/check/node_stack.h
+2
View File
@@ -472,6 +472,8 @@ class NodeStack {
case Parse::NodeKind::RuntimeBindingName:
case Parse::NodeKind::ReturnStatementStart:
case Parse::NodeKind::StructLiteralStart:
case Parse::NodeKind::StructPatternStart:
case Parse::NodeKind::StructPatternDesignatedField:
case Parse::NodeKind::StructTypeLiteralField:
case Parse::NodeKind::StructTypeLiteralStart:
case Parse::NodeKind::TemplateBindingName:
toolchain/diagnostics/kind.def
+5
View File
@@ -125,16 +125,21 @@ CARBON_DIAGNOSTIC_KIND(RedundantRuntimeModifier)
CARBON_DIAGNOSTIC_KIND(ExpectedExprSemi)
CARBON_DIAGNOSTIC_KIND(ExpectedStatementSemi)
CARBON_DIAGNOSTIC_KIND(ExpectedStructLiteralField)
CARBON_DIAGNOSTIC_KIND(ExpectedStructPatternDesignatedField)
CARBON_DIAGNOSTIC_KIND(ExpectedCloseAfterUnderscore)
CARBON_DIAGNOSTIC_KIND(ExpectedVarAfterReturned)
CARBON_DIAGNOSTIC_KIND(ExpectedChoiceDefinition)
CARBON_DIAGNOSTIC_KIND(ExpectedChoiceAlternativeName)
CARBON_DIAGNOSTIC_KIND(ExpectedObserveOperator)
CARBON_DIAGNOSTIC_KIND(NestedTuplePatternInStructPatternShortField)
CARBON_DIAGNOSTIC_KIND(NestedStructPatternStructPatternShortField)
CARBON_DIAGNOSTIC_KIND(NestedVar)
CARBON_DIAGNOSTIC_KIND(NestedUnused)
CARBON_DIAGNOSTIC_KIND(UnusedAfterBindingModifier)
CARBON_DIAGNOSTIC_KIND(OperatorRequiresParentheses)
CARBON_DIAGNOSTIC_KIND(RefInsideVar)
CARBON_DIAGNOSTIC_KIND(StatementOperatorAsSubExpr)
CARBON_DIAGNOSTIC_KIND(AnonymousBindingInStructPattern)
CARBON_DIAGNOSTIC_KIND(UnaryOperatorRequiresParentheses)
CARBON_DIAGNOSTIC_KIND(UnaryOperatorHasWhitespace)
CARBON_DIAGNOSTIC_KIND(UnaryOperatorRequiresWhitespace)
toolchain/parse/context.h
+15 -4
View File
@@ -116,6 +116,13 @@ class Context {
// could help catch errors.
bool in_unused_pattern : 1 = false;
// Set to true to indicate that this state is handling a shorthand pattern
// inside a struct pattern such as `{var a: T}`
// TODO: This is meaningful only for patterns, and the precedence fields
// are meaningful only for expressions, so expressing them as a union
// could help catch errors.
bool in_field_shorthand_pattern : 1 = false;
// The binding context governing this state, used to pick the default phase
// of its bindings. Meaningful for pattern states, and for the
// declaration-name states that carry an enclosing declaration's default
@@ -139,7 +146,8 @@ class Context {
// We expect State to fit into 12 bytes:
// state = 1 byte
// has_error, in_var_pattern, in_unused_pattern, binding_context = 1 byte
// has_error, in_var_pattern, in_unused_pattern, in_field_shorthand_pattern,
// binding_context = 1 byte
// ambient_precedence = 1 byte
// lhs_precedence = 1 byte
// token = 4 bytes
@@ -368,16 +376,19 @@ class Context {
}
// Pushes a new state for handling a pattern. `in_var_pattern` and
// `in_unused_pattern` indicate whether that pattern is nested inside a `var`
// or `unused` pattern. `binding_context` is the binding context that
// determines the default phase of bindings in this pattern.
// `in_unused_pattern` and `in_field_shorthand_pattern` indicate whether that
// pattern is nested inside a `var`, `unused` or a struct shorthand field
// pattern.. `binding_context` is the binding context that determines the
// default phase of bindings in this pattern.
auto PushStateForPattern(StateKind kind, bool in_var_pattern,
bool in_unused_pattern,
bool in_field_shorthand_pattern,
BindingContext binding_context,
PrecedenceGroup precedence) -> void {
PushState({.kind = kind,
.in_var_pattern = in_var_pattern,
.in_unused_pattern = in_unused_pattern,
.in_field_shorthand_pattern = in_field_shorthand_pattern,
.binding_context = binding_context,
.ambient_precedence = precedence,
.token = *position_,
toolchain/parse/handle_binding_pattern.cpp
+9
View File
@@ -125,6 +125,15 @@ auto HandleBindingPattern(Context& context) -> void {
self_token = *self;
context.AddLeafNode(NodeKind::SelfValueName, *self);
} else if (auto underscore = context.ConsumeIf(Lex::TokenKind::Underscore)) {
if (state.in_field_shorthand_pattern) {
CARBON_DIAGNOSTIC(
AnonymousBindingInStructPattern, Error,
"Anonymous binding found in struct pattern. Use `.field = "
"_: field_type` or `unused field: field_type`");
context.emitter().Emit(*context.position(),
AnonymousBindingInStructPattern);
state.has_error = true;
}
context.AddLeafNode(NodeKind::UnderscoreName, *underscore);
} else if (context.PositionKind().is_word() &&
context.PositionKind(Lookahead::NextToken)
toolchain/parse/handle_let.cpp
+1
View File
@@ -19,6 +19,7 @@ auto HandleLet(Context& context) -> void {
context.PushStateForPattern(StateKind::Pattern, /*in_var_pattern=*/false,
/*in_unused_pattern=*/false,
/*in_field_shorthand_pattern=*/false,
BindingContext::ExplicitParam,
PrecedenceGroup::ForTopLevelPattern());
}
toolchain/parse/handle_match.cpp
+1
View File
@@ -144,6 +144,7 @@ auto HandleMatchCaseIntroducer(Context& context) -> void {
context.PushState(state, StateKind::MatchCaseAfterPattern);
context.PushStateForPattern(StateKind::Pattern, /*in_var_pattern=*/false,
/*in_unused_pattern=*/false,
/*in_field_shorthand_pattern=*/false,
BindingContext::ExplicitParam,
PrecedenceGroup::ForTopLevelPattern());
}
toolchain/parse/handle_pattern.cpp
+28 -19
View File
@@ -11,22 +11,28 @@ auto HandlePattern(Context& context) -> void {
auto state = context.PopState();
switch (context.PositionKind()) {
case Lex::TokenKind::OpenParen:
context.PushStateForPattern(StateKind::PatternListAsTuple,
state.in_var_pattern, state.in_unused_pattern,
state.binding_context,
state.ambient_precedence);
context.PushStateForPattern(
StateKind::PatternListAsTuple, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
case Lex::TokenKind::OpenCurlyBrace:
context.PushStateForPattern(
StateKind::PatternListAsStruct, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
case Lex::TokenKind::Var:
context.PushStateForPattern(StateKind::VariablePattern,
state.in_var_pattern, state.in_unused_pattern,
state.binding_context,
state.ambient_precedence);
context.PushStateForPattern(
StateKind::VariablePattern, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
case Lex::TokenKind::Unused:
context.PushStateForPattern(StateKind::UnusedPattern,
state.in_var_pattern, state.in_unused_pattern,
state.binding_context,
state.ambient_precedence);
context.PushStateForPattern(
StateKind::UnusedPattern, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
case Lex::TokenKind::Template:
case Lex::TokenKind::Generic:
@@ -35,10 +41,10 @@ auto HandlePattern(Context& context) -> void {
// `self` is always a binding, even when its type is omitted (and so is not
// followed by a `:`).
case Lex::TokenKind::SelfValueIdentifier:
context.PushStateForPattern(StateKind::BindingPattern,
state.in_var_pattern, state.in_unused_pattern,
state.binding_context,
state.ambient_precedence);
context.PushStateForPattern(
StateKind::BindingPattern, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
default:
if (context.PositionKind().is_word() &&
@@ -46,11 +52,14 @@ auto HandlePattern(Context& context) -> void {
.is_binding_pattern_operator()) {
context.PushStateForPattern(
StateKind::BindingPattern, state.in_var_pattern,
state.in_unused_pattern, state.binding_context,
state.ambient_precedence);
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
break;
}
context.PushState(StateKind::ExprPattern);
context.PushStateForPattern(
StateKind::ExprPattern, state.in_var_pattern, state.in_unused_pattern,
state.in_field_shorthand_pattern, state.binding_context,
state.ambient_precedence);
context.PushStateForExpr(state.ambient_precedence);
break;
}
toolchain/parse/handle_pattern_list.cpp
+170 -13
View File
@@ -13,11 +13,13 @@ static auto HandlePatternListElement(Context& context, StateKind pattern_state,
auto state = context.PopState();
context.PushStateForPattern(finish_state_kind, state.in_var_pattern,
state.in_unused_pattern, state.binding_context,
state.ambient_precedence);
state.in_unused_pattern,
state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
context.PushStateForPattern(pattern_state, state.in_var_pattern,
state.in_unused_pattern, state.binding_context,
state.ambient_precedence);
state.in_unused_pattern,
state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
}
auto HandlePatternListElementAsTuple(Context& context) -> void {
@@ -25,6 +27,31 @@ auto HandlePatternListElementAsTuple(Context& context) -> void {
StateKind::PatternListElementFinishAsTuple);
}
auto HandlePatternListElementAsStruct(Context& context) -> void {
switch (context.PositionKind()) {
case Lex::TokenKind::Period:
HandlePatternListElement(context,
StateKind::StructPatternFieldAfterDesignator,
StateKind::PatternListElementFinishAsStruct);
context.PushState(StateKind::PeriodAsStruct);
break;
case Lex::TokenKind::Underscore:
// If this ends up as part of a binding pattern, it will look like a
// shorthand pattern such as `{_: i32}`.
// Set flag on state which will be popped in HandlePatternListElement.
context.state_stack().back().in_field_shorthand_pattern = true;
HandlePatternListElement(context, StateKind::StructPatternUnderscore,
StateKind::PatternListElementFinishAsStruct);
break;
default:
// Set flag on state which will be popped in HandlePatternListElement.
context.state_stack().back().in_field_shorthand_pattern = true;
HandlePatternListElement(context, StateKind::Pattern,
StateKind::PatternListElementFinishAsStruct);
break;
}
}
auto HandlePatternListElementAsExplicit(Context& context) -> void {
HandlePatternListElement(context, StateKind::Pattern,
StateKind::PatternListElementFinishAsExplicit);
@@ -35,7 +62,95 @@ auto HandlePatternListElementAsImplicit(Context& context) -> void {
StateKind::PatternListElementFinishAsImplicit);
}
// Handles PatternListElementFinishAs(Tuple|Explicit|Implicit).
auto HandleStructPatternDesignatedFieldFinish(Context& context) -> void {
auto state = context.PopState();
context.AddNode(NodeKind::StructPatternDesignatedField, state.token,
state.has_error);
}
auto HandleStructPatternFieldAfterDesignator(Context& context) -> void {
auto state = context.PopState();
auto skip_to_recovery_position = [&](bool add_invalid_parse) {
auto recovery_pos =
context.FindNextOf({Lex::TokenKind::Equal, Lex::TokenKind::Comma,
Lex::TokenKind::CloseCurlyBrace});
if (add_invalid_parse) {
if (context.tokens().GetKind(*recovery_pos) != Lex::TokenKind::Equal) {
context.AddInvalidParse(*context.position());
}
}
context.SkipTo(*recovery_pos);
};
if (state.has_error) {
// recover from error returned when parsing designator
skip_to_recovery_position(/*add_invalid_parse=*/false);
}
if (!context.PositionIs(Lex::TokenKind::Equal)) {
if (!state.has_error) {
state.has_error = true;
CARBON_DIAGNOSTIC(ExpectedStructPatternDesignatedField, Error,
"expected `= value` after `.field`");
context.emitter().Emit(*context.position(),
ExpectedStructPatternDesignatedField);
}
skip_to_recovery_position(/*add_invalid_parse=*/true);
if (context.PositionIs(Lex::TokenKind::Comma) ||
context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
context.PushState(state, StateKind::StructPatternDesignatedFieldFinish);
return;
}
}
state.token = context.ConsumeChecked(Lex::TokenKind::Equal);
context.PushState(state, StateKind::StructPatternDesignatedFieldFinish);
context.PushStateForPattern(StateKind::Pattern, state.in_var_pattern,
state.in_unused_pattern,
state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
}
auto HandleStructPatternUnderscore(Context& context) -> void {
auto state = context.PopState();
if (context.PositionKind(Lookahead::NextToken)
.is_binding_pattern_operator()) {
context.PushStateForPattern(
StateKind::BindingPattern, state.in_var_pattern,
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
return;
}
auto underscore = context.ConsumeChecked(Lex::TokenKind::Underscore);
bool is_last = context.PositionIs(Lex::TokenKind::CloseCurlyBrace);
if (!is_last) {
CARBON_DIAGNOSTIC(
ExpectedCloseAfterUnderscore, Error,
"unexpected token `{0}` after `_` in struct pattern, expected `}`",
Lex::TokenKind);
context.emitter().Emit(*context.position(), ExpectedCloseAfterUnderscore,
context.PositionKind());
state.has_error = true;
}
context.AddNode(NodeKind::UnderscoreName, underscore, state.has_error);
if (state.has_error) {
context.ReturnErrorOnState();
}
}
// Handles PatternListElementFinishAs(Tuple|Struct|Explicit|Implicit).
static auto HandlePatternListElementFinish(Context& context,
Lex::TokenKind close_token,
StateKind param_state_kind) -> void {
@@ -59,9 +174,10 @@ static auto HandlePatternListElementFinish(Context& context,
}
if (list_token_kind == Context::ListTokenKind::Comma) {
context.PushStateForPattern(param_state_kind, state.in_var_pattern,
state.in_unused_pattern, state.binding_context,
state.ambient_precedence);
context.PushStateForPattern(
param_state_kind, state.in_var_pattern, state.in_unused_pattern,
/*in_field_shorthand_pattern=*/false, state.binding_context,
state.ambient_precedence);
}
}
@@ -70,6 +186,11 @@ auto HandlePatternListElementFinishAsTuple(Context& context) -> void {
StateKind::PatternListElementAsTuple);
}
auto HandlePatternListElementFinishAsStruct(Context& context) -> void {
HandlePatternListElementFinish(context, Lex::TokenKind::CloseCurlyBrace,
StateKind::PatternListElementAsStruct);
}
auto HandlePatternListElementFinishAsExplicit(Context& context) -> void {
HandlePatternListElementFinish(context, Lex::TokenKind::CloseParen,
StateKind::PatternListElementAsExplicit);
@@ -80,7 +201,7 @@ auto HandlePatternListElementFinishAsImplicit(Context& context) -> void {
StateKind::PatternListElementAsImplicit);
}
// Handles PatternListAs(Tuple|Explicit|Implicit).
// Handles PatternListAs(Tuple|Struct|Explicit|Implicit).
static auto HandlePatternList(Context& context, NodeKind node_kind,
Lex::TokenKind open_token_kind,
Lex::TokenKind close_token_kind,
@@ -88,18 +209,41 @@ static auto HandlePatternList(Context& context, NodeKind node_kind,
StateKind finish_state_empty,
StateKind finish_state_nonempty) -> void {
auto state = context.PopState();
if (state.in_field_shorthand_pattern) {
if (node_kind == NodeKind::TuplePatternStart) {
CARBON_DIAGNOSTIC(NestedTuplePatternInStructPatternShortField, Error,
"Tuple pattern in shorthand struct pattern field. Use "
"`.field = (...)` instead");
context.emitter().Emit(*context.position(),
NestedTuplePatternInStructPatternShortField);
context.ReturnErrorOnState();
} else if (node_kind == NodeKind::StructPatternStart) {
CARBON_DIAGNOSTIC(NestedStructPatternStructPatternShortField, Error,
"Struct pattern in shorthand struct pattern field. Use "
"`.field = {{...}` instead");
context.emitter().Emit(*context.position(),
NestedStructPatternStructPatternShortField);
context.ReturnErrorOnState();
}
}
auto open_token = context.ConsumeChecked(open_token_kind);
bool empty = context.PositionIs(close_token_kind);
context.PushStateForPattern(
empty ? finish_state_empty : finish_state_nonempty, state.in_var_pattern,
state.in_unused_pattern, state.binding_context, state.ambient_precedence);
state.in_unused_pattern, state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
context.AddLeafNode(node_kind, open_token);
if (!empty) {
context.PushStateForPattern(param_state, state.in_var_pattern,
state.in_unused_pattern, state.binding_context,
PrecedenceGroup::ForTopLevelExpr());
context.PushStateForPattern(
param_state, state.in_var_pattern, state.in_unused_pattern,
state.in_field_shorthand_pattern, state.binding_context,
PrecedenceGroup::ForTopLevelExpr());
}
}
@@ -112,6 +256,14 @@ auto HandlePatternListAsTuple(Context& context) -> void {
StateKind::PatternListFinishAsTuple, StateKind::PatternListFinishAsParen);
}
auto HandlePatternListAsStruct(Context& context) -> void {
HandlePatternList(
context, NodeKind::StructPatternStart, Lex::TokenKind::OpenCurlyBrace,
Lex::TokenKind::CloseCurlyBrace, StateKind::PatternListElementAsStruct,
StateKind::PatternListFinishAsStruct,
StateKind::PatternListFinishAsStruct);
}
auto HandlePatternListAsExplicit(Context& context) -> void {
HandlePatternList(context, NodeKind::ExplicitParamListStart,
Lex::TokenKind::OpenParen, Lex::TokenKind::CloseParen,
@@ -148,6 +300,11 @@ auto HandlePatternListFinishAsTuple(Context& context) -> void {
Lex::TokenKind::CloseParen);
}
auto HandlePatternListFinishAsStruct(Context& context) -> void {
HandlePatternListFinish(context, NodeKind::StructPattern,
Lex::TokenKind::CloseCurlyBrace);
}
auto HandlePatternListFinishAsExplicit(Context& context) -> void {
HandlePatternListFinish(context, NodeKind::ExplicitParamList,
Lex::TokenKind::CloseParen);
toolchain/parse/handle_statement.cpp
+4 -4
View File
@@ -118,10 +118,10 @@ auto HandleStatementForHeader(Context& context) -> void {
state.kind = StateKind::StatementForHeaderIn;
context.PushState(state);
context.PushStateForPattern(StateKind::Pattern, /*in_var_pattern=*/false,
/*in_unused_pattern=*/false,
BindingContext::ExplicitParam,
PrecedenceGroup::ForTopLevelPattern());
context.PushStateForPattern(
StateKind::Pattern, /*in_var_pattern=*/false,
/*in_unused_pattern=*/false, /*in_field_shorthand_pattern=*/false,
BindingContext::ExplicitParam, PrecedenceGroup::ForTopLevelPattern());
}
auto HandleStatementForHeaderIn(Context& context) -> void {
toolchain/parse/handle_unused.cpp
+3 -2
View File
@@ -19,8 +19,9 @@ auto HandleUnusedPattern(Context& context) -> void {
context.ConsumeChecked(Lex::TokenKind::Unused);
context.PushStateForPattern(StateKind::Pattern, state.in_var_pattern,
/*in_unused_pattern=*/true, state.binding_context,
state.ambient_precedence);
/*in_unused_pattern=*/true,
state.in_field_shorthand_pattern,
state.binding_context, state.ambient_precedence);
}
auto HandleFinishUnusedPattern(Context& context) -> void {
toolchain/parse/handle_var.cpp
+3 -1
View File
@@ -27,6 +27,7 @@ static auto HandleVar(Context& context, StateKind finish_state_kind,
context.PushStateForPattern(StateKind::Pattern, /*in_var_pattern=*/true,
/*in_unused_pattern=*/false,
/*in_field_shorthand_pattern=*/false,
BindingContext::ExplicitParam,
PrecedenceGroup::ForTopLevelPattern());
}
@@ -101,7 +102,8 @@ auto HandleVariablePattern(Context& context) -> void {
// A `var` binding is always runtime, regardless of the enclosing context.
context.PushStateForPattern(
StateKind::Pattern, /*in_var_pattern=*/true, state.in_unused_pattern,
BindingContext::ExplicitParam, state.ambient_precedence);
state.in_field_shorthand_pattern, BindingContext::ExplicitParam,
state.ambient_precedence);
}
auto HandleFinishVariablePattern(Context& context) -> void {
toolchain/parse/node_kind.def
+4
View File
@@ -172,6 +172,10 @@ CARBON_PARSE_NODE_KIND(PatternListComma)
CARBON_PARSE_NODE_KIND(ParenPattern)
CARBON_PARSE_NODE_KIND(TuplePattern)
CARBON_PARSE_NODE_KIND(StructPatternStart)
CARBON_PARSE_NODE_KIND(StructPatternDesignatedField)
CARBON_PARSE_NODE_KIND(StructPattern)
CARBON_PARSE_NODE_KIND(ExplicitParamListStart)
CARBON_PARSE_NODE_KIND(ExplicitParamList)
CARBON_PARSE_NODE_KIND(ImplicitParamListStart)
toolchain/parse/state.def
+85 -12
View File
@@ -53,7 +53,10 @@
Variant4) \
CARBON_PARSE_STATE_VARIANT(Kind, Variant1) \
CARBON_PARSE_STATE_VARIANTS3(Kind, Variant2, Variant3, Variant4)
#define CARBON_PARSE_STATE_VARIANTS5(Kind, Variant1, Variant2, Variant3, \
Variant4, Variant5) \
CARBON_PARSE_STATE_VARIANT(Kind, Variant1) \
CARBON_PARSE_STATE_VARIANTS4(Kind, Variant2, Variant3, Variant4, Variant5)
// Used as a default for State initialization in some cases. Should
// not be put on the state stack.
CARBON_PARSE_STATE(Invalid)
@@ -994,13 +997,26 @@ CARBON_PARSE_STATE(AliasAfterName)
CARBON_PARSE_STATE(AliasFinish)
// Starts parsing a pattern in a comma-separated list. The variants mark
// whether it is part of an implicit parameter list or a tuple pattern.
// whether it is part of an implicit parameter list, struct pattern or a tuple
// pattern.
//
// ...
// ^
// 1. Pattern
// 2. PatternListElementFinishAs(Tuple|Explicit|Implicit)
CARBON_PARSE_STATE_VARIANTS3(PatternListElement, Tuple, Explicit, Implicit)
// 2. PatternListElementFinishAs(Tuple|Struct|Explicit|Implicit)
//
// .foo = ... (variant is Struct)
// ^
// 1. PeriodAsStruct
// 2. StructPatternFieldAfterDesignator
// 3 PatternListElementFinishAsStruct
//
// _ ... (variant is Struct)
// ^
// 1. StructPatternUnderscore
// 2. PatternListElementFinishAsStruct
CARBON_PARSE_STATE_VARIANTS4(PatternListElement, Tuple, Struct, Explicit,
Implicit)
// Finishes parsing a pattern in a comma-separated list, including the
// optional trailing `,`. If there are more patterns, enqueues another
@@ -1011,29 +1027,35 @@ CARBON_PARSE_STATE_VARIANTS3(PatternListElement, Tuple, Explicit, Implicit)
// (state done)
// SPECIAL: parent becomes PatternListFinishAsTuple
//
// ... , } (variant is Struct)
// ^
// (state done)
//
// ... , ] (variant is Implicit)
// ^
// (state done)
//
// ... , ...
// ^
// 1. PatternListElementAs(Tuple|Explicit|Implicit)
// 1. PatternListElementAs(Tuple|Struct|Explicit|Implicit)
// SPECIAL (variant is Tuple): parent becomes PatternListFinishAsTuple
//
// ...
// ^
// (state done)
CARBON_PARSE_STATE_VARIANTS3(PatternListElementFinish, Tuple, Explicit,
CARBON_PARSE_STATE_VARIANTS4(PatternListElementFinish, Tuple, Struct, Explicit,
Implicit)
// Handles processing of a tuple pattern (parentheses) or implicit parameter
// list (square brackets).
// Handles processing of a tuple pattern (parentheses), implicit parameter
// list (square brackets) or struct pattern (braces).
//
// ( ) (variant is Tuple or Explicit)
// ^
// [ ] (variant is Implicit)
// ^
// 1. PatternListFinishAs(Tuple|Explicit|Implicit)
// { } (variant is Struct)
// ^
// 1. PatternListFinishAs(Tuple|Struct|Explicit|Implicit)
//
// ( ... ) (variant is Explicit)
// ^
@@ -1046,18 +1068,69 @@ CARBON_PARSE_STATE_VARIANTS3(PatternListElementFinish, Tuple, Explicit,
// ^
// 1. PatternListElementAsTuple
// 2. PatternListFinishAsParen (SPECIAL: may be replaced)
CARBON_PARSE_STATE_VARIANTS3(PatternList, Tuple, Explicit, Implicit)
//
// { ... } (variant is Struct)
// ^
// 1. PatternListElementAsStruct
// 2. PatternListFinishAsStruct
CARBON_PARSE_STATE_VARIANTS4(PatternList, Tuple, Struct, Explicit, Implicit)
// Handles processing of a parameter list `]` or `)`.
// Handles processing of a parameter list `]`, `)` or `}`.
//
// ( ... ) (variant is Paren, Tuple or Explicit)
// ^
// [ ... ] (variant is Implicit)
// ^
// { ... } (variant is Struct)
// ^
// (state done)
CARBON_PARSE_STATE_VARIANTS4(PatternListFinish, Paren, Tuple, Explicit,
CARBON_PARSE_STATE_VARIANTS5(PatternListFinish, Paren, Tuple, Struct, Explicit,
Implicit)
//
// ... ,
// ^
// (state done)
//
// ... }
// ^
// (state done)
CARBON_PARSE_STATE(StructPatternDesignatedFieldFinish)
// Handles a struct pattern parameter after the initial designator.
// .foo = ...
// ^
// 1. Pattern
// 2. StructPatternDesignatedFieldFinish
//
// .foo ??? = ...
// ^~~~~
// 1. Pattern
// 2. StructPatternDesignatedFieldFinish
//
// .foo ??? , ...
// ^~~~
// 1. StructPatternDesignatedFieldFinish
//
// .foo ??? } ...
// ^~~~
// 1. StructPatternDesignatedFieldFinish
CARBON_PARSE_STATE(StructPatternFieldAfterDesignator)
// Handles the processing of an '_' element in a struct pattern
// _ }
// ^
// (state done)
//
// _ : ???
// ^
// 1. BindingPattern
//
// _ :? ???
// ^
// 1. BindingPattern
CARBON_PARSE_STATE(StructPatternUnderscore)
// Handles the processing of a `(condition)` up through the expression.
//
// if/while/match { (invalid)
toolchain/parse/testdata/for/fail_missing_cond.carbon
Vendored
+2 -2
View File
@@ -42,8 +42,8 @@ fn F() {
// CHECK:STDOUT: {kind: 'ExplicitParamList', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
// CHECK:STDOUT: {kind: 'ForHeaderStart', text: 'for', has_error: yes},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ForIn', text: 'for', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'InvalidParse', text: '}', has_error: yes},
// CHECK:STDOUT: {kind: 'ForHeader', text: 'for', has_error: yes, subtree_size: 6},
toolchain/parse/testdata/let/let_struct.carbon
Vendored
+197
View File
@@ -0,0 +1,197 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/let/let_struct.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/let/let_struct.carbon
// --- let_struct.carbon
let {.s = s: str, .i = i: i32} = {.s = "hello", .i = 1};
// --- let_struct_shorthand.carbon
let {s: str, i: i32} = {.s = "hello shorthand", .i = 2};
// --- let_struct_mixed.carbon
let {.s = s: str, i: i32} = {.s = "hello mixed", .i = 2};
// --- let_ref_struct.carbon
let {.s = ref s: str, .i = i: i32} = {.s = "hello ref", .i = 3};
// --- let_ref_struct_shorthand.carbon
let {ref s: str, i: i32} = {.s = "hello ref shorthand", .i = 4};
// CHECK:STDOUT: - filename: let_struct.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 17},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '1'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 31},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: let_struct_shorthand.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello shorthand"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '2'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 25},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: let_struct_mixed.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 14},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello mixed"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '2'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 28},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: let_ref_struct.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'RefBindingName', text: 'ref', subtree_size: 2},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 8},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 18},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello ref"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '3'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 32},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: let_ref_struct_shorthand.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'RefBindingName', text: 'ref', subtree_size: 2},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 12},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello ref shorthand"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '4'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 26},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/struct/struct_pattern.carbon
Vendored
+1134
View File
File diff suppressed because it is too large Load Diff
toolchain/parse/testdata/var/unused.carbon
Vendored
+108
View File
@@ -36,6 +36,14 @@ let unused (x: (), y: ()) = ((), ());
let var (x: (), unused y: ()) = ((), ());
let var unused (x: (), y: ()) = ((), ());
// --- unused_struct.carbon
let {.x = x: i32, var unused y: i32} = {};
let {.x = x: i32, unused var y: i32} = {};
let unused {x: i32, y: i32} = {};
let var {x: i32, unused y: i32} = {};
let var unused {x: i32, y: i32} = {};
// --- var_unused_function.carbon
fn F(x: (), var unused y: ());
@@ -304,6 +312,106 @@ var unused (unused y: i32) = (0,);
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 25},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: unused_struct.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'UnusedPattern', text: 'unused', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 6},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 16},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 21},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 5},
// CHECK:STDOUT: {kind: 'UnusedPattern', text: 'unused', subtree_size: 6},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 16},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 21},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'LetBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'UnusedPattern', text: 'unused', subtree_size: 12},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 17},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'UnusedPattern', text: 'unused', subtree_size: 5},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 12},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 13},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 18},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'UnusedPattern', text: 'unused', subtree_size: 12},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 13},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 18},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: var_unused_function.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
toolchain/parse/testdata/var/var_pattern.carbon
Vendored
+57
View File
@@ -20,6 +20,14 @@ let (x: (), var y: ()) = ((), ());
fn F(x: (), var y: ());
// --- struct.carbon
let {.x = var x: ()} = {.x = ()};
// --- struct_shorthand.carbon
let {var y: ()} = {.y = ()};
// --- fail_nested.carbon
// CHECK:STDERR: fail_nested.carbon:[[@LINE+4]]:25: error: `var` nested within another `var` [NestedVar]
@@ -95,6 +103,55 @@ let (x: (), var (y: (), var z: ())) = ((), ((), ()));
// CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 17},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: struct.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'TupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 6},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 9},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 5},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 21},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: struct_shorthand.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'TupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 6},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 8},
// CHECK:STDOUT: {kind: 'LetInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'y'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 5},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 18},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: fail_nested.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
toolchain/parse/testdata/var/var_struct.carbon
Vendored
+124
View File
@@ -0,0 +1,124 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/var/var_struct.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/var/var_struct.carbon
// --- var_struct.carbon
var {.s = s: str, .i = i: 32} = {.s = "hello", .i = 0};
// --- var_struct_shorthand.carbon
var {s: str, i: 32} = {.s = "hello shorthand", .i = 1};
// --- var_struct_mixed.carbon
var {.s = s: str, i: 32} = {.s = "hello mixed", .i = 1};
// CHECK:STDOUT: - filename: var_struct.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 17},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 18},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '0'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 32},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: var_struct_shorthand.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 12},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello shorthand"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '1'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 26},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: var_struct_mixed.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'StructPatternStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'StringTypeLiteral', text: 'str'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPatternDesignatedField', text: '=', subtree_size: 7},
// CHECK:STDOUT: {kind: 'PatternListComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructPattern', text: '}', subtree_size: 14},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 15},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 's'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'StringLiteral', text: '"hello mixed"'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'i'},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '1'},
// CHECK:STDOUT: {kind: 'StructLiteralField', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 29},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/typed_nodes.h
+33
View File
@@ -1498,6 +1498,39 @@ struct StructTypeLiteral {
Lex::CloseCurlyBraceTokenIndex token;
};
// Struct Patterns
// ----------------------------------------
using StructPatternStart =
LeafNode<NodeKind::StructPatternStart, Lex::OpenCurlyBraceTokenIndex>;
// `.a = pattern`
struct StructPatternDesignatedField {
static constexpr auto Kind = NodeKind::StructPatternDesignatedField.Define(
{.bracketed_by = StructFieldDesignator::Kind, .child_count = 2});
StructFieldDesignatorId name;
Lex::EqualTokenIndex token;
AnyPatternId pattern;
};
using StructPatternFieldId =
NodeIdOneOf<StructPatternDesignatedField, LetBindingPattern,
VariablePattern, VarBindingPattern, UnusedPattern,
UnderscoreName>;
struct StructPattern {
static constexpr auto Kind = NodeKind::StructPattern.Define(
{.category = NodeCategory::Pattern,
.bracketed_by = StructPatternStart::Kind});
StructPatternStartId left_brace;
CommaSeparatedList<StructPatternFieldId, PatternListCommaId> fields;
Lex::CloseCurlyBraceTokenIndex token;
};
// `class` declarations and definitions
// ------------------------------------