diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-07-21 18:22:43 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 19:00:26 +0100 |
| commit | 5a0e099e892d575af167d6a0a7e9ae5f26f439d8 (patch) | |
| tree | 50f1657f3f4c71e9c63d769be27bb5df388d9d2f /gcc/rust/resolve/rust-rib.cc | |
| parent | 7c10950f544f7972317c848bec284af63981943d (diff) | |
| download | gcc-5a0e099e892d575af167d6a0a7e9ae5f26f439d8.zip gcc-5a0e099e892d575af167d6a0a7e9ae5f26f439d8.tar.gz gcc-5a0e099e892d575af167d6a0a7e9ae5f26f439d8.tar.bz2 | |
gccrs: rib2.0: Add shadowing
gcc/rust/ChangeLog:
* resolve/rust-rib.h: Add shadowing parameter. Make kind field public.
* resolve/rust-rib.cc (Rib::insert): Likewise.
Diffstat (limited to 'gcc/rust/resolve/rust-rib.cc')
| -rw-r--r-- | gcc/rust/resolve/rust-rib.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/rust/resolve/rust-rib.cc b/gcc/rust/resolve/rust-rib.cc index 2cc9f3e..21fbe2c 100644 --- a/gcc/rust/resolve/rust-rib.cc +++ b/gcc/rust/resolve/rust-rib.cc @@ -36,13 +36,15 @@ Rib::Rib (Kind kind, std::unordered_map<std::string, NodeId> values) {} tl::expected<NodeId, DuplicateNameError> -Rib::insert (std::string name, NodeId id) +Rib::insert (std::string name, NodeId id, bool can_shadow) { auto res = values.insert ({name, id}); auto inserted_id = res.first->second; + auto existed = !res.second; - // if we couldn't insert, the element already exists - exit with an error - if (!res.second) + // if we couldn't insert, the element already exists - exit with an error, + // unless shadowing is allowed + if (existed && !can_shadow) return tl::make_unexpected (DuplicateNameError (name, inserted_id)); // return the NodeId |