mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Geoff Romer
4a0cf6c1fb
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.
110 lines
3.9 KiB
C++
110 lines
3.9 KiB
C++
// 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
|
|
|
|
#include "toolchain/lex/token_index.h"
|
|
#include "toolchain/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Adds a leaf node for the name, and updates the state stack for parameter
|
|
// handling.
|
|
static auto HandleName(Context& context, Context::State state,
|
|
Lex::TokenIndex name_token,
|
|
NodeKind not_before_params_kind,
|
|
NodeKind not_before_params_qualifier_kind,
|
|
NodeKind before_params_kind) -> void {
|
|
switch (context.PositionKind()) {
|
|
case Lex::TokenKind::Period:
|
|
context.AddLeafNode(not_before_params_kind, name_token);
|
|
context.AddNode(not_before_params_qualifier_kind,
|
|
context.ConsumeChecked(Lex::TokenKind::Period),
|
|
state.has_error);
|
|
context.PushState(StateKind::DeclNameAndParams);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenSquareBracket:
|
|
context.AddLeafNode(before_params_kind, name_token);
|
|
state.kind = StateKind::DeclNameAndParamsAfterImplicit;
|
|
context.PushState(state);
|
|
context.PushState(StateKind::PatternListAsImplicit);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenParen:
|
|
context.AddLeafNode(before_params_kind, name_token);
|
|
state.kind = StateKind::DeclNameAndParamsAfterParams;
|
|
context.PushState(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;
|
|
}
|
|
}
|
|
|
|
auto HandleDeclNameAndParams(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (auto identifier = context.ConsumeIf(Lex::TokenKind::Identifier)) {
|
|
HandleName(context, state, *identifier,
|
|
NodeKind::IdentifierNameNotBeforeSignature,
|
|
NodeKind::IdentifierNameQualifierWithoutParams,
|
|
NodeKind::IdentifierNameMaybeBeforeSignature);
|
|
return;
|
|
}
|
|
|
|
Lex::TokenIndex token = *context.position();
|
|
if (context.tokens().GetKind(token) == Lex::TokenKind::FileEnd) {
|
|
// The end of file is an unhelpful diagnostic location. Instead, use the
|
|
// introducer token.
|
|
token = state.token;
|
|
}
|
|
if (state.token == *context.position()) {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclNameAfterPeriod, Error,
|
|
"`.` should be followed by a name");
|
|
context.emitter().Emit(token, ExpectedDeclNameAfterPeriod);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclName, Error,
|
|
"`{0}` introducer should be followed by a name",
|
|
Lex::TokenKind);
|
|
context.emitter().Emit(token, ExpectedDeclName,
|
|
context.tokens().GetKind(state.token));
|
|
}
|
|
context.ReturnErrorOnState();
|
|
context.AddInvalidParse(*context.position());
|
|
}
|
|
|
|
auto HandleDeclNameAndParamsAfterImplicit(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
state.kind = StateKind::DeclNameAndParamsAfterParams;
|
|
context.PushState(state);
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::OpenParen)) {
|
|
return;
|
|
}
|
|
|
|
context.PushState(StateKind::PatternListAsExplicit);
|
|
}
|
|
|
|
auto HandleDeclNameAndParamsAfterParams(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (auto period = context.ConsumeIf(Lex::TokenKind::Period)) {
|
|
CARBON_CHECK(context.tree().node_kind(NodeId(state.subtree_start)) ==
|
|
NodeKind::IdentifierNameMaybeBeforeSignature);
|
|
context.AddNode(NodeKind::IdentifierNameQualifierWithParams, *period,
|
|
state.has_error);
|
|
context.PushState(StateKind::DeclNameAndParams);
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|