mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Track the start of a signature more accurately (#6760)
This change ensures that a function signature always starts with an `IdentifierNameMaybeBeforeSignature` node (renamed from `IdentifierNameBeforeParams`), even in the case of function declarations like `fn F -> T` that have no parameter list. As a consequence, this ensures that we push new entries onto `pattern_block_stack` and `full_pattern_stack` when we start processing the function signature.
This commit is contained in:
@@ -38,6 +38,11 @@ static auto HandleName(Context& context, Context::State state,
|
||||
context.PushState(StateKind::PatternListAsExplicit);
|
||||
break;
|
||||
|
||||
case Lex::TokenKind::MinusGreater:
|
||||
case Lex::TokenKind::MinusGreaterQuestion:
|
||||
context.AddLeafNode(before_params_kind, name_token);
|
||||
break;
|
||||
|
||||
default:
|
||||
context.AddLeafNode(not_before_params_kind, name_token);
|
||||
break;
|
||||
@@ -49,9 +54,9 @@ auto HandleDeclNameAndParams(Context& context) -> void {
|
||||
|
||||
if (auto identifier = context.ConsumeIf(Lex::TokenKind::Identifier)) {
|
||||
HandleName(context, state, *identifier,
|
||||
NodeKind::IdentifierNameNotBeforeParams,
|
||||
NodeKind::IdentifierNameNotBeforeSignature,
|
||||
NodeKind::IdentifierNameQualifierWithoutParams,
|
||||
NodeKind::IdentifierNameBeforeParams);
|
||||
NodeKind::IdentifierNameMaybeBeforeSignature);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -94,7 +99,7 @@ auto HandleDeclNameAndParamsAfterParams(Context& context) -> void {
|
||||
|
||||
if (auto period = context.ConsumeIf(Lex::TokenKind::Period)) {
|
||||
CARBON_CHECK(context.tree().node_kind(NodeId(state.subtree_start)) ==
|
||||
NodeKind::IdentifierNameBeforeParams);
|
||||
NodeKind::IdentifierNameMaybeBeforeSignature);
|
||||
context.AddNode(NodeKind::IdentifierNameQualifierWithParams, *period,
|
||||
state.has_error);
|
||||
context.PushState(StateKind::DeclNameAndParams);
|
||||
|
||||
Reference in New Issue
Block a user