mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 10:28:11 +00: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
63 lines
2.0 KiB
C++
63 lines
2.0 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
|
|
|
|
#ifndef CARBON_TOOLCHAIN_CHECK_NAME_COMPONENT_H_
|
|
#define CARBON_TOOLCHAIN_CHECK_NAME_COMPONENT_H_
|
|
|
|
#include "toolchain/check/node_stack.h"
|
|
#include "toolchain/parse/node_ids.h"
|
|
#include "toolchain/sem_ir/function.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
class Context;
|
|
|
|
// A component in a declaration name, such as `C[T: type](N: T)` in
|
|
// `fn C[T: type](N: T).F() {}`.
|
|
struct NameComponent {
|
|
// The name of the declaration.
|
|
Parse::NodeId name_loc_id;
|
|
SemIR::NameId name_id;
|
|
|
|
// Parse tree bounds for the parameters, including both implicit and explicit
|
|
// parameters. These will be compared to match between declaration and
|
|
// definition.
|
|
Parse::NodeId first_param_node_id;
|
|
Parse::NodeId last_param_node_id;
|
|
|
|
// The implicit parameter list.
|
|
Parse::NodeId implicit_params_loc_id;
|
|
SemIR::InstBlockId implicit_param_patterns_id;
|
|
|
|
// The explicit parameter list.
|
|
Parse::NodeId params_loc_id;
|
|
SemIR::InstBlockId param_patterns_id;
|
|
|
|
// The `Call` parameters of the entity, if it's a function (see the
|
|
// corresponding members of SemIR::FunctionFields and
|
|
// SemIR::EntityWithParamsBase).
|
|
SemIR::InstBlockId call_param_patterns_id;
|
|
SemIR::InstBlockId call_params_id;
|
|
SemIR::Function::CallParamIndexRanges param_ranges;
|
|
|
|
// The pattern block.
|
|
SemIR::InstBlockId pattern_block_id;
|
|
};
|
|
|
|
// Pops a name component from the node stack (and pattern block stack, if it has
|
|
// parameters).
|
|
auto PopNameComponent(Context& context,
|
|
SemIR::InstId return_pattern_id = SemIR::InstId::None)
|
|
-> NameComponent;
|
|
|
|
// Equivalent to PopNameComponent, but also diagnoses if the name component has
|
|
// parameters.
|
|
auto PopNameComponentWithoutParams(Context& context, Lex::TokenKind introducer)
|
|
-> NameComponent;
|
|
|
|
} // namespace Carbon::Check
|
|
|
|
#endif // CARBON_TOOLCHAIN_CHECK_NAME_COMPONENT_H_
|