---

yaml
---
r: 85366
b: refs/heads/dist-snap
c: 3d83010
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 356341192fdf8234b6a6ff8c3385ba227928ae9a
+refs/heads/dist-snap: 3d830106482e6096312404572486d11c6350a8f8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -39,8 +39,7 @@ use syntax::attr;
 use syntax::attr::AttrMetaMethods;
 use syntax::diagnostic::span_handler;
 use syntax::parse::token::special_idents;
-use syntax::ast_util;
-use syntax::visit;
+use syntax::{ast_util, oldvisit};
 use syntax::parse::token;
 use syntax;
 use writer = extra::ebml::writer;
@@ -1185,74 +1184,6 @@ fn encode_info_for_foreign_item(ecx: &EncodeContext,
     ebml_w.end_tag();
 }
 
-fn my_visit_expr(_e:@expr) { }
-
-fn my_visit_item(i:@item, items: ast_map::map, ebml_w:&writer::Encoder,
-                 ecx_ptr:*int, index: @mut ~[entry<i64>]) {
-    match items.get_copy(&i.id) {
-        ast_map::node_item(_, pt) => {
-            let mut ebml_w = ebml_w.clone();
-            // See above
-            let ecx : &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
-            encode_info_for_item(ecx, &mut ebml_w, i, index, *pt);
-        }
-        _ => fail!("bad item")
-    }
-}
-
-fn my_visit_foreign_item(ni:@foreign_item, items: ast_map::map, ebml_w:&writer::Encoder,
-                         ecx_ptr:*int, index: @mut ~[entry<i64>]) {
-    match items.get_copy(&ni.id) {
-        ast_map::node_foreign_item(_, abi, _, pt) => {
-            debug!("writing foreign item %s::%s",
-                   ast_map::path_to_str(
-                       *pt,
-                       token::get_ident_interner()),
-                   token::ident_to_str(&ni.ident));
-
-            let mut ebml_w = ebml_w.clone();
-            // See above
-            let ecx : &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
-            encode_info_for_foreign_item(ecx,
-                                         &mut ebml_w,
-                                         ni,
-                                         index,
-                                         pt,
-                                         abi);
-        }
-        // case for separate item and foreign-item tables
-        _ => fail!("bad foreign item")
-    }
-}
-
-struct EncodeVisitor {
-    ebml_w_for_visit_item: writer::Encoder,
-    ebml_w_for_visit_foreign_item: writer::Encoder,
-    ecx_ptr:*int,
-    items: ast_map::map,
-    index: @mut ~[entry<i64>],
-}
-
-impl visit::Visitor<()> for EncodeVisitor {
-    fn visit_expr(&mut self, ex:@expr, _:()) { my_visit_expr(ex); }
-    fn visit_item(&mut self, i:@item, _:()) {
-        visit::walk_item(self, i, ());
-        my_visit_item(i,
-                      self.items,
-                      &self.ebml_w_for_visit_item,
-                      self.ecx_ptr,
-                      self.index);
-    }
-    fn visit_foreign_item(&mut self, ni:@foreign_item, _:()) {
-        visit::walk_foreign_item(self, ni, ());
-        my_visit_foreign_item(ni,
-                              self.items,
-                              &self.ebml_w_for_visit_foreign_item,
-                              self.ecx_ptr,
-                              self.index);
-    }
-}
-
 fn encode_info_for_items(ecx: &EncodeContext,
                          ebml_w: &mut writer::Encoder,
                          crate: &Crate)
