mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 20:30:14 +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
162 lines
6.8 KiB
C++
162 lines
6.8 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/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Handles PatternListElementAs(Tuple|Explicit|Implicit).
|
|
static auto HandlePatternListElement(Context& context, StateKind pattern_state,
|
|
StateKind finish_state_kind) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushStateForPattern(finish_state_kind, state.in_var_pattern,
|
|
state.in_unused_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);
|
|
}
|
|
|
|
auto HandlePatternListElementAsTuple(Context& context) -> void {
|
|
HandlePatternListElement(context, StateKind::Pattern,
|
|
StateKind::PatternListElementFinishAsTuple);
|
|
}
|
|
|
|
auto HandlePatternListElementAsExplicit(Context& context) -> void {
|
|
HandlePatternListElement(context, StateKind::Pattern,
|
|
StateKind::PatternListElementFinishAsExplicit);
|
|
}
|
|
|
|
auto HandlePatternListElementAsImplicit(Context& context) -> void {
|
|
HandlePatternListElement(context, StateKind::Pattern,
|
|
StateKind::PatternListElementFinishAsImplicit);
|
|
}
|
|
|
|
// Handles PatternListElementFinishAs(Tuple|Explicit|Implicit).
|
|
static auto HandlePatternListElementFinish(Context& context,
|
|
Lex::TokenKind close_token,
|
|
StateKind param_state_kind) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
}
|
|
|
|
auto list_token_kind = context.ConsumeListToken(NodeKind::PatternListComma,
|
|
close_token, state.has_error);
|
|
|
|
// If we have a comma, the parent is now a tuple pattern not a parenthesized
|
|
// pattern.
|
|
if (list_token_kind != Context::ListTokenKind::Close &&
|
|
param_state_kind == StateKind::PatternListElementAsTuple) {
|
|
auto parent_state = context.PopState();
|
|
CARBON_CHECK(parent_state.kind == StateKind::PatternListFinishAsTuple ||
|
|
parent_state.kind == StateKind::PatternListFinishAsParen);
|
|
context.PushState(parent_state, StateKind::PatternListFinishAsTuple);
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|
|
|
|
auto HandlePatternListElementFinishAsTuple(Context& context) -> void {
|
|
HandlePatternListElementFinish(context, Lex::TokenKind::CloseParen,
|
|
StateKind::PatternListElementAsTuple);
|
|
}
|
|
|
|
auto HandlePatternListElementFinishAsExplicit(Context& context) -> void {
|
|
HandlePatternListElementFinish(context, Lex::TokenKind::CloseParen,
|
|
StateKind::PatternListElementAsExplicit);
|
|
}
|
|
|
|
auto HandlePatternListElementFinishAsImplicit(Context& context) -> void {
|
|
HandlePatternListElementFinish(context, Lex::TokenKind::CloseSquareBracket,
|
|
StateKind::PatternListElementAsImplicit);
|
|
}
|
|
|
|
// Handles PatternListAs(Tuple|Explicit|Implicit).
|
|
static auto HandlePatternList(Context& context, NodeKind node_kind,
|
|
Lex::TokenKind open_token_kind,
|
|
Lex::TokenKind close_token_kind,
|
|
StateKind param_state,
|
|
StateKind finish_state_empty,
|
|
StateKind finish_state_nonempty) -> void {
|
|
auto state = context.PopState();
|
|
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);
|
|
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());
|
|
}
|
|
}
|
|
|
|
auto HandlePatternListAsTuple(Context& context) -> void {
|
|
// If the list is nonempty, use PatternListFinishAsParen as the parent. This
|
|
// will be replaced by PatternListFinishAsTuple if we see a comma.
|
|
HandlePatternList(
|
|
context, NodeKind::TuplePatternStart, Lex::TokenKind::OpenParen,
|
|
Lex::TokenKind::CloseParen, StateKind::PatternListElementAsTuple,
|
|
StateKind::PatternListFinishAsTuple, StateKind::PatternListFinishAsParen);
|
|
}
|
|
|
|
auto HandlePatternListAsExplicit(Context& context) -> void {
|
|
HandlePatternList(context, NodeKind::ExplicitParamListStart,
|
|
Lex::TokenKind::OpenParen, Lex::TokenKind::CloseParen,
|
|
StateKind::PatternListElementAsExplicit,
|
|
StateKind::PatternListFinishAsExplicit,
|
|
StateKind::PatternListFinishAsExplicit);
|
|
}
|
|
|
|
auto HandlePatternListAsImplicit(Context& context) -> void {
|
|
HandlePatternList(context, NodeKind::ImplicitParamListStart,
|
|
Lex::TokenKind::OpenSquareBracket,
|
|
Lex::TokenKind::CloseSquareBracket,
|
|
StateKind::PatternListElementAsImplicit,
|
|
StateKind::PatternListFinishAsImplicit,
|
|
StateKind::PatternListFinishAsImplicit);
|
|
}
|
|
|
|
// Handles PatternListFinishAs(Paren|Tuple|Explicit|Implicit).
|
|
static auto HandlePatternListFinish(Context& context, NodeKind node_kind,
|
|
Lex::TokenKind token_kind) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(node_kind, context.ConsumeChecked(token_kind),
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsParen(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::ParenPattern,
|
|
Lex::TokenKind::CloseParen);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsTuple(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::TuplePattern,
|
|
Lex::TokenKind::CloseParen);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsExplicit(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::ExplicitParamList,
|
|
Lex::TokenKind::CloseParen);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsImplicit(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::ImplicitParamList,
|
|
Lex::TokenKind::CloseSquareBracket);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|