OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libsyntax: De-`@mut` the path in the AST mapping context

This commit is contained in:
Patrick Walton 2013-12-27 16:14:50 -08:00
parent 4269f85d5b
commit acdc998737
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libsyntax/ast_map.rs
View File

@ -197,13 +197,13 @@ pub type map = @RefCell<HashMap<NodeId, ast_node>>;
pub struct Ctx { pub struct Ctx {
map: map, map: map,
path: path, path: RefCell<path>,
diag: @SpanHandler, diag: @SpanHandler,
} }
impl Ctx { impl Ctx {
fn extend(&self, elt: path_elt) -> @path { fn extend(&self, elt: path_elt) -> @path {
@vec::append(self.path.clone(), [elt]) @vec::append(self.path.get(), [elt])
} }
fn map_method(&mut self, fn map_method(&mut self,
@ -275,12 +275,18 @@ impl Ctx {
map.get().insert(a.id, node_arg(a.pat)); map.get().insert(a.id, node_arg(a.pat));
} }
match *fk { match *fk {
visit::fk_method(name, _, _) => { self.path.push(path_name(name)) } visit::fk_method(name, _, _) => {
let mut path = self.path.borrow_mut();
path.get().push(path_name(name))
}
_ => {} _ => {}
} }
visit::walk_fn(self, fk, decl, body, sp, id, ()); visit::walk_fn(self, fk, decl, body, sp, id, ());
match *fk { match *fk {
visit::fk_method(..) => { self.path.pop(); } visit::fk_method(..) => {
let mut path = self.path.borrow_mut();
path.get().pop();
}
_ => {} _ => {}
} }
} }
@ -320,7 +326,7 @@ impl Ctx {
impl Visitor<()> for Ctx { impl Visitor<()> for Ctx {
fn visit_item(&mut self, i: @item, _: ()) { fn visit_item(&mut self, i: @item, _: ()) {
// clone is FIXME #2543 // clone is FIXME #2543
let item_path = @self.path.clone(); let item_path = @self.path.get();
{ {
let mut map = self.map.borrow_mut(); let mut map = self.map.borrow_mut();
map.get().insert(i.id, node_item(i, item_path)); map.get().insert(i.id, node_item(i, item_path));
@ -338,7 +344,8 @@ impl Visitor<()> for Ctx {
self.map_method(impl_did, extended, *m, false) self.map_method(impl_did, extended, *m, false)
} }
self.path.push(elt); let mut path = self.path.borrow_mut();
path.get().push(elt);
} }
item_enum(ref enum_definition, _) => { item_enum(ref enum_definition, _) => {
for &v in enum_definition.variants.iter() { for &v in enum_definition.variants.iter() {
@ -366,7 +373,7 @@ impl Visitor<()> for Ctx {
// Anonymous extern // Anonymous extern
// mods go in the // mods go in the
// parent scope. // parent scope.
@self.path.clone() @self.path.get()
)); ));
} }
} }
@ -401,13 +408,19 @@ impl Visitor<()> for Ctx {
match i.node { match i.node {
item_mod(_) | item_foreign_mod(_) => { item_mod(_) | item_foreign_mod(_) => {
self.path.push(path_mod(i.ident)); let mut path = self.path.borrow_mut();
path.get().push(path_mod(i.ident));
} }
item_impl(..) => {} // this was guessed above. item_impl(..) => {} // this was guessed above.
_ => self.path.push(path_name(i.ident)) _ => {
let mut path = self.path.borrow_mut();
path.get().push(path_name(i.ident))
}
} }
visit::walk_item(self, i, ()); visit::walk_item(self, i, ());
self.path.pop();
let mut path = self.path.borrow_mut();
path.get().pop();
} }
fn visit_pat(&mut self, pat: &Pat, _: ()) { fn visit_pat(&mut self, pat: &Pat, _: ()) {
@ -445,7 +458,7 @@ impl Visitor<()> for Ctx {
pub fn map_crate(diag: @SpanHandler, c: &Crate) -> map { pub fn map_crate(diag: @SpanHandler, c: &Crate) -> map {
let cx = @mut Ctx { let cx = @mut Ctx {
map: @RefCell::new(HashMap::new()), map: @RefCell::new(HashMap::new()),
path: ~[], path: RefCell::new(~[]),
diag: diag, diag: diag,
}; };
visit::walk_crate(cx, c, ()); visit::walk_crate(cx, c, ());
@ -464,7 +477,7 @@ pub fn map_decoded_item(diag: @SpanHandler,
// starting from 0. // starting from 0.
let cx = @mut Ctx { let cx = @mut Ctx {
map: map, map: map,
path: path.clone(), path: RefCell::new(path.clone()),
diag: diag, diag: diag,
}; };