Remove residual uses of fold, and fold itself.

Author: graydon

src/comp/driver/rustc.rs

@@ -90,8 +90,6 @@ fn compile_input(session::session sess,
                       bind parse_input(sess, p, input));
     if (sess.get_opts().output_type == link::output_type_none) {ret;}
 
-    crate = time(time_passes, "external crate reading",
-                 bind creader::read_crates(sess, crate));
     auto def_map = time(time_passes, "resolution",
                         bind resolve::resolve_crate(sess, crate));
 
@@ -121,7 +119,6 @@ fn pretty_print_input(session::session sess, eval::env env, str input,
 
     auto mode;
     if (typed) {
-        crate = creader::read_crates(sess, crate);
         auto def_map = resolve::resolve_crate(sess, crate);
         auto ty_cx = ty::mk_ctxt(sess, def_map);
         typeck::check_crate(ty_cx, crate);

src/comp/front/ast.rs

@@ -402,7 +402,7 @@ type variant = spanned[variant_];
 
 type view_item = spanned[view_item_];
 tag view_item_ {
-    view_item_use(ident, vec[@meta_item], def_id, option::t[int]);
+    view_item_use(ident, vec[@meta_item], def_id, ann);
     view_item_import(ident, vec[ident], def_id);
     view_item_export(ident);
 }

src/comp/front/creader.rs

@@ -6,7 +6,8 @@ import lib::llvm::False;
 import lib::llvm::llvm;
 import lib::llvm::mk_object_file;
 import lib::llvm::mk_section_iter;
-import middle::fold;
+import middle::resolve;
+import middle::walk;
 import middle::metadata;
 import middle::trans;
 import middle::ty;
@@ -28,13 +29,6 @@ import std::option::some;
 import std::os;
 import std::map::hashmap;
 
-// TODO: map to a real type here.
-type env = @rec(
-    session::session sess,
-    @hashmap[str, int] crate_cache,
-    vec[str] library_search_paths,
-    mutable int next_crate_num
-);
 
 // Type decoding
 
@@ -453,38 +447,49 @@ fn load_crate(session::session sess,
     fail;
 }
 
-fn fold_view_item_use(&env e, &span sp, &ast::ident ident,
-                      &vec[@ast::meta_item] meta_items,
-                      &ast::def_id id, &option::t[int] cnum_opt)
-    -> @ast::view_item {
-    auto cnum;
-    if (!e.crate_cache.contains_key(ident)) {
-        cnum = e.next_crate_num;
-        load_crate(e.sess, cnum, ident, e.library_search_paths);
-        e.crate_cache.insert(ident, e.next_crate_num);
-        e.next_crate_num += 1;
-    } else {
-        cnum = e.crate_cache.get(ident);
-    }
+type env = @rec(
+    session::session sess,
+    resolve::crate_map crate_map,
+    @hashmap[str, int] crate_cache,
+    vec[str] library_search_paths,
+    mutable int next_crate_num
+);
 
-    auto viu = ast::view_item_use(ident, meta_items, id, some[int](cnum));
-    ret @fold::respan[ast::view_item_](sp, viu);
+fn visit_view_item(env e, &@ast::view_item i) {
+    alt (i.node) {
+        case (ast::view_item_use(?ident, ?meta_items, ?id, ?ann)) {
+            auto cnum;
+            if (!e.crate_cache.contains_key(ident)) {
+                cnum = e.next_crate_num;
+                load_crate(e.sess, cnum, ident,
+                           e.library_search_paths);
+                e.crate_cache.insert(ident, e.next_crate_num);
+                e.next_crate_num += 1;
+            } else {
+                cnum = e.crate_cache.get(ident);
+            }
+            e.crate_map.insert(ann.id, cnum);
+        }
+        case (_) { }
+    }
 }
 
+
 // Reads external crates referenced by "use" directives.
 fn read_crates(session::session sess,
-               @ast::crate crate) -> @ast::crate {
+               resolve::crate_map crate_map,
+               &ast::crate crate) {
     auto e = @rec(
         sess=sess,
+        crate_map=crate_map,
         crate_cache=@common::new_str_hash[int](),
         library_search_paths=sess.get_opts().library_search_paths,
         mutable next_crate_num=1
     );
 
-    auto f = fold_view_item_use;
-    auto fld = @rec(fold_view_item_use=f
-                    with *fold::new_identity_fold[env]());
-    ret fold::fold_crate[env](e, fld, crate);
+    auto v = rec(visit_view_item_pre=bind visit_view_item(e, _)
+                 with walk::default_visitor());
+    walk::walk_crate(v, crate);
 }
 
 

src/comp/front/parser.rs

@@ -2181,7 +2181,7 @@ fn parse_use(&parser p) -> @ast::view_item {
     auto hi = p.get_hi_pos();
     expect(p, token::SEMI);
     auto use_decl = ast::view_item_use(ident, metadata, p.next_def_id(),
-                                      none[int]);
+                                       p.get_ann());
     ret @spanned(lo, hi, use_decl);
 }