mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 11:21:05 +01:00
Add initial support for parsing struct patterns (#7446)
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:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user