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

Rename enclosing scope to parent scope (#4020)

Browse Source 
Following up on discussion from #3948, doing a general rename of
"enclosing scope" to "parent scope" (and "enclosing scopes" to "ancestor
scopes"). The intent is to improve understandability and collide less
with C++ terminology for "enclosing scope". Note this changes most uses
of "enclosing", but leaves behind a few like "enclosing function" and
"enclosing block".

Note this does create some "parent class" mentions for "adapt" and "var"
(the class they're within), which is maybe unfortunate, but we'd
probably say "base class" if we meant inheritance so perhaps that's
okay. Along the same lines, these are the only `parent_class` uses I see
now, and we do have a few `base_class`.
This commit is contained in:
Jon Ross-Perkins
2024-06-04 19:57:14 +00:00
committed by GitHub
parent 83413479d7
commit d9c62b106d
33 changed files with 237 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/decl_name_stack.cpp
+14 -14
View File
@@ -38,7 +38,7 @@ auto DeclNameStack::NameContext::prev_inst_id() -> SemIR::InstId {
auto DeclNameStack::MakeEmptyNameContext() -> NameContext {
return NameContext{
.initial_scope_index = context_->scope_stack().PeekIndex(),
.enclosing_scope_id = context_->scope_stack().PeekNameScopeId()};
.parent_scope_id = context_->scope_stack().PeekNameScopeId()};
}
auto DeclNameStack::MakeUnqualifiedName(SemIR::LocId loc_id,
@@ -88,19 +88,19 @@ auto DeclNameStack::Suspend() -> SuspendedName {
<< "Missing call to FinishName before Suspend";
SuspendedName result = {.name_context = decl_name_stack_.pop_back_val(),
.scopes = {}};
auto enclosing_index = result.name_context.initial_scope_index;
auto scope_index = result.name_context.initial_scope_index;
auto& scope_stack = context_->scope_stack();
while (scope_stack.PeekIndex() > enclosing_index) {
while (scope_stack.PeekIndex() > scope_index) {
result.scopes.push_back(scope_stack.Suspend());
}
CARBON_CHECK(scope_stack.PeekIndex() == enclosing_index)
<< "Scope index " << enclosing_index
<< " does not enclose the current scope " << scope_stack.PeekIndex();
CARBON_CHECK(scope_stack.PeekIndex() == scope_index)
<< "Scope index " << scope_index << " does not enclose the current scope "
<< scope_stack.PeekIndex();
return result;
}
auto DeclNameStack::Restore(SuspendedName sus) -> void {
// The enclosing state must be the same when a name is restored.
// The parent state must be the same when a name is restored.
CARBON_CHECK(context_->scope_stack().PeekIndex() ==
sus.name_context.initial_scope_index)
<< "Name restored at the wrong position in the name stack.";
@@ -121,11 +121,11 @@ auto DeclNameStack::AddName(NameContext name_context, SemIR::InstId target_id)
return;
case NameContext::State::Unresolved:
if (!name_context.enclosing_scope_id.is_valid()) {
if (!name_context.parent_scope_id.is_valid()) {
context_->AddNameToLookup(name_context.unresolved_name_id, target_id);
} else {
auto& name_scope =
context_->name_scopes().Get(name_context.enclosing_scope_id);
context_->name_scopes().Get(name_context.parent_scope_id);
if (name_context.has_qualifiers) {
auto inst = context_->insts().Get(name_scope.inst_id);
if (!inst.Is<SemIR::Namespace>()) {
@@ -150,7 +150,7 @@ auto DeclNameStack::AddName(NameContext name_context, SemIR::InstId target_id)
CARBON_CHECK(success)
<< "Duplicate names should have been resolved previously: "
<< name_context.unresolved_name_id << " in "
<< name_context.enclosing_scope_id;
<< name_context.parent_scope_id;
}
break;
@@ -210,7 +210,7 @@ auto DeclNameStack::ApplyAndLookupName(NameContext& name_context,
// For identifier nodes, we need to perform a lookup on the identifier.
auto resolved_inst_id = context_->LookupNameInDecl(
name_context.loc_id, name_id, name_context.enclosing_scope_id);
name_context.loc_id, name_id, name_context.parent_scope_id);
if (!resolved_inst_id.is_valid()) {
// Invalid indicates an unresolved name. Store it and return.
name_context.unresolved_name_id = name_id;
@@ -255,7 +255,7 @@ auto DeclNameStack::UpdateScopeIfNeeded(NameContext& name_context,
const auto& class_info = context_->classes().Get(resolved_inst.class_id);
if (class_info.is_defined()) {
name_context.state = NameContext::State::Resolved;
name_context.enclosing_scope_id = class_info.scope_id;
name_context.parent_scope_id = class_info.scope_id;
if (!is_unqualified) {
PushNameQualifierScope(*context_, name_context.resolved_inst_id,
class_info.scope_id);
@@ -270,7 +270,7 @@ auto DeclNameStack::UpdateScopeIfNeeded(NameContext& name_context,
context_->interfaces().Get(resolved_inst.interface_id);
if (interface_info.is_defined()) {
name_context.state = NameContext::State::Resolved;
name_context.enclosing_scope_id = interface_info.scope_id;
name_context.parent_scope_id = interface_info.scope_id;
if (!is_unqualified) {
PushNameQualifierScope(*context_, name_context.resolved_inst_id,
interface_info.scope_id);
@@ -283,7 +283,7 @@ auto DeclNameStack::UpdateScopeIfNeeded(NameContext& name_context,
case CARBON_KIND(SemIR::Namespace resolved_inst): {
auto scope_id = resolved_inst.name_scope_id;
name_context.state = NameContext::State::Resolved;
name_context.enclosing_scope_id = scope_id;
name_context.parent_scope_id = scope_id;
auto& scope = context_->name_scopes().Get(scope_id);
if (scope.is_closed_import) {
CARBON_DIAGNOSTIC(QualifiedDeclOutsidePackage, Error,