@@ -1270,17 +1201,54 @@ fn encode_info_for_items(ecx: &EncodeContext,
     let items = ecx.tcx.items;
 
     // See comment in `encode_side_tables_for_ii` in astencode
-    let ecx_ptr : *int = unsafe { cast::transmute(ecx) };
-    let mut visitor = EncodeVisitor {
-        index: index,
-        items: items,
-        ecx_ptr: ecx_ptr,
-        ebml_w_for_visit_item: (*ebml_w).clone(),
-        ebml_w_for_visit_foreign_item: (*ebml_w).clone(),
-    };
-
-    visit::walk_crate(&mut visitor, crate, ());
-
+    let ecx_ptr : *() = unsafe { cast::transmute(ecx) };
+
+    oldvisit::visit_crate(crate, ((), oldvisit::mk_vt(@oldvisit::Visitor {
+        visit_expr: |_e, (_cx, _v)| { },
+        visit_item: {
+            let ebml_w = (*ebml_w).clone();
+            |i, (cx, v)| {
+                oldvisit::visit_item(i, (cx, v));
+                match items.get_copy(&i.id) {
+                    ast_map::node_item(_, pt) => {
+                        let mut ebml_w = ebml_w.clone();
+                        // See above
+                        let ecx : &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
+                        encode_info_for_item(ecx, &mut ebml_w, i, index, *pt);
+                    }
+                    _ => fail!("bad item")
+                }
+            }
+        },
+        visit_foreign_item: {
+            let ebml_w = (*ebml_w).clone();
+            |ni, (cx, v)| {
+                oldvisit::visit_foreign_item(ni, (cx, v));
+                match items.get_copy(&ni.id) {
+                    ast_map::node_foreign_item(_, abi, _, pt) => {
+                        debug!("writing foreign item %s::%s",
+                               ast_map::path_to_str(
+                                *pt,
+                                token::get_ident_interner()),
+                                token::ident_to_str(&ni.ident));
+
+                        let mut ebml_w = ebml_w.clone();
+                        // See above
+                        let ecx : &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
+                        encode_info_for_foreign_item(ecx,
+                                                     &mut ebml_w,
+                                                     ni,
+                                                     index,
+                                                     pt,
+                                                     abi);
+                    }
+                    // case for separate item and foreign-item tables
+                    _ => fail!("bad foreign item")
+                }
+            }
+        },
+        ..*oldvisit::default_visitor()
+    })));
     ebml_w.end_tag();
     return /*bad*/(*index).clone();
 }

branches/dist-snap/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -31,9 +31,7 @@ use syntax::ast;
 use syntax::ast_util::id_range;
 use syntax::codemap::span;
 use syntax::print::pprust;
-use syntax::visit;
-use syntax::visit::Visitor;
-use syntax::ast::{expr, fn_kind, fn_decl, Block, NodeId, stmt, pat, Local};
+use syntax::oldvisit;
 
 mod lifetime;
 mod restrictions;
@@ -74,30 +72,6 @@ struct GatherLoanCtxt {
     repeating_ids: ~[ast::NodeId]
 }
 
-struct GatherLoanVisitor;
-
-impl visit::Visitor<@mut GatherLoanCtxt> for GatherLoanVisitor {
-    fn visit_expr(&mut self, ex:@expr, e:@mut GatherLoanCtxt) {
-        gather_loans_in_expr(self, ex, e);
-    }
-    fn visit_block(&mut self, b:&Block, e:@mut GatherLoanCtxt) {
-        gather_loans_in_block(self, b, e);
-    }
-    fn visit_fn(&mut self, fk:&fn_kind, fd:&fn_decl, b:&Block,
-                s:span, n:NodeId, e:@mut GatherLoanCtxt) {
-        gather_loans_in_fn(self, fk, fd, b, s, n, e);
-    }
-    fn visit_stmt(&mut self, s:@stmt, e:@mut GatherLoanCtxt) {
-        add_stmt_to_map(self, s, e);
-    }
-    fn visit_pat(&mut self, p:@pat, e:@mut GatherLoanCtxt) {
-        add_pat_to_id_range(self, p, e);
-    }
-    fn visit_local(&mut self, l:@Local, e:@mut GatherLoanCtxt) {
-        gather_loans_in_local(self, l, e);
-    }
-}
-
 pub fn gather_loans(bccx: @BorrowckCtxt,
                     decl: &ast::fn_decl,
                     body: &ast::Block)
@@ -111,57 +85,64 @@ pub fn gather_loans(bccx: @BorrowckCtxt,
         move_data: @mut MoveData::new()
     };
     glcx.gather_fn_arg_patterns(decl, body);
