user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port util/common.rs from oldvisit to <V:Visitor> trait API.

Browse source
This commit is contained in:
Felix S. Klock II 2013-08-14 15:54:35 +02:00
parent 14830209c8
commit e8d2141f03
1 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/librustc/util/common.rs
View file

@ -11,7 +11,8 @@
use syntax::ast;
use syntax::codemap::{span};
use syntax::oldvisit;
use syntax::visit;
use syntax::visit::Visitor;
use std::hashmap::HashSet;
use extra;
@ -59,42 +60,48 @@ pub fn field_exprs(fields: ~[ast::Field]) -> ~[@ast::expr] {
fields.map(|f| f.expr)
}
// Takes a predicate p, returns true iff p is true for any subexpressions
// of b -- skipping any inner loops (loop, while, loop_body)
pub fn loop_query(b: &ast::Block, p: @fn(&ast::expr_) -> bool) -> bool {
let rs = @mut false;
let visit_expr: @fn(@ast::expr,
(@mut bool,
oldvisit::vt<@mut bool>)) = |e, (flag, v)| {
*flag |= p(&e.node);
struct LoopQueryVisitor {
p: @fn(&ast::expr_) -> bool
}
impl Visitor<@mut bool> for LoopQueryVisitor {
fn visit_expr(&mut self, e:@ast::expr, flag:@mut bool) {
*flag |= (self.p)(&e.node);
match e.node {
// Skip inner loops, since a break in the inner loop isn't a
// break inside the outer loop
ast::expr_loop(*) | ast::expr_while(*) => {}
_ => oldvisit::visit_expr(e, (flag, v))
_ => visit::walk_expr(self, e, flag)
}
};
let v = oldvisit::mk_vt(@oldvisit::Visitor {
visit_expr: visit_expr,
.. *oldvisit::default_visitor()});
oldvisit::visit_block(b, (rs, v));
}
}
// Takes a predicate p, returns true iff p is true for any subexpressions
// of b -- skipping any inner loops (loop, while, loop_body)
pub fn loop_query(b: &ast::Block, p: @fn(&ast::expr_) -> bool) -> bool {
let rs = @mut false;
let mut v = LoopQueryVisitor { p: p };
visit::walk_block(&mut v, b, rs);
return *rs;
}
struct BlockQueryVisitor {
p: @fn(@ast::expr) -> bool
}
impl Visitor<@mut bool> for BlockQueryVisitor {
fn visit_expr(&mut self, e:@ast::expr, flag:@mut bool) {
*flag |= (self.p)(e);
visit::walk_expr(self, e, flag)
}
}
// Takes a predicate p, returns true iff p is true for any subexpressions
// of b -- skipping any inner loops (loop, while, loop_body)
pub fn block_query(b: &ast::Block, p: @fn(@ast::expr) -> bool) -> bool {
let rs = @mut false;
let visit_expr: @fn(@ast::expr,
(@mut bool,
oldvisit::vt<@mut bool>)) = |e, (flag, v)| {
*flag |= p(e);
oldvisit::visit_expr(e, (flag, v))
};
let v = oldvisit::mk_vt(@oldvisit::Visitor{
visit_expr: visit_expr,
.. *oldvisit::default_visitor()});
oldvisit::visit_block(b, (rs, v));
let mut v = BlockQueryVisitor { p: p };
visit::walk_block(&mut v, b, rs);
return *rs;
}