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

Use the full name declaration logic when adding var names to scope. (#3312)

Browse Source 
This causes the names of class members to get added to the class scope.
This commit is contained in:
Richard Smith
2023-10-19 21:34:04 +00:00
committed by GitHub
parent b01dfb3f93
commit a95e122123
6 changed files with 129 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/declaration_name_stack.cpp
+26 -7
View File
@@ -8,11 +8,20 @@
namespace Carbon::Check {
auto DeclarationNameStack::MakeEmptyNameContext() -> NameContext {
return NameContext{.target_scope_id = context_->current_scope_id()};
}
auto DeclarationNameStack::MakeUnqualifiedName(Parse::Node parse_node,
SemIR::StringId name_id)
-> NameContext {
NameContext context = MakeEmptyNameContext();
ApplyNameQualifierTo(context, parse_node, name_id);
return context;
}
auto DeclarationNameStack::Push() -> void {
declaration_name_stack_.push_back(
{.state = NameContext::State::New,
.target_scope_id = context_->current_scope_id(),
.resolved_node_id = SemIR::NodeId::Invalid});
declaration_name_stack_.push_back(MakeEmptyNameContext());
}
auto DeclarationNameStack::Pop() -> NameContext {
@@ -41,7 +50,7 @@ auto DeclarationNameStack::LookupOrAddName(NameContext name_context,
// The name is invalid and a diagnostic has already been emitted.
return SemIR::NodeId::Invalid;
case NameContext::State::New:
case NameContext::State::Empty:
CARBON_FATAL() << "Name is missing, not expected to call AddNameToLookup "
"(but that may change based on error handling).";
@@ -98,10 +107,20 @@ auto DeclarationNameStack::ApplyExpressionQualifier(Parse::Node parse_node,
auto DeclarationNameStack::ApplyNameQualifier(Parse::Node parse_node,
SemIR::StringId name_id) -> void {
auto& name_context = declaration_name_stack_.back();
ApplyNameQualifierTo(declaration_name_stack_.back(), parse_node, name_id);
}
auto DeclarationNameStack::ApplyNameQualifierTo(NameContext& name_context,
Parse::Node parse_node,
SemIR::StringId name_id)
-> void {
if (CanResolveQualifier(name_context, parse_node)) {
// For identifier nodes, we need to perform a lookup on the identifier.
// This means the input node_id is actually a string ID.
//
// TODO: This doesn't perform the right kind of lookup. We will find names
// from enclosing lexical scopes here, in the case where `target_scope_id`
// is invalid.
auto resolved_node_id = context_->LookupName(
name_context.parse_node, name_id, name_context.target_scope_id,
/*print_diagnostics=*/false);
@@ -195,7 +214,7 @@ auto DeclarationNameStack::CanResolveQualifier(NameContext& name_context,
return false;
}
case NameContext::State::New:
case NameContext::State::Empty:
case NameContext::State::Resolved: {
name_context.parse_node = parse_node;
return true;