carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 11:21:05 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Factor out pushing / popping of names plus parameters. (#4005)

Browse Source 
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.
This commit is contained in:
Richard Smith
2024-05-30 16:05:35 +00:00
committed by GitHub
parent cda5f66d22
commit 28cefe98df
24 changed files with 249 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/decl_name_stack.cpp
+8 -22
View File
@@ -55,28 +55,12 @@ auto DeclNameStack::PushScopeAndStartName() -> void {
context_->scope_stack().Push();
}
auto DeclNameStack::FinishName() -> NameContext {
auto DeclNameStack::FinishName(const NameComponent& name) -> NameContext {
CARBON_CHECK(decl_name_stack_.back().state != NameContext::State::Finished)
<< "Finished name twice";
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 [loc_id, name_id] = context_->node_stack().PopNameWithNodeId();
ApplyNameQualifier(loc_id, name_id);
if (params_id || implicit_params_id) {
// TODO: Say which kind of declaration we're parsing.
CARBON_DIAGNOSTIC(UnexpectedDeclNameParams, Error,
"Declaration cannot have parameters.");
// Point to the lexically first parameter list in the diagnostic.
context_->emitter().Emit(implicit_params_id
? static_cast<SemIRLoc>(implicit_params_loc_id)
: params_loc_id,
UnexpectedDeclNameParams);
}
ApplyNameQualifierTo(decl_name_stack_.back(), name.name_loc_id, name.name_id,
/*is_unqualified=*/false);
NameContext result = decl_name_stack_.back();
decl_name_stack_.back().state = NameContext::State::Finished;
@@ -194,9 +178,11 @@ auto DeclNameStack::LookupOrAddName(NameContext name_context,
return SemIR::InstId::Invalid;
}
auto DeclNameStack::ApplyNameQualifier(SemIR::LocId loc_id,
SemIR::NameId name_id) -> void {
ApplyNameQualifierTo(decl_name_stack_.back(), loc_id, name_id,
auto DeclNameStack::ApplyNameQualifier(const NameComponent& name) -> void {
if (name.implicit_params_id.is_valid() || name.params_id.is_valid()) {
context_->TODO(name.params_loc_id, "name qualifier with parameters");
}
ApplyNameQualifierTo(decl_name_stack_.back(), name.name_loc_id, name.name_id,
/*is_unqualified=*/false);
}