diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-09-26 22:43:18 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-19 15:32:14 +0100 |
| commit | ad4c2360e393cd7f24b5c7b2405ffa80e92fcf4d (patch) | |
| tree | 7fca405942e832cfc2bf72333ea8818073edf0e2 /gcc | |
| parent | a7992fee681bc5a554ed407f069f2cfb4d9a50a6 (diff) | |
| download | gcc-ad4c2360e393cd7f24b5c7b2405ffa80e92fcf4d.zip gcc-ad4c2360e393cd7f24b5c7b2405ffa80e92fcf4d.tar.gz gcc-ad4c2360e393cd7f24b5c7b2405ffa80e92fcf4d.tar.bz2 | |
gccrs: Change resolved type segment
gcc/rust/ChangeLog:
* resolve/rust-late-name-resolver-2.0.h: Add visit function prototype.
* resolve/rust-late-name-resolver-2.0.cc (Late::visit): Change resolved
type segment.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 13 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc index df67b4f..287972c 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -224,8 +224,10 @@ Late::visit (AST::TypePath &type) // maybe we can overload `resolve_path<Namespace::Types>` to only do // typepath-like path resolution? that sounds good - auto resolved = ctx.types.get (type.get_segments ().back ()->as_string ()); - if (resolved) + auto str = type.get_segments ().back ()->get_ident_segment ().as_string (); + auto values = ctx.types.peek ().get_values (); + + if (auto resolved = ctx.types.get (str)) ctx.map_usage (Usage (type.get_node_id ()), Definition (resolved->get_node_id ())); else @@ -233,6 +235,13 @@ Late::visit (AST::TypePath &type) } void +Late::visit (AST::StructStruct &s) +{ + auto s_vis = [this, &s] () { AST::DefaultASTVisitor::visit (s); }; + ctx.scoped (Rib::Kind::Item, s.get_node_id (), s_vis); +} + +void Late::visit (AST::StructExprStructBase &s) { auto resolved = ctx.types.get (s.get_struct_name ().as_string ()); diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h b/gcc/rust/resolve/rust-late-name-resolver-2.0.h index b44b2d9..c4d0d82 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h @@ -48,6 +48,7 @@ public: void visit (AST::TypePath &) override; void visit (AST::StructExprStructBase &) override; void visit (AST::StructExprStructFields &) override; + void visit (AST::StructStruct &) override; private: /* Setup Rust's builtin types (u8, i32, !...) in the resolver */ |