diff options
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-toplevel.h')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-toplevel.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-toplevel.h b/gcc/rust/resolve/rust-ast-resolve-toplevel.h index 9f0d816..9abbb18 100644 --- a/gcc/rust/resolve/rust-ast-resolve-toplevel.h +++ b/gcc/rust/resolve/rust-ast-resolve-toplevel.h @@ -42,7 +42,8 @@ public: void visit (AST::TypeAlias &alias) override { auto path - = prefix.append (CanonicalPath::new_seg (alias.get_new_type_name ())); + = prefix.append (CanonicalPath::new_seg (alias.get_node_id (), + alias.get_new_type_name ())); resolver->get_type_scope ().insert ( path, alias.get_node_id (), alias.get_locus (), false, [&] (const CanonicalPath &, NodeId, Location locus) -> void { @@ -55,7 +56,8 @@ public: void visit (AST::TupleStruct &struct_decl) override { auto path - = prefix.append (CanonicalPath::new_seg (struct_decl.get_identifier ())); + = prefix.append (CanonicalPath::new_seg (struct_decl.get_node_id (), + struct_decl.get_identifier ())); resolver->get_type_scope ().insert ( path, struct_decl.get_node_id (), struct_decl.get_locus (), false, [&] (const CanonicalPath &, NodeId, Location locus) -> void { @@ -68,7 +70,8 @@ public: void visit (AST::StructStruct &struct_decl) override { auto path - = prefix.append (CanonicalPath::new_seg (struct_decl.get_identifier ())); + = prefix.append (CanonicalPath::new_seg (struct_decl.get_node_id (), + struct_decl.get_identifier ())); resolver->get_type_scope ().insert ( path, struct_decl.get_node_id (), struct_decl.get_locus (), false, [&] (const CanonicalPath &, NodeId, Location locus) -> void { @@ -80,7 +83,8 @@ public: void visit (AST::StaticItem &var) override { - auto path = prefix.append (CanonicalPath::new_seg (var.get_identifier ())); + auto path = prefix.append ( + CanonicalPath::new_seg (var.get_node_id (), var.get_identifier ())); resolver->get_name_scope ().insert ( path, var.get_node_id (), var.get_locus (), false, [&] (const CanonicalPath &, NodeId, Location locus) -> void { @@ -163,7 +167,8 @@ public: type_resolve_generic_args); CanonicalPath projection - = TraitImplProjection::resolve (trait_type_seg, impl_type_seg); + = TraitImplProjection::resolve (impl_block.get_node_id (), trait_type_seg, + impl_type_seg); CanonicalPath impl_prefix = prefix.append (projection); for (auto &impl_item : impl_block.get_impl_items ()) @@ -172,8 +177,8 @@ public: void visit (AST::Trait &trait) override { - CanonicalPath path - = prefix.append (CanonicalPath::new_seg (trait.get_identifier ())); + CanonicalPath path = prefix.append ( + CanonicalPath::new_seg (trait.get_node_id (), trait.get_identifier ())); resolver->get_type_scope ().insert ( path, trait.get_node_id (), trait.get_locus (), false, [&] (const CanonicalPath &, NodeId, Location locus) -> void { |