mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Chandler Carruth
8be274cf60
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
106 lines
3.4 KiB
C++
106 lines
3.4 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 {
|
|
auto HandleChoiceIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushState(state, StateKind::ChoiceDefinitionStart);
|
|
// Choice alternative parameters, parsed separately below, are runtime by
|
|
// default, unlike the choice type parameters handled here.
|
|
context.PushState(StateKind::DeclNameAndParams, state.token,
|
|
BindingContext::CompileTimeEntityParam);
|
|
}
|
|
|
|
auto HandleChoiceDefinitionStart(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(ExpectedChoiceDefinition, Error,
|
|
"choice definition expected");
|
|
context.emitter().Emit(*context.position(), ExpectedChoiceDefinition);
|
|
}
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinitionStart, *context.position(),
|
|
/*has_error=*/true);
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinition, *context.position(),
|
|
/*has_error=*/true);
|
|
|
|
context.SkipPastLikelyEnd(*context.position());
|
|
return;
|
|
}
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinitionStart, context.Consume(),
|
|
state.has_error);
|
|
|
|
state.has_error = false;
|
|
state.kind = StateKind::ChoiceDefinitionFinish;
|
|
context.PushState(state);
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
|
|
context.PushState(StateKind::ChoiceAlternative);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceAlternative(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushState(StateKind::ChoiceAlternativeFinish);
|
|
|
|
auto token = context.ConsumeIf(Lex::TokenKind::Identifier);
|
|
if (!token) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(ExpectedChoiceAlternativeName, Error,
|
|
"expected choice alternative name");
|
|
context.emitter().Emit(*context.position(),
|
|
ExpectedChoiceAlternativeName);
|
|
}
|
|
|
|
context.SkipPastLikelyEnd(*context.position());
|
|
|
|
context.ReturnErrorOnState();
|
|
|
|
return;
|
|
}
|
|
|
|
if (context.PositionIs(Lex::TokenKind::OpenParen)) {
|
|
context.AddLeafNode(NodeKind::IdentifierNameMaybeBeforeSignature, *token);
|
|
context.PushState(StateKind::PatternListAsExplicit);
|
|
} else {
|
|
context.AddLeafNode(NodeKind::IdentifierNameNotBeforeSignature, *token);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceAlternativeFinish(Context& context) -> void {
|
|
const auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
|
|
context.PushState(StateKind::ChoiceAlternative);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (context.ConsumeListToken(
|
|
NodeKind::ChoiceAlternativeListComma, Lex::TokenKind::CloseCurlyBrace,
|
|
state.has_error) == Context::ListTokenKind::Comma) {
|
|
context.PushState(StateKind::ChoiceAlternative);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceDefinitionFinish(Context& context) -> void {
|
|
const auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinition,
|
|
context.ConsumeChecked(Lex::TokenKind::CloseCurlyBrace),
|
|
state.has_error);
|
|
}
|
|
} // namespace Carbon::Parse
|