bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Eliminate a use of map::get in freevars

Browse source 
map::get is evil -- just say no!
This commit is contained in:
Tim Chevalier 2012-01-05 11:33:22 -08:00
parent 4f3171ea81
commit da519c8587
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/comp/middle/freevars.rs
View file

@ -1,6 +1,7 @@
// A pass that annotates for each loops and functions with the free // A pass that annotates for each loops and functions with the free
// variables that they contain. // variables that they contain.
import syntax::print::pprust::path_to_str;
import int; import int;
import std::map::*; import std::map::*;
import option::*; import option::*;
@ -47,21 +48,27 @@ fn collect_freevars(def_map: resolve::def_map, blk: ast::blk)
visit::visit_expr(expr, depth + 1, v); visit::visit_expr(expr, depth + 1, v);
} }
ast::expr_path(path) { ast::expr_path(path) {
let def = def_map.get(expr.id), i = 0; let i = 0;
while i < depth { alt def_map.find(expr.id) {
alt copy def { none. { fail ("Not found: " + path_to_str(path)) }
ast::def_upvar(_, inner, _) { def = *inner; } some(df) {
_ { break; } let def = df;
while i < depth {
alt copy def {
ast::def_upvar(_, inner, _) { def = *inner; }
_ { break; }
}
i += 1;
}
if i == depth { // Made it to end of loop
let dnum = ast_util::def_id_of_def(def).node;
if !seen.contains_key(dnum) {
*refs += [@{def:def, span:expr.span}];
seen.insert(dnum, ());
}
}
} }
i += 1; }
}
if i == depth { // Made it to end of loop
let dnum = ast_util::def_id_of_def(def).node;
if !seen.contains_key(dnum) {
*refs += [@{def:def, span:expr.span}];
seen.insert(dnum, ());
}
}
} }
_ { visit::visit_expr(expr, depth, v); } _ { visit::visit_expr(expr, depth, v); }
} }