-
-    let mut v = GatherLoanVisitor;
-    v.visit_block(body, glcx);
+    let v = oldvisit::mk_vt(@oldvisit::Visitor {
+        visit_expr: gather_loans_in_expr,
+        visit_block: gather_loans_in_block,
+        visit_fn: gather_loans_in_fn,
+        visit_stmt: add_stmt_to_map,
+        visit_pat: add_pat_to_id_range,
+        visit_local: gather_loans_in_local,
+        .. *oldvisit::default_visitor()
+    });
+    (v.visit_block)(body, (glcx, v));
     return (glcx.id_range, glcx.all_loans, glcx.move_data);
 }
 
-fn add_pat_to_id_range(v: &mut GatherLoanVisitor,
-                       p: @ast::pat,
-                       this: @mut GatherLoanCtxt) {
+fn add_pat_to_id_range(p: @ast::pat,
+                       (this, v): (@mut GatherLoanCtxt,
+                                   oldvisit::vt<@mut GatherLoanCtxt>)) {
     // NB: This visitor function just adds the pat ids into the id
     // range. We gather loans that occur in patterns using the
     // `gather_pat()` method below. Eventually these two should be
     // brought together.
     this.id_range.add(p.id);
-    visit::walk_pat(v, p, this);
+    oldvisit::visit_pat(p, (this, v));
 }
 
-fn gather_loans_in_fn(v: &mut GatherLoanVisitor,
-                      fk: &fn_kind,
+fn gather_loans_in_fn(fk: &oldvisit::fn_kind,
                       decl: &ast::fn_decl,
                       body: &ast::Block,
                       sp: span,
                       id: ast::NodeId,
-                      this: @mut GatherLoanCtxt) {
+                      (this, v): (@mut GatherLoanCtxt,
+                                  oldvisit::vt<@mut GatherLoanCtxt>)) {
     match fk {
         // Do not visit items here, the outer loop in borrowck/mod
         // will visit them for us in turn.
-        &visit::fk_item_fn(*) | &visit::fk_method(*) => {
+        &oldvisit::fk_item_fn(*) | &oldvisit::fk_method(*) => {
             return;
         }
 
         // Visit closures as part of the containing item.
-        &visit::fk_anon(*) | &visit::fk_fn_block(*) => {
+        &oldvisit::fk_anon(*) | &oldvisit::fk_fn_block(*) => {
             this.push_repeating_id(body.id);
-            visit::walk_fn(v, fk, decl, body, sp, id, this);
+            oldvisit::visit_fn(fk, decl, body, sp, id, (this, v));
             this.pop_repeating_id(body.id);
             this.gather_fn_arg_patterns(decl, body);
         }
     }
 }
 
-fn gather_loans_in_block(v: &mut GatherLoanVisitor,
-                         blk: &ast::Block,
-                         this: @mut GatherLoanCtxt) {
+fn gather_loans_in_block(blk: &ast::Block,
+                         (this, vt): (@mut GatherLoanCtxt,
+                                      oldvisit::vt<@mut GatherLoanCtxt>)) {
     this.id_range.add(blk.id);
-    visit::walk_block(v, blk, this);
+    oldvisit::visit_block(blk, (this, vt));
 }
 
-fn gather_loans_in_local(v: &mut GatherLoanVisitor,
-                         local: @ast::Local,
-                         this: @mut GatherLoanCtxt) {
+fn gather_loans_in_local(local: @ast::Local,
+                         (this, vt): (@mut GatherLoanCtxt,
+                                      oldvisit::vt<@mut GatherLoanCtxt>)) {
     match local.init {
         None => {
             // Variable declarations without initializers are considered "moves":
@@ -192,13 +173,12 @@ fn gather_loans_in_local(v: &mut GatherLoanVisitor,
         }
     }
 
-    visit::walk_local(v, local, this);
+    oldvisit::visit_local(local, (this, vt));
 }
 
-
-fn gather_loans_in_expr(v: &mut GatherLoanVisitor,
-                        ex: @ast::expr,
-                        this: @mut GatherLoanCtxt) {
+fn gather_loans_in_expr(ex: @ast::expr,
+                        (this, vt): (@mut GatherLoanCtxt,
+                                     oldvisit::vt<@mut GatherLoanCtxt>)) {
     let bccx = this.bccx;
     let tcx = bccx.tcx;
 
@@ -238,7 +218,7 @@ fn gather_loans_in_expr(v: &mut GatherLoanVisitor,
         // for the lifetime `scope_r` of the resulting ptr:
         let scope_r = ty_region(tcx, ex.span, ty::expr_ty(tcx, ex));
         this.guarantee_valid(ex.id, ex.span, base_cmt, mutbl, scope_r);
-        visit::walk_expr(v, ex, this);
+        oldvisit::visit_expr(ex, (this, vt));
       }
 
       ast::expr_assign(l, _) | ast::expr_assign_op(_, _, l, _) => {
@@ -255,7 +235,7 @@ fn gather_loans_in_expr(v: &mut GatherLoanVisitor,
                   // with moves etc, just ignore.
               }
           }
-          visit::walk_expr(v, ex, this);
+          oldvisit::visit_expr(ex, (this, vt));
       }
 
       ast::expr_match(ex_v, ref arms) => {
@@ -265,7 +245,7 @@ fn gather_loans_in_expr(v: &mut GatherLoanVisitor,
                 this.gather_pat(cmt, *pat, Some((arm.body.id, ex.id)));
             }
         }
-        visit::walk_expr(v, ex, this);
+        oldvisit::visit_expr(ex, (this, vt));
       }
 
       ast::expr_index(_, _, arg) |
@@ -279,36 +259,36 @@ fn gather_loans_in_expr(v: &mut GatherLoanVisitor,
           let scope_r = ty::re_scope(ex.id);
           let arg_cmt = this.bccx.cat_expr(arg);
           this.guarantee_valid(arg.id, arg.span, arg_cmt, m_imm, scope_r);
-          visit::walk_expr(v, ex, this);
+          oldvisit::visit_expr(ex, (this, vt));
       }
 
       // see explanation attached to the `root_ub` field:
       ast::expr_while(cond, ref body) => {
           // during the condition, can only root for the condition
           this.push_repeating_id(cond.id);
-          v.visit_expr(cond, this);
+          (vt.visit_expr)(cond, (this, vt));
           this.pop_repeating_id(cond.id);
 
           // during body, can only root for the body
           this.push_repeating_id(body.id);
-          v.visit_block(body, this);
+          (vt.visit_block)(body, (this, vt));
           this.pop_repeating_id(body.id);
       }
 
       // see explanation attached to the `root_ub` field:
       ast::expr_loop(ref body, _) => {
           this.push_repeating_id(body.id);
-          visit::walk_expr(v, ex, this);
+          oldvisit::visit_expr(ex, (this, vt));
           this.pop_repeating_id(body.id);
       }
 
       ast::expr_fn_block(*) => {
           gather_moves::gather_captures(this.bccx, this.move_data, ex);
-          visit::walk_expr(v, ex, this);
+          oldvisit::visit_expr(ex, (this, vt));
       }
 
       _ => {
-          visit::walk_expr(v, ex, this);
+        oldvisit::visit_expr(ex, (this, vt));
       }
     }
 }
@@ -790,14 +770,14 @@ impl GatherLoanCtxt {
 
 // Setting up info that preserve needs.
 // This is just the most convenient place to do it.
-fn add_stmt_to_map(v: &mut GatherLoanVisitor,
-                   stmt: @ast::stmt,
-                   this: @mut GatherLoanCtxt) {
+fn add_stmt_to_map(stmt: @ast::stmt,
+                   (this, vt): (@mut GatherLoanCtxt,
+                                oldvisit::vt<@mut GatherLoanCtxt>)) {
     match stmt.node {
         ast::stmt_expr(_, id) | ast::stmt_semi(_, id) => {
             this.bccx.stmt_map.insert(id);
         }
         _ => ()
     }
-    visit::walk_stmt(v, stmt, this);
+    oldvisit::visit_stmt(stmt, (this, vt));
 }