mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Richard Smith
28cefe98df
Previously we did some of this in decl_name_stack and some of it in the callers of decl_name_stack. Factor out a single place to pop a name and its optional following parameters. Part of making this behavior consistent is that we now track whether an implicit parameter list was present or absent rather than mapping an absent list to `InstBlockId::Empty`. This improves our redeclaration checking and the precision of some diagnostics.
51 lines
1.9 KiB
C++
51 lines
1.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/check/name_component.h"
|
|
|
|
#include "toolchain/check/context.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto PopNameComponent(Context& context) -> NameComponent {
|
|
auto [params_loc_id, params_id] =
|
|
context.node_stack().PopWithNodeIdIf<Parse::NodeKind::TuplePattern>();
|
|
auto [implicit_params_loc_id, implicit_params_id] =
|
|
context.node_stack()
|
|
.PopWithNodeIdIf<Parse::NodeKind::ImplicitParamList>();
|
|
auto [name_loc_id, name_id] = context.node_stack().PopNameWithNodeId();
|
|
return {
|
|
.name_loc_id = name_loc_id,
|
|
.name_id = name_id,
|
|
.implicit_params_loc_id = implicit_params_loc_id,
|
|
.implicit_params_id =
|
|
implicit_params_id.value_or(SemIR::InstBlockId::Invalid),
|
|
.params_loc_id = params_loc_id,
|
|
.params_id = params_id.value_or(SemIR::InstBlockId::Invalid),
|
|
};
|
|
}
|
|
|
|
// Pop the name of a declaration from the node stack, and diagnose if it has
|
|
// parameters.
|
|
auto PopNameComponentWithoutParams(Context& context, Lex::TokenKind introducer)
|
|
-> NameComponent {
|
|
NameComponent name = PopNameComponent(context);
|
|
if (name.implicit_params_id.is_valid() || name.params_id.is_valid()) {
|
|
CARBON_DIAGNOSTIC(UnexpectedDeclNameParams, Error,
|
|
"`{0}` declaration cannot have parameters.",
|
|
Lex::TokenKind);
|
|
// Point to the lexically first parameter list in the diagnostic.
|
|
context.emitter().Emit(name.implicit_params_id.is_valid()
|
|
? name.implicit_params_loc_id
|
|
: name.params_loc_id,
|
|
UnexpectedDeclNameParams, introducer);
|
|
|
|
name.implicit_params_id = SemIR::InstBlockId::Invalid;
|
|
name.params_id = SemIR::InstBlockId::Invalid;
|
|
}
|
|
return name;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|