diff options
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-toplevel.h')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-toplevel.h | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h index 8d4e12b..7a1458e 100644 --- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h +++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h @@ -34,13 +34,15 @@ class ResolveTopLevel : public ResolverBase public: static void go (AST::Item *item, const CanonicalPath &prefix, - const CanonicalPath &canonical_prefix, NodeId current_module) + const CanonicalPath &canonical_prefix) { if (item->is_marked_for_strip ()) return; - ResolveTopLevel resolver (prefix, canonical_prefix, current_module); + ResolveTopLevel resolver (prefix, canonical_prefix); item->accept_vis (resolver); + + NodeId current_module = resolver.resolver->peek_current_module_scope (); resolver.mappings->insert_child_item_to_parent_module_mapping ( item->get_node_id (), current_module); }; @@ -64,11 +66,15 @@ public: Definition{module.get_node_id (), module.get_node_id ()}); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, mod); mappings->insert_module_child (current_module, module.get_node_id ()); + resolver->push_new_module_scope (module.get_node_id ()); for (auto &item : module.get_items ()) - ResolveTopLevel::go (item.get (), path, cpath, module.get_node_id ()); + ResolveTopLevel::go (item.get (), path, cpath); + + resolver->pop_module_scope (); mappings->insert_canonical_path (mappings->get_current_crate (), module.get_node_id (), cpath); @@ -89,6 +95,7 @@ public: rust_error_at (r, "redefined multiple times"); }); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, talias); mappings->insert_canonical_path (mappings->get_current_crate (), alias.get_node_id (), cpath); @@ -109,6 +116,7 @@ public: rust_error_at (r, "redefined multiple times"); }); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), struct_decl.get_node_id (), cpath); @@ -130,8 +138,9 @@ public: }); for (auto &variant : enum_decl.get_variants ()) - ResolveTopLevel::go (variant.get (), path, cpath, current_module); + ResolveTopLevel::go (variant.get (), path, cpath); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), enum_decl.get_node_id (), cpath); @@ -152,7 +161,6 @@ public: rust_error_at (r, "redefined multiple times"); }); - mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), item.get_node_id (), cpath); } @@ -229,6 +237,7 @@ public: rust_error_at (r, "redefined multiple times"); }); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), struct_decl.get_node_id (), cpath); @@ -249,6 +258,7 @@ public: rust_error_at (r, "redefined multiple times"); }); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), union_decl.get_node_id (), cpath); @@ -273,6 +283,7 @@ public: var.get_node_id ()}); resolver->mark_decl_mutability (var.get_node_id (), var.is_mutable ()); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), var.get_node_id (), cpath); @@ -295,6 +306,7 @@ public: Definition{constant.get_node_id (), constant.get_node_id ()}); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), constant.get_node_id (), cpath); @@ -325,6 +337,7 @@ public: function.get_node_id ()); } + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), function.get_node_id (), cpath); @@ -403,6 +416,7 @@ public: for (auto &item : trait.get_trait_items ()) ResolveTopLevelTraitItems::go (item.get (), path, cpath); + NodeId current_module = resolver->peek_current_module_scope (); mappings->insert_module_child_item (current_module, decl); mappings->insert_canonical_path (mappings->get_current_crate (), trait.get_node_id (), cpath); @@ -418,8 +432,8 @@ public: private: ResolveTopLevel (const CanonicalPath &prefix, - const CanonicalPath &canonical_prefix, NodeId current_module) - : ResolverBase (UNKNOWN_NODEID, current_module), prefix (prefix), + const CanonicalPath &canonical_prefix) + : ResolverBase (UNKNOWN_NODEID), prefix (prefix), canonical_prefix (canonical_prefix) {} |