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

middle/entry.rs Visitor refactoring (#7081): unify Entry{Context,Visitor}.

Browse source
This commit is contained in:
Felix S. Klock II 2013-09-10 11:24:04 +02:00
parent 6724317dad
commit ed37da2f79
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/librustc/middle/entry.rs
View file

@ -39,11 +39,9 @@ struct EntryContext {
non_main_fns: ~[(NodeId, Span)],
}
struct EntryVisitor;
impl Visitor<@mut EntryContext> for EntryVisitor {
fn visit_item(&mut self, item:@item, ctxt:@mut EntryContext) {
find_item(item, ctxt, self);
impl Visitor<()> for EntryContext {
fn visit_item(&mut self, item:@item, _:()) {
find_item(item, self);
}
}
@ -62,7 +60,7 @@ pub fn find_entry_point(session: Session, crate: &Crate, ast_map: ast_map::map)
return
}
let ctxt = @mut EntryContext {
let mut ctxt = EntryContext {
session: session,
ast_map: ast_map,
main_fn: None,
@ -71,14 +69,12 @@ pub fn find_entry_point(session: Session, crate: &Crate, ast_map: ast_map::map)
non_main_fns: ~[],
};
let mut v = EntryVisitor;
visit::walk_crate(&mut ctxt, crate, ());
visit::walk_crate(&mut v, crate, ctxt);
configure_main(ctxt);
configure_main(&mut ctxt);
}
fn find_item(item: @item, ctxt: @mut EntryContext, visitor: &mut EntryVisitor) {
fn find_item(item: @item, ctxt: &mut EntryContext) {
match item.node {
item_fn(*) => {
if item.ident.name == special_idents::main.name {
@ -125,11 +121,10 @@ fn find_item(item: @item, ctxt: @mut EntryContext, visitor: &mut EntryVisitor) {
_ => ()
}
visit::walk_item(visitor, item, ctxt);
visit::walk_item(ctxt, item, ());
}
fn configure_main(ctxt: @mut EntryContext) {
let this = &mut *ctxt;
fn configure_main(this: &mut EntryContext) {
if this.start_fn.is_some() {
*this.session.entry_fn = this.start_fn;
*this.session.entry_type = Some(session::EntryStart);