diff options
| author | Marijn Haverbeke <[email protected]> | 2011-05-12 17:24:54 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <[email protected]> | 2011-05-12 21:30:44 +0200 |
| commit | 3816e57fd2a8ab19e4ac6d4b3ddd5b49d5973ff2 (patch) | |
| tree | 508982ed2f789aedd89eebd529343d9dc88b8e01 /src/comp/middle/capture.rs | |
| parent | Transitional change to make extfmt output lowercase module name (diff) | |
| download | rust-3816e57fd2a8ab19e4ac6d4b3ddd5b49d5973ff2.tar.xz rust-3816e57fd2a8ab19e4ac6d4b3ddd5b49d5973ff2.zip | |
Downcase std modules again, move to :: for module dereferencing
This should be a snapshot transition.
Diffstat (limited to 'src/comp/middle/capture.rs')
| -rw-r--r-- | src/comp/middle/capture.rs | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/comp/middle/capture.rs b/src/comp/middle/capture.rs index 7aa64fdb..7124554a 100644 --- a/src/comp/middle/capture.rs +++ b/src/comp/middle/capture.rs @@ -1,73 +1,73 @@ -import driver.session; -import front.ast; -import std.Map.hashmap; -import std.Option; -import std.Option.some; -import std.Option.none; -import std.Int; -import std.Vec; -import util.common; -import resolve.def_map; +import driver::session; +import front::ast; +import std::map::hashmap; +import std::option; +import std::option::some; +import std::option::none; +import std::_int; +import std::_vec; +import util::common; +import resolve::def_map; -type fn_id_of_local = std.Map.hashmap[ast.def_id, ast.def_id]; -type env = rec(mutable vec[ast.def_id] current_context, // fn or obj +type fn_id_of_local = std::map::hashmap[ast::def_id, ast::def_id]; +type env = rec(mutable vec[ast::def_id] current_context, // fn or obj def_map def_map, fn_id_of_local idmap, - session.session sess); + session::session sess); -fn current_context(&env e) -> ast.def_id { - ret e.current_context.(Vec.len(e.current_context) - 1u); +fn current_context(&env e) -> ast::def_id { + ret e.current_context.(_vec::len(e.current_context) - 1u); } -fn enter_item(@env e, &@ast.item i) { +fn enter_item(@env e, &@ast::item i) { alt (i.node) { - case (ast.item_fn(?name, _, _, ?id, _)) { - Vec.push(e.current_context, id); + case (ast::item_fn(?name, _, _, ?id, _)) { + _vec::push(e.current_context, id); } - case (ast.item_obj(?name, _, _, ?ids, _)) { - Vec.push(e.current_context, ids.ty); + case (ast::item_obj(?name, _, _, ?ids, _)) { + _vec::push(e.current_context, ids.ty); } case (_) {} } } -fn leave_item(@env e, &@ast.item i) { +fn leave_item(@env e, &@ast::item i) { alt (i.node) { - case (ast.item_fn(?name, _, _, ?id, _)) { - Vec.pop(e.current_context); + case (ast::item_fn(?name, _, _, ?id, _)) { + _vec::pop(e.current_context); } - case (ast.item_obj(_, _, _, ?ids, _)) { - Vec.pop(e.current_context); + case (ast::item_obj(_, _, _, ?ids, _)) { + _vec::pop(e.current_context); } case (_) {} } } -fn walk_expr(@env e, &@ast.expr x) { +fn walk_expr(@env e, &@ast::expr x) { alt (x.node) { - case (ast.expr_for(?d, _, _, _)) { + case (ast::expr_for(?d, _, _, _)) { alt (d.node) { - case (ast.decl_local(?local)) { + case (ast::decl_local(?local)) { e.idmap.insert(local.id, current_context(*e)); } case (_) { } } } - case (ast.expr_for_each(?d, _, _, _)) { + case (ast::expr_for_each(?d, _, _, _)) { alt (d.node) { - case (ast.decl_local(?local)) { + case (ast::decl_local(?local)) { e.idmap.insert(local.id, current_context(*e)); } case (_) { } } } - case (ast.expr_path(?pt, ?ann)) { + case (ast::expr_path(?pt, ?ann)) { auto local_id; - alt (e.def_map.get(ast.ann_tag(ann))) { - case (ast.def_local(?id)) { local_id = id; } + alt (e.def_map.get(ast::ann_tag(ann))) { + case (ast::def_local(?id)) { local_id = id; } case (_) { ret; } } - auto df = ast.def_id_of_def(e.def_map.get(ast.ann_tag(ann))); + auto df = ast::def_id_of_def(e.def_map.get(ast::ann_tag(ann))); auto def_context = e.idmap.get(df); if (current_context(*e) != def_context) { @@ -79,12 +79,12 @@ fn walk_expr(@env e, &@ast.expr x) { } } -fn walk_block(@env e, &ast.block b) { - for (@ast.stmt st in b.node.stmts) { +fn walk_block(@env e, &ast::block b) { + for (@ast::stmt st in b.node.stmts) { alt (st.node) { - case (ast.stmt_decl(?d,_)) { + case (ast::stmt_decl(?d,_)) { alt (d.node) { - case (ast.decl_local(?loc)) { + case (ast::decl_local(?loc)) { e.idmap.insert(loc.id, current_context(*e)); } case (_) { } @@ -95,18 +95,18 @@ fn walk_block(@env e, &ast.block b) { } } -fn check_for_captures(session.session sess, @ast.crate crate, def_map dm) { - let vec[ast.def_id] curctx = vec(); +fn check_for_captures(session::session sess, @ast::crate crate, def_map dm) { + let vec[ast::def_id] curctx = vec(); auto env = @rec(mutable current_context = curctx, def_map = dm, - idmap = common.new_def_hash[ast.def_id](), + idmap = common::new_def_hash[ast::def_id](), sess = sess); auto visitor = rec(visit_item_pre = bind enter_item(env, _), visit_item_post = bind leave_item(env, _), visit_block_pre = bind walk_block(env, _), visit_expr_pre = bind walk_expr(env, _) - with walk.default_visitor()); - walk.walk_crate(visitor, *crate); + with walk::default_visitor()); + walk::walk_crate(visitor, *crate); } // Local Variables: |