gccrs: early: Resolve imports and create import mappings

gcc/rust/ChangeLog:

	* resolve/rust-early-name-resolver-2.0.cc (Early::resolve_glob_import): New function.
	(Early::resolve_simple_import): Likewise.
	(Early::resolve_rebind_import): Likewise.
	(Early::build_import_mapping): Likewise.
	* resolve/rust-early-name-resolver-2.0.h: Add declarations and list of imports to
	resolve.
	* resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::handle_use_glob): Remove function,
	which is now being handled by the Early name resolver.
	(TopLevel::handle_use_dec): Likewise.
	(TopLevel::handle_rebind): Likewise.
	* resolve/rust-toplevel-name-resolver-2.0.h: Likewise, and add functions for creating
	import list and fetching it.

1 files changed, 0 insertions, 188 deletions

diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
index 3ce1630..8a1d8be 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -427,194 +427,6 @@ TopLevel::visit (AST::ConstantItem &const_item)
   DefaultResolver::visit (const_item);
 }
 
-bool
-TopLevel::handle_use_glob (AST::SimplePath &glob)
-{
-  auto resolved = ctx.types.resolve_path (glob.get_segments ());
-  if (!resolved.has_value ())
-    return false;
-
-  auto result
-    = Analysis::Mappings::get ().lookup_ast_module (resolved->get_node_id ());
-
-  if (!result.has_value ())
-    return false;
-
-  GlobbingVisitor gvisitor (ctx);
-  gvisitor.go (result.value ());
-
-  return true;
-}
-
-bool
-TopLevel::handle_use_dec (AST::SimplePath &path)
-{
-  auto locus = path.get_final_segment ().get_locus ();
-  auto declared_name = path.get_final_segment ().as_string ();
-
-  // In that function, we only need to declare a new definition - the use path.
-  // the resolution needs to happpen in the EarlyNameResolver. So the
-  // definitions we'll add will be the path's NodeId - that makes sense, as we
-  // need one definition per path declared in a Use tree. so all good.
-  // alright, now in what namespace do we declare them? all of them? do we only
-  // declare them in the EarlyNameResolver? this is dodgy
-
-  // in what namespace do we perform path resolution? All of them? see which one
-  // matches? Error out on ambiguities?
-  // so, apparently, for each one that matches, add it to the proper namespace
-  // :(
-
-  auto found = false;
-
-  auto resolve_and_insert
-    = [this, &found, &declared_name, locus] (Namespace ns,
-					     const AST::SimplePath &path) {
-	tl::optional<Rib::Definition> resolved = tl::nullopt;
-
-	insert_or_error_out (declared_name, locus, path.get_node_id (), ns);
-	// what do we do here with the full simplepath? do we add it to an extra
-	// map?
-
-	// FIXME: resolve_path needs to return an `expected<NodeId, Error>` so
-	// that we can improve it with hints or location or w/ever. and maybe
-	// only emit it the first time.
-	switch (ns)
-	  {
-	  case Namespace::Values:
-	    resolved = ctx.values.resolve_path (path.get_segments ());
-	    break;
-	  case Namespace::Types:
-	    resolved = ctx.types.resolve_path (path.get_segments ());
-	    break;
-	  case Namespace::Macros:
-	    resolved = ctx.macros.resolve_path (path.get_segments ());
-	    break;
-	  case Namespace::Labels:
-	    // TODO: Is that okay?
-	    rust_unreachable ();
-	  }
-
-	// FIXME: Ugly
-	(void) resolved.map ([this, &found, &declared_name, locus, ns,
-			      path] (Rib::Definition def) {
-	  found = true;
-
-	  // what do we do with the id?
-	  insert_or_error_out (declared_name, locus, def.get_node_id (), ns);
-	  auto result = node_forwarding.find (def.get_node_id ());
-	  if (result != node_forwarding.cend ()
-	      && result->second != path.get_node_id ())
-	    rust_error_at (path.get_locus (), "%qs defined multiple times",
-			   declared_name.c_str ());
-	  else // No previous thing has inserted this into our scope
-	    node_forwarding.insert ({def.get_node_id (), path.get_node_id ()});
-
-	  return def.get_node_id ();
-	});
-      };
-
-  resolve_and_insert (Namespace::Values, path);
-  resolve_and_insert (Namespace::Types, path);
-  resolve_and_insert (Namespace::Macros, path);
-
-  return found;
-}
-
-bool
-TopLevel::handle_rebind (std::pair<AST::SimplePath, AST::UseTreeRebind> &rebind)
-{
-  auto &path = rebind.first;
-
-  location_t locus = UNKNOWN_LOCATION;
-  std::string declared_name;
-
-  switch (rebind.second.get_new_bind_type ())
-    {
-    case AST::UseTreeRebind::NewBindType::IDENTIFIER:
-      declared_name = rebind.second.get_identifier ().as_string ();
-      locus = rebind.second.get_identifier ().get_locus ();
-      break;
-    case AST::UseTreeRebind::NewBindType::NONE:
-      declared_name = path.get_final_segment ().as_string ();
-      locus = path.get_final_segment ().get_locus ();
-      break;
-    case AST::UseTreeRebind::NewBindType::WILDCARD:
-      rust_unreachable ();
-      break;
-    }
-
-  // in what namespace do we perform path resolution? All
-  // of them? see which one matches? Error out on
-  // ambiguities? so, apparently, for each one that
-  // matches, add it to the proper namespace
-  // :(
-  auto found = false;
-
-  auto resolve_and_insert = [this, &found, &declared_name,
-			     locus] (Namespace ns,
-				     const AST::SimplePath &path) {
-    tl::optional<Rib::Definition> resolved = tl::nullopt;
-    tl::optional<Rib::Definition> resolved_bind = tl::nullopt;
-
-    std::vector<AST::SimplePathSegment> declaration_v
-      = {AST::SimplePathSegment (declared_name, locus)};
-    // FIXME: resolve_path needs to return an `expected<NodeId, Error>` so
-    // that we can improve it with hints or location or w/ever. and maybe
-    // only emit it the first time.
-    switch (ns)
-      {
-      case Namespace::Values:
-	resolved = ctx.values.resolve_path (path.get_segments ());
-	resolved_bind = ctx.values.resolve_path (declaration_v);
-	break;
-      case Namespace::Types:
-	resolved = ctx.types.resolve_path (path.get_segments ());
-	resolved_bind = ctx.types.resolve_path (declaration_v);
-	break;
-      case Namespace::Macros:
-	resolved = ctx.macros.resolve_path (path.get_segments ());
-	resolved_bind = ctx.macros.resolve_path (declaration_v);
-	break;
-      case Namespace::Labels:
-	// TODO: Is that okay?
-	rust_unreachable ();
-      }
-
-    resolved.map ([this, &found, &declared_name, locus, ns, path,
-		   &resolved_bind] (Rib::Definition def) {
-      found = true;
-
-      insert_or_error_out (declared_name, locus, def.get_node_id (), ns);
-      if (resolved_bind.has_value ())
-	{
-	  auto bind_def = resolved_bind.value ();
-	  // what do we do with the id?
-	  auto result = node_forwarding.find (bind_def.get_node_id ());
-	  if (result != node_forwarding.cend ()
-	      && result->second != path.get_node_id ())
-	    rust_error_at (path.get_locus (), "%qs defined multiple times",
-			   declared_name.c_str ());
-	}
-      else
-	{
-	  // No previous thing has inserted this into our scope
-	  node_forwarding.insert ({def.get_node_id (), path.get_node_id ()});
-	}
-      return def.get_node_id ();
-    });
-  };
-
-  // do this for all namespaces (even Labels?)
-
-  resolve_and_insert (Namespace::Values, path);
-  resolve_and_insert (Namespace::Types, path);
-  resolve_and_insert (Namespace::Macros, path);
-
-  // TODO: No labels? No, right?
-
-  return found;
-}
-
 static void
 flatten_rebind (
   const AST::UseTreeRebind &glob,