Move visit to newtype-style nominal type

This makes getting the function fields out of the visitor less
cumbersome and more efficient (no take/drop).

Author: marijnh

src/comp/middle/alias.rs

@@ -49,7 +49,7 @@ fn check_crate(@ty::ctxt tcx, &@ast::crate crate) {
              visit_item=bind visit_item(cx, _, _, _),
              visit_expr=bind visit_expr(cx, _, _, _)
              with *visit::default_visitor[scope]());
-    visit::visit_crate(*crate, [], visit::vtor(v));
+    visit::visit_crate(*crate, [], visit::mk_vt(v));
     tcx.sess.abort_if_errors();
 }
 
@@ -59,7 +59,7 @@ fn visit_fn(@ctx cx, &ast::_fn f, &ast::ty_param[] tp, &span sp,
     for (ast::arg arg_ in f.decl.inputs) {
         cx.local_map.insert(arg_.id, arg(arg_.mode));
     }
-    vt(v).visit_block(f.body, [], v);
+    v.visit_block(f.body, [], v);
 }
 
 fn visit_item(@ctx cx, &@ast::item i, &scope sc, &vt[scope] v) {

src/comp/middle/ast_map.rs

@@ -23,7 +23,7 @@ fn map_crate(&crate c) -> map {
                       visit_native_item=bind map_native_item(map, _, _, _),
                       visit_expr=bind map_expr(map, _, _, _)
                       with *visit::default_visitor[()]());
-    visit::visit_crate(c, (), visit::vtor(v_map));
+    visit::visit_crate(c, (), visit::mk_vt(v_map));
     ret map;
 }
 

src/comp/middle/resolve.rs

@@ -155,7 +155,7 @@ fn map_crate(&@env e, &@ast::crate c) {
              visit_item=bind index_i(e, _, _, _)
              with *visit::default_visitor[scopes]());
     visit::visit_crate(*c, cons(scope_crate(c), @nil),
-                       visit::vtor(v_map_mod));
+                       visit::mk_vt(v_map_mod));
     // Register the top-level mod 
 
     e.mod_map.insert(-1,
@@ -200,7 +200,7 @@ fn map_crate(&@env e, &@ast::crate c) {
              visit_item=visit_item_with_scope
              with *visit::default_visitor[scopes]());
     visit::visit_crate(*c, cons(scope_crate(c), @nil),
-                       visit::vtor(v_link_glob));
+                       visit::mk_vt(v_link_glob));
     fn link_glob(@env e, &@ast::view_item vi, &scopes sc, &vt[scopes] v) {
         fn find_mod(@env e, scopes sc) -> @indexed_mod {
             alt (sc) {
@@ -257,7 +257,7 @@ fn resolve_names(&@env e, &@ast::crate c) {
              visit_constr=bind walk_constr(e, _, _, _),
              visit_fn=bind visit_fn_with_scope(e, _, _, _, _, _, _, _)
              with *visit::default_visitor());
-    visit::visit_crate(*c, cons(scope_crate(c), @nil), visit::vtor(v));
+    visit::visit_crate(*c, cons(scope_crate(c), @nil), visit::mk_vt(v));
     e.sess.abort_if_errors();
 
     fn walk_expr(@env e, &@ast::expr exp, &scopes sc, &vt[scopes] v) {
@@ -1183,7 +1183,7 @@ fn check_for_collisions(&@env e, &ast::crate c) {
              visit_block=bind check_block(e, _, _, _),
              visit_arm=bind check_arm(e, _, _, _)
              with *visit::default_visitor());
-    visit::visit_crate(c, (), visit::vtor(v));
+    visit::visit_crate(c, (), visit::mk_vt(v));
 }
 
 fn check_mod_name(&env e, &ident name, list[mod_index_entry] entries) {

src/comp/middle/trans.rs

@@ -9108,8 +9108,8 @@ fn collect_items(&@crate_ctxt ccx, @ast::crate crate) {
              visit_item=bind collect_item_1(ccx, _, _, _) with *visitor0);
     auto visitor2 =
         @rec(visit_item=bind collect_item_2(ccx, _, _, _) with *visitor0);
-    visit::visit_crate(*crate, ~[], visit::vtor(visitor1));
-    visit::visit_crate(*crate, ~[], visit::vtor(visitor2));
+    visit::visit_crate(*crate, ~[], visit::mk_vt(visitor1));
+    visit::visit_crate(*crate, ~[], visit::mk_vt(visitor2));
 }
 
 fn collect_tag_ctor(@crate_ctxt ccx, &@ast::item i, &str[] pt, &vt[str[]] v) {
@@ -9133,7 +9133,7 @@ fn collect_tag_ctors(&@crate_ctxt ccx, @ast::crate crate) {
     auto visitor =
         @rec(visit_item=bind collect_tag_ctor(ccx, _, _, _)
              with *visit::default_visitor());
-    visit::visit_crate(*crate, ~[], visit::vtor(visitor));
+    visit::visit_crate(*crate, ~[], visit::mk_vt(visitor));
 }
 
 
@@ -9178,7 +9178,7 @@ fn trans_constants(&@crate_ctxt ccx, @ast::crate crate) {
     auto visitor =
         @rec(visit_item=bind trans_constant(ccx, _, _, _)
              with *visit::default_visitor());
-    visit::visit_crate(*crate, ~[], visit::vtor(visitor));
+    visit::visit_crate(*crate, ~[], visit::mk_vt(visitor));
 }
 
 fn vp2i(&@block_ctxt cx, ValueRef v) -> ValueRef {

src/comp/middle/tstate/collect_locals.rs

@@ -73,12 +73,11 @@ fn find_locals(&ty::ctxt tcx, &_fn f, &ty_param[] tps, &span sp, &fn_ident i,
     let ctxt cx = rec(cs=@mutable ~[], tcx=tcx);
     auto visitor = visit::default_visitor[ctxt]();
 
-    visitor =
-        @rec(visit_local=collect_local,
-             visit_expr=collect_pred,
-             visit_fn=do_nothing
-             with *visitor);
-    visit::visit_fn(f, tps, sp, i, id, cx, visit::vtor(visitor));
+    visitor = @rec(visit_local=collect_local,
+                   visit_expr=collect_pred,
+                   visit_fn=do_nothing
+                   with *visitor);
+    visit::visit_fn(f, tps, sp, i, id, cx, visit::mk_vt(visitor));
     ret cx;
 }