mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Add imports of enclosing scopes. (#3575)
Namespaces are copied, which means also adding their name to the underlying instruction. It happened not to be done previously; the name was only in name lookup. Since the only import supported right now is the default import, functionality is limited; in the future I'll need to deal with namespace vs package conflicts. Tests of namespace imports are under "namespace" -- I figured this would be best for scaling as more instructions get support. This also improves some debugging-related output that I was trying to use while trying to build the support. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
co-authored by
Richard Smith
parent
848d4d7ec0
commit
cad4605dad
@@ -76,10 +76,8 @@ static auto BuildInterfaceDecl(Context& context,
|
||||
// invalid.
|
||||
// TODO: should have a `Self` type id member
|
||||
interface_decl.interface_id = context.interfaces().Add(
|
||||
{.name_id =
|
||||
name_context.state == DeclNameStack::NameContext::State::Unresolved
|
||||
? name_context.unresolved_name_id
|
||||
: SemIR::NameId::Invalid,
|
||||
{.name_id = name_context.name_id_for_new_inst(),
|
||||
.enclosing_scope_id = name_context.enclosing_scope_id_for_new_inst(),
|
||||
.decl_id = interface_decl_id});
|
||||
}
|
||||
|
||||
@@ -116,7 +114,8 @@ auto HandleInterfaceDefinitionStart(
|
||||
.Emit();
|
||||
} else {
|
||||
interface_info.definition_id = interface_decl_id;
|
||||
interface_info.scope_id = context.name_scopes().Add(interface_decl_id);
|
||||
interface_info.scope_id = context.name_scopes().Add(
|
||||
interface_decl_id, interface_info.enclosing_scope_id);
|
||||
}
|
||||
|
||||
// Enter the interface scope.
|
||||
|
||||
Reference in New Issue
Block a user