diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-forever-stack.h | 8 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-forever-stack.hxx | 17 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/gcc/rust/resolve/rust-forever-stack.h b/gcc/rust/resolve/rust-forever-stack.h index 946aef2..0f6ad95 100644 --- a/gcc/rust/resolve/rust-forever-stack.h +++ b/gcc/rust/resolve/rust-forever-stack.h @@ -548,7 +548,7 @@ template <Namespace N> class ForeverStack public: ForeverStack () : root (Node (Rib (Rib::Kind::Normal), UNKNOWN_NODEID)), - prelude (Node (Rib (Rib::Kind::Prelude), UNKNOWN_NODEID, root)), + lang_prelude (Node (Rib (Rib::Kind::Prelude), UNKNOWN_NODEID, root)), cursor_reference (root) { rust_assert (root.is_root ()); @@ -658,8 +658,8 @@ public: * the current map, an empty one otherwise. */ tl::optional<Rib::Definition> get (const Identifier &name); - tl::optional<Rib::Definition> get_prelude (const Identifier &name); - tl::optional<Rib::Definition> get_prelude (const std::string &name); + tl::optional<Rib::Definition> get_lang_prelude (const Identifier &name); + tl::optional<Rib::Definition> get_lang_prelude (const std::string &name); /** * Resolve a path to its definition in the current `ForeverStack` @@ -767,7 +767,7 @@ private: * It has the root node as a parent, and acts as a "special case" for name * resolution */ - Node prelude; + Node lang_prelude; std::reference_wrapper<Node> cursor_reference; diff --git a/gcc/rust/resolve/rust-forever-stack.hxx b/gcc/rust/resolve/rust-forever-stack.hxx index f96a1d7..a8b8f98 100644 --- a/gcc/rust/resolve/rust-forever-stack.hxx +++ b/gcc/rust/resolve/rust-forever-stack.hxx @@ -77,7 +77,7 @@ ForeverStack<N>::push_inner (Rib rib, Link link) rust_assert (&cursor_reference.get () == &root); // Prelude doesn't have an access path rust_assert (!link.path); - update_cursor (this->prelude); + update_cursor (this->lang_prelude); return; } // If the link does not exist, we create it and emplace a new `Node` with the @@ -319,16 +319,16 @@ ForeverStack<N>::get (const Identifier &name) template <Namespace N> tl::optional<Rib::Definition> -ForeverStack<N>::get_prelude (const Identifier &name) +ForeverStack<N>::get_lang_prelude (const Identifier &name) { - return prelude.rib.get (name.as_string ()); + return lang_prelude.rib.get (name.as_string ()); } template <Namespace N> tl::optional<Rib::Definition> -ForeverStack<N>::get_prelude (const std::string &name) +ForeverStack<N>::get_lang_prelude (const std::string &name) { - return prelude.rib.get (name); + return lang_prelude.rib.get (name); } template <> @@ -571,7 +571,7 @@ ForeverStack<N>::resolve_segments ( if (current_node->is_root () && !searched_prelude) { searched_prelude = true; - current_node = &prelude; + current_node = &lang_prelude; continue; } @@ -641,7 +641,8 @@ ForeverStack<N>::resolve_path ( = get (unwrap_type_segment (segments.back ()).as_string ()); if (!res) - res = get_prelude (unwrap_type_segment (segments.back ()).as_string ()); + res = get_lang_prelude ( + unwrap_type_segment (segments.back ()).as_string ()); if (res && !res->is_ambiguous ()) insert_segment_resolution (segments.back (), res->get_node_id ()); @@ -672,7 +673,7 @@ ForeverStack<N>::resolve_path ( seg.is_lower_self_seg ()); // Ok we didn't find it in the rib, Lets try the prelude... if (!res) - res = get_prelude (seg_name); + res = get_lang_prelude (seg_name); if (res && !res->is_ambiguous ()) insert_segment_resolution (segments.back (), res->get_node_id ()); 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 5fcf0ec..d685826 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -235,7 +235,7 @@ Late::visit (AST::IdentifierExpr &expr) } else { - if (auto type = ctx.types.get_prelude (expr.get_ident ())) + if (auto type = ctx.types.get_lang_prelude (expr.get_ident ())) { resolved = type; } |