1 files changed, 77 insertions, 15 deletions

diff --git a/gcc/rust/resolve/rust-default-resolver.cc b/gcc/rust/resolve/rust-default-resolver.cc
index 01906cf..f1c0e5c 100644
--- a/gcc/rust/resolve/rust-default-resolver.cc
+++ b/gcc/rust/resolve/rust-default-resolver.cc
@@ -111,17 +111,42 @@ DefaultResolver::visit (AST::IfLetExpr &expr)
 }
 
 void
+DefaultResolver::visit (AST::IfLetExprConseqElse &expr)
+{
+  DefaultResolver::visit (static_cast<AST::IfLetExpr &> (expr));
+  visit (expr.get_else_block ());
+}
+
+void
 DefaultResolver::visit (AST::Trait &trait)
 {
-  auto inner_fn_1
-    = [this, &trait] () { AST::DefaultASTVisitor::visit (trait); };
+  visit_outer_attrs (trait);
+  visit (trait.get_visibility ());
+  visit_inner_attrs (trait);
+
+  auto inner_fn_1 = [this, &trait] () {
+    for (auto &item : trait.get_trait_items ())
+      visit (item);
+  };
 
   auto inner_fn_2 = [this, &trait, &inner_fn_1] () {
+    visit (trait.get_implicit_self ());
+    for (auto &generic : trait.get_generic_params ())
+      visit (generic);
+    if (trait.has_where_clause ())
+      visit (trait.get_where_clause ());
+    for (auto &bound : trait.get_type_param_bounds ())
+      visit (bound);
+
+    ctx.scoped (Rib::Kind::TraitOrImpl, trait.get_node_id (), inner_fn_1);
+  };
+
+  auto inner_fn_3 = [this, &trait, &inner_fn_2] () {
     ctx.canonical_ctx.scope (trait.get_node_id (), trait.get_identifier (),
-			     std::move (inner_fn_1));
+			     std::move (inner_fn_2));
   };
 
-  ctx.scoped (Rib::Kind::TraitOrImpl, trait.get_node_id (), inner_fn_2,
+  ctx.scoped (Rib::Kind::Generics, trait.get_node_id (), inner_fn_3,
 	      trait.get_identifier () /* FIXME: Is that valid?*/);
 }
 
@@ -343,19 +368,15 @@ DefaultResolver::visit (AST::MatchExpr &expr)
 void
 DefaultResolver::visit (AST::ConstantItem &item)
 {
-  if (item.has_expr ())
-    {
-      auto expr_vis_1
-	= [this, &item] () { AST::DefaultASTVisitor::visit (item); };
+  auto expr_vis_1 = [this, &item] () { AST::DefaultASTVisitor::visit (item); };
 
-      auto expr_vis_2 = [this, &item, &expr_vis_1] () {
-	ctx.canonical_ctx.scope (item.get_node_id (), item.get_identifier (),
-				 std::move (expr_vis_1));
-      };
+  auto expr_vis_2 = [this, &item, &expr_vis_1] () {
+    ctx.canonical_ctx.scope (item.get_node_id (), item.get_identifier (),
+			     std::move (expr_vis_1));
+  };
 
-      // FIXME: Why do we need a Rib here?
-      ctx.scoped (Rib::Kind::ConstantItem, item.get_node_id (), expr_vis_2);
-    }
+  // FIXME: Why do we need a Rib here?
+  ctx.scoped (Rib::Kind::ConstantItem, item.get_node_id (), expr_vis_2);
 }
 
 void
@@ -380,5 +401,46 @@ DefaultResolver::visit (AST::TypeParam &param)
   ctx.scoped (Rib::Kind::ForwardTypeParamBan, param.get_node_id (), expr_vis);
 }
 
+void
+DefaultResolver::visit_extern_crate (AST::ExternCrate &extern_crate,
+				     AST::Crate &crate, CrateNum num)
+{
+  visit (crate);
+}
+
+void
+DefaultResolver::visit (AST::ExternCrate &crate)
+{
+  auto &mappings = Analysis::Mappings::get ();
+  auto num_opt = mappings.lookup_crate_name (crate.get_referenced_crate ());
+
+  if (!num_opt)
+    {
+      rust_error_at (crate.get_locus (), "unknown crate %qs",
+		     crate.get_referenced_crate ().c_str ());
+      return;
+    }
+
+  CrateNum num = *num_opt;
+
+  AST::Crate &referenced_crate = mappings.get_ast_crate (num);
+
+  auto sub_visitor_1
+    = [&, this] () { visit_extern_crate (crate, referenced_crate, num); };
+
+  auto sub_visitor_2 = [&] () {
+    ctx.canonical_ctx.scope_crate (referenced_crate.get_node_id (),
+				   crate.get_referenced_crate (),
+				   std::move (sub_visitor_1));
+  };
+
+  if (crate.has_as_clause ())
+    ctx.scoped (Rib::Kind::Module, referenced_crate.get_node_id (),
+		sub_visitor_2, crate.get_as_clause ());
+  else
+    ctx.scoped (Rib::Kind::Module, referenced_crate.get_node_id (),
+		sub_visitor_2, crate.get_referenced_crate ());
+}
+
 } // namespace Resolver2_0
 } // namespace Rust