rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustdoc: Convert tystr_pass to use astsrv

Browse Source
This commit is contained in:
Brian Anderson
2012-01-16 18:21:34 -08:00
parent 447f1fd4af
commit 645035a715
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rustdoc/rustdoc.rs
View File

@@ -67,9 +67,16 @@ fn main(argv: [str]) {
} }
let source_file = argv[1]; let source_file = argv[1];
run(source_file);
}
fn run(source_file: str) {
let default_name = source_file; let default_name = source_file;
let crate = parse::from_file(source_file); let srv = astsrv::mk_seq_srv_from_file(source_file);
let doc = extract::extract(crate, default_name); let doc = extract::from_srv(srv, default_name);
let doc = tystr_pass::run(doc, crate); let doc = run_passes(srv, doc, [
tystr_pass::run
]);
gen::write_markdown(doc, std::io::stdout()); gen::write_markdown(doc, std::io::stdout());
} }

35
src/rustdoc/tystr_pass.rs
View File

@@ -1,33 +1,32 @@
import rustc::syntax::ast; import rustc::syntax::ast;
import rustc::syntax::print::pprust;
import rustc::middle::ast_map;
import astsrv::seq_srv;
export run; export run;
fn run( fn run(
doc: doc::cratedoc, srv: astsrv::seq_srv,
crate: @ast::crate doc: doc::cratedoc
) -> doc::cratedoc { ) -> doc::cratedoc {
let fold = fold::fold({ let fold = fold::fold({
fold_fn: fn~( fold_fn: fn~(
f: fold::fold<@ast::crate>, f: fold::fold<astsrv::seq_srv>,
d: doc::fndoc d: doc::fndoc
) -> doc::fndoc { ) -> doc::fndoc {
fold_fn(f, d) fold_fn(f, d)
} }
with *fold::default_seq_fold(crate) with *fold::default_seq_fold(srv)
}); });
fold.fold_crate(fold, doc) fold.fold_crate(fold, doc)
} }
fn fold_fn( fn fold_fn(
fold: fold::fold<@ast::crate>, fold: fold::fold<astsrv::seq_srv>,
doc: doc::fndoc doc: doc::fndoc
) -> doc::fndoc { ) -> doc::fndoc {
import rustc::middle::ast_map;
import rustc::syntax::print::pprust;
let crate = fold.ctxt; let srv = fold.ctxt;
let map = ast_map::map_crate(*crate);
fn add_ret_ty( fn add_ret_ty(
doc: option<doc::retdoc>, doc: option<doc::retdoc>,
@@ -46,14 +45,18 @@ fn fold_fn(
} }
} }
~{ let retty = srv.exec {|ctxt|
return: alt map.get(doc.id) { alt ctxt.map.get(doc.id) {
ast_map::node_item(@{ ast_map::node_item(@{
node: ast::item_fn(decl, _, _), _ node: ast::item_fn(decl, _, _), _
}) { }) {
add_ret_ty(doc.return, pprust::ty_to_str(decl.output)) pprust::ty_to_str(decl.output)
} }
} }
};
~{
return: add_ret_ty(doc.return, retty)
with *doc with *doc
} }
} }
@@ -64,9 +67,9 @@ mod tests {
#[test] #[test]
fn should_add_fn_ret_types() { fn should_add_fn_ret_types() {
let source = "fn a() -> int { }"; let source = "fn a() -> int { }";
let ast = parse::from_str(source); let srv = astsrv::mk_seq_srv_from_str(source);
let doc = extract::extract(ast, ""); let doc = extract::from_srv(srv, "");
let doc = run(doc, ast); let doc = run(srv, doc);
assert option::get(doc.topmod.fns[0].return).ty == some("int"); assert option::get(doc.topmod.fns[0].return).ty == some("int");
} }
} }