diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-09-26 22:43:18 +0200 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-09-26 22:48:32 +0000 |
| commit | 5257adfe812c513259bc2318f5f82dd978022629 (patch) | |
| tree | 9db2a37d1e3ed9d3279a2f2100c7ae21e070d0c4 | |
| parent | feba3ba1b552c6c71fc386f78cab6aaccf097fe4 (diff) | |
| download | gcc-5257adfe812c513259bc2318f5f82dd978022629.zip gcc-5257adfe812c513259bc2318f5f82dd978022629.tar.gz gcc-5257adfe812c513259bc2318f5f82dd978022629.tar.bz2 | |
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>
| -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 addb5bd..9472d8c 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 ee712b3..b02101a 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 */ |