mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 20:10:13 +01:00
Implement the toolchain side of proposal #7254, removing the `:!` binding syntax for generic and template parameters in favor of the keywords `generic`, `template`, and `runtime` plus contextual defaults for phase. For valid programs this is semantics-preserving: each binding resolves to the same phase, and produces the same SemIR, as it did under `:!`/`:`. The parser derives a binding's phase from its syntactic context plus any explicit phase keyword; new diagnostics and error recovery for misused keywords are described below. Implementation details for each component: - Lexer: remove the `:!` (`ColonExclaim`) token, move its virtual parse-node budget onto `:`, and add the `generic` and `runtime` keywords. - Parser: thread a `BindingContext` (`ExplicitParam`, `DeducedParam`, or `CompileTimeEntityParam`) from declaration introducers down through parameter lists to each binding pattern, using a one-token lookahead to distinguish a name-qualifier parameter list from a declaration's own final list. Parameters of a compile-time entity (`class`, `interface`, `constraint`, `choice`, `alias`, `export`, `namespace`) and deduced `[]` parameters default to checked generic; explicit function parameters and local bindings default to runtime. `HandleBindingPattern` resolves the phase from that context plus the keyword: a `generic` keyword needs no node of its own (the phase is carried by the binding's node kind), while a `runtime` keyword is preserved as a `RuntimeBindingName` node so `check` can name it in a diagnostic. A phase keyword that is merely redundant with the contextual default is diagnosed here, without invalidating the parse tree. - Check: a phase keyword that is invalid for its context (for example `runtime` on a checked-generic parameter) is diagnosed here, and recovers by building an error binding that still introduces the name so that later uses of it do not produce cascading errors. The removed `:!` syntax is now rejected as an ordinary parse error. The `form`/`:?`/`->?` ("extended types") portion of proposal #7254 is left for a separate change. Assisted-by: Claude Code
140 lines
5.5 KiB
C++
140 lines
5.5 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 {
|
|
|
|
// Determines the binding context for an explicit `()` parameter list beginning
|
|
// at the current position. A list that is a name qualifier (its matched `)` is
|
|
// immediately followed by `.`) names a compile-time entity, so its parameters
|
|
// use the compile-time-entity context; otherwise the list uses the enclosing
|
|
// declaration's default `decl_context`.
|
|
static auto ExplicitParamListContext(Context& context,
|
|
BindingContext decl_context)
|
|
-> BindingContext {
|
|
// A compile-time entity's parameters are compile-time whether or not this
|
|
// list is a name qualifier, so there is no need to look ahead for the `.`.
|
|
if (decl_context == BindingContext::CompileTimeEntityParam) {
|
|
return decl_context;
|
|
}
|
|
auto open_paren = *context.position();
|
|
auto close_paren = context.tokens().GetMatchedClosingToken(open_paren);
|
|
auto after_close = Lex::TokenIndex(close_paren.index + 1);
|
|
if (context.tokens().GetKind(after_close) == Lex::TokenKind::Period) {
|
|
return BindingContext::CompileTimeEntityParam;
|
|
}
|
|
return decl_context;
|
|
}
|
|
|
|
// 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);
|
|
// Carry the declaration's binding context across the qualified name so
|
|
// the final parameter list uses the declaration's default phase.
|
|
context.PushState(StateKind::DeclNameAndParams, *context.position(),
|
|
state.binding_context);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenSquareBracket:
|
|
context.AddLeafNode(before_params_kind, name_token);
|
|
state.kind = StateKind::DeclNameAndParamsAfterImplicit;
|
|
context.PushState(state);
|
|
context.PushState(StateKind::PatternListAsImplicit, *context.position(),
|
|
BindingContext::DeducedParam);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenParen:
|
|
context.AddLeafNode(before_params_kind, name_token);
|
|
state.kind = StateKind::DeclNameAndParamsAfterParams;
|
|
context.PushState(state);
|
|
context.PushState(
|
|
StateKind::PatternListAsExplicit, *context.position(),
|
|
ExplicitParamListContext(context, state.binding_context));
|
|
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, *context.position(),
|
|
ExplicitParamListContext(context, state.binding_context));
|
|
}
|
|
|
|
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, *context.position(),
|
|
state.binding_context);
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|