2012-07-04 22:53:12 +01:00
|
|
|
//! Pulls type information out of the AST and attaches it to the document
|
2012-01-17 17:44:32 -08:00
|
|
|
|
2012-07-11 15:00:40 -07:00
|
|
|
import doc::item_utils;
|
2012-05-13 17:12:56 -07:00
|
|
|
import syntax::ast;
|
|
|
|
import syntax::print::pprust;
|
2012-05-21 23:34:34 -07:00
|
|
|
import syntax::ast_map;
|
2012-03-07 16:48:57 -08:00
|
|
|
import std::map::hashmap;
|
2012-01-16 15:33:06 -08:00
|
|
|
|
2012-01-17 16:12:50 -08:00
|
|
|
export mk_pass;
|
|
|
|
|
|
|
|
fn mk_pass() -> pass {
|
2012-02-27 18:07:16 -08:00
|
|
|
{
|
2012-07-13 22:57:48 -07:00
|
|
|
name: ~"tystr",
|
2012-02-27 18:07:16 -08:00
|
|
|
f: run
|
|
|
|
}
|
2012-01-17 16:12:50 -08:00
|
|
|
}
|
2012-01-16 15:33:06 -08:00
|
|
|
|
2012-01-16 15:44:10 -08:00
|
|
|
fn run(
|
2012-01-17 16:12:31 -08:00
|
|
|
srv: astsrv::srv,
|
2012-03-02 18:33:25 -08:00
|
|
|
doc: doc::doc
|
|
|
|
) -> doc::doc {
|
2012-01-16 15:33:06 -08:00
|
|
|
let fold = fold::fold({
|
2012-01-24 00:14:31 -08:00
|
|
|
fold_fn: fold_fn,
|
2012-01-25 17:22:19 -08:00
|
|
|
fold_const: fold_const,
|
2012-01-26 20:59:15 -08:00
|
|
|
fold_enum: fold_enum,
|
2012-07-03 16:30:42 -07:00
|
|
|
fold_trait: fold_trait,
|
2012-02-01 22:41:41 -08:00
|
|
|
fold_impl: fold_impl,
|
|
|
|
fold_type: fold_type
|
2012-02-20 22:24:59 -08:00
|
|
|
with *fold::default_any_fold(srv)
|
2012-01-16 15:33:06 -08:00
|
|
|
});
|
2012-03-02 18:33:25 -08:00
|
|
|
fold.fold_doc(fold, doc)
|
2012-01-16 15:33:06 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
fn fold_fn(
|
2012-01-17 16:12:31 -08:00
|
|
|
fold: fold::fold<astsrv::srv>,
|
2012-01-16 15:33:06 -08:00
|
|
|
doc: doc::fndoc
|
|
|
|
) -> doc::fndoc {
|
|
|
|
|
2012-01-16 18:21:34 -08:00
|
|
|
let srv = fold.ctxt;
|
2012-01-16 15:33:06 -08:00
|
|
|
|
2012-01-30 13:05:25 -08:00
|
|
|
{
|
2012-02-17 14:46:30 -08:00
|
|
|
sig: get_fn_sig(srv, doc.id())
|
2012-01-30 13:05:25 -08:00
|
|
|
with doc
|
2012-01-16 15:33:06 -08:00
|
|
|
}
|
2012-01-18 16:09:32 -08:00
|
|
|
}
|
2012-01-16 15:33:06 -08:00
|
|
|
|
2012-07-13 22:57:48 -07:00
|
|
|
fn get_fn_sig(srv: astsrv::srv, fn_id: doc::ast_id) -> option<~str> {
|
2012-06-30 16:19:07 -07:00
|
|
|
do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check ctxt.ast_map.get(fn_id) {
|
2012-01-19 18:09:19 -08:00
|
|
|
ast_map::node_item(@{
|
|
|
|
ident: ident,
|
2012-03-18 21:30:45 -07:00
|
|
|
node: ast::item_fn(decl, tys, _), _
|
2012-02-24 15:06:58 -08:00
|
|
|
}, _) |
|
2012-06-26 16:18:37 -07:00
|
|
|
ast_map::node_foreign_item(@{
|
2012-02-24 15:06:58 -08:00
|
|
|
ident: ident,
|
2012-06-26 16:18:37 -07:00
|
|
|
node: ast::foreign_item_fn(decl, tys), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _, _) => {
|
2012-03-18 21:30:45 -07:00
|
|
|
some(pprust::fun_to_str(decl, ident, tys))
|
2012-01-19 18:09:19 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_fn_sig() {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = test::mk_doc(~"fn a<T>() -> int { }");
|
|
|
|
assert doc.cratemod().fns()[0].sig == some(~"fn a<T>() -> int");
|
2012-01-19 18:09:19 -08:00
|
|
|
}
|
|
|
|
|
2012-02-24 15:06:58 -08:00
|
|
|
#[test]
|
2012-06-26 16:18:37 -07:00
|
|
|
fn should_add_foreign_fn_sig() {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = test::mk_doc(~"extern mod a { fn a<T>() -> int; }");
|
|
|
|
assert doc.cratemod().nmods()[0].fns[0].sig == some(~"fn a<T>() -> int");
|
2012-02-24 15:06:58 -08:00
|
|
|
}
|
|
|
|
|
2012-01-24 00:14:31 -08:00
|
|
|
fn fold_const(
|
|
|
|
fold: fold::fold<astsrv::srv>,
|
|
|
|
doc: doc::constdoc
|
|
|
|
) -> doc::constdoc {
|
|
|
|
let srv = fold.ctxt;
|
|
|
|
|
2012-01-30 13:05:25 -08:00
|
|
|
{
|
2012-06-30 16:19:07 -07:00
|
|
|
sig: some(do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check ctxt.ast_map.get(doc.id()) {
|
2012-01-24 00:14:31 -08:00
|
|
|
ast_map::node_item(@{
|
|
|
|
node: ast::item_const(ty, _), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-01-24 00:14:31 -08:00
|
|
|
pprust::ty_to_str(ty)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
2012-01-30 13:05:25 -08:00
|
|
|
with doc
|
2012-01-24 00:14:31 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_const_types() {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = test::mk_doc(~"const a: bool = true;");
|
|
|
|
assert doc.cratemod().consts()[0].sig == some(~"bool");
|
2012-01-25 17:22:19 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
fn fold_enum(
|
|
|
|
fold: fold::fold<astsrv::srv>,
|
|
|
|
doc: doc::enumdoc
|
|
|
|
) -> doc::enumdoc {
|
2012-02-26 23:47:27 -08:00
|
|
|
let doc_id = doc.id();
|
2012-01-25 17:22:19 -08:00
|
|
|
let srv = fold.ctxt;
|
|
|
|
|
2012-01-30 13:05:25 -08:00
|
|
|
{
|
2012-07-14 03:36:35 +10:00
|
|
|
variants: do par::map(doc.variants) |variant| {
|
2012-06-30 16:19:07 -07:00
|
|
|
let sig = do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check ctxt.ast_map.get(doc_id) {
|
2012-01-25 17:22:19 -08:00
|
|
|
ast_map::node_item(@{
|
2012-08-08 17:14:25 -07:00
|
|
|
node: ast::item_enum(enum_definition, _), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-01-25 17:22:19 -08:00
|
|
|
let ast_variant = option::get(
|
2012-08-08 17:14:25 -07:00
|
|
|
do vec::find(enum_definition.variants) |v| {
|
2012-06-10 00:49:59 -07:00
|
|
|
*v.node.name == variant.name
|
2012-01-25 17:22:19 -08:00
|
|
|
});
|
|
|
|
|
|
|
|
pprust::variant_to_str(ast_variant)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2012-01-30 13:05:25 -08:00
|
|
|
{
|
2012-01-25 17:22:19 -08:00
|
|
|
sig: some(sig)
|
2012-01-30 13:05:25 -08:00
|
|
|
with variant
|
2012-01-25 17:22:19 -08:00
|
|
|
}
|
|
|
|
}
|
2012-01-30 13:05:25 -08:00
|
|
|
with doc
|
2012-01-25 17:22:19 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_variant_sigs() {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = test::mk_doc(~"enum a { b(int) }");
|
|
|
|
assert doc.cratemod().enums()[0].variants[0].sig == some(~"b(int)");
|
2012-01-25 17:22:19 -08:00
|
|
|
}
|
2012-01-26 20:59:15 -08:00
|
|
|
|
2012-07-03 16:30:42 -07:00
|
|
|
fn fold_trait(
|
2012-01-30 15:44:21 -08:00
|
|
|
fold: fold::fold<astsrv::srv>,
|
2012-07-03 16:30:42 -07:00
|
|
|
doc: doc::traitdoc
|
|
|
|
) -> doc::traitdoc {
|
2012-01-30 15:44:21 -08:00
|
|
|
{
|
2012-02-17 14:46:30 -08:00
|
|
|
methods: merge_methods(fold.ctxt, doc.id(), doc.methods)
|
2012-01-30 15:44:21 -08:00
|
|
|
with doc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-31 16:35:54 -08:00
|
|
|
fn merge_methods(
|
|
|
|
srv: astsrv::srv,
|
|
|
|
item_id: doc::ast_id,
|
2012-06-29 16:26:56 -07:00
|
|
|
docs: ~[doc::methoddoc]
|
|
|
|
) -> ~[doc::methoddoc] {
|
2012-07-14 03:36:35 +10:00
|
|
|
do par::map(docs) |doc| {
|
2012-01-31 16:35:54 -08:00
|
|
|
{
|
|
|
|
sig: get_method_sig(srv, item_id, doc.name)
|
|
|
|
with doc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-30 15:44:21 -08:00
|
|
|
fn get_method_sig(
|
|
|
|
srv: astsrv::srv,
|
|
|
|
item_id: doc::ast_id,
|
2012-07-13 22:57:48 -07:00
|
|
|
method_name: ~str
|
|
|
|
) -> option<~str> {
|
2012-06-30 16:19:07 -07:00
|
|
|
do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check ctxt.ast_map.get(item_id) {
|
2012-01-30 15:44:21 -08:00
|
|
|
ast_map::node_item(@{
|
2012-08-03 15:02:01 -07:00
|
|
|
node: ast::item_trait(_, _, methods), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check vec::find(methods, |method| {
|
|
|
|
match method {
|
2012-08-03 19:59:04 -07:00
|
|
|
ast::required(ty_m) => *ty_m.ident == method_name,
|
|
|
|
ast::provided(m) => *m.ident == method_name,
|
2012-07-10 13:44:20 -07:00
|
|
|
}
|
2012-06-26 13:55:56 -07:00
|
|
|
}) {
|
2012-08-03 19:59:04 -07:00
|
|
|
some(method) => {
|
2012-08-06 12:34:08 -07:00
|
|
|
match method {
|
2012-08-03 19:59:04 -07:00
|
|
|
ast::required(ty_m) => {
|
2012-07-10 13:44:20 -07:00
|
|
|
some(pprust::fun_to_str(
|
|
|
|
ty_m.decl,
|
|
|
|
ty_m.ident,
|
|
|
|
ty_m.tps
|
|
|
|
))
|
|
|
|
}
|
2012-08-03 19:59:04 -07:00
|
|
|
ast::provided(m) => {
|
2012-07-10 13:44:20 -07:00
|
|
|
some(pprust::fun_to_str(
|
|
|
|
m.decl,
|
|
|
|
m.ident,
|
|
|
|
m.tps
|
|
|
|
))
|
|
|
|
}
|
|
|
|
}
|
2012-01-30 15:44:21 -08:00
|
|
|
}
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ast_map::node_item(@{
|
2012-07-11 10:28:30 -07:00
|
|
|
node: ast::item_impl(_, _, _, methods), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-08-06 12:34:08 -07:00
|
|
|
match check vec::find(methods, |method| {
|
2012-06-10 00:49:59 -07:00
|
|
|
*method.ident == method_name
|
2012-06-26 13:55:56 -07:00
|
|
|
}) {
|
2012-08-03 19:59:04 -07:00
|
|
|
some(method) => {
|
2012-03-18 21:30:45 -07:00
|
|
|
some(pprust::fun_to_str(
|
|
|
|
method.decl,
|
|
|
|
method.ident,
|
|
|
|
method.tps
|
|
|
|
))
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
2012-01-30 15:44:21 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2012-07-03 16:30:42 -07:00
|
|
|
fn should_add_trait_method_sigs() {
|
2012-07-31 10:27:51 -07:00
|
|
|
let doc = test::mk_doc(~"trait i { fn a<T>() -> int; }");
|
2012-07-03 16:30:42 -07:00
|
|
|
assert doc.cratemod().traits()[0].methods[0].sig
|
2012-07-13 22:57:48 -07:00
|
|
|
== some(~"fn a<T>() -> int");
|
2012-01-30 15:44:21 -08:00
|
|
|
}
|
|
|
|
|
2012-01-31 16:35:54 -08:00
|
|
|
fn fold_impl(
|
|
|
|
fold: fold::fold<astsrv::srv>,
|
|
|
|
doc: doc::impldoc
|
|
|
|
) -> doc::impldoc {
|
|
|
|
|
|
|
|
let srv = fold.ctxt;
|
|
|
|
|
2012-07-18 09:31:53 -07:00
|
|
|
let (trait_types, self_ty) = do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match ctxt.ast_map.get(doc.id()) {
|
2012-01-31 16:35:54 -08:00
|
|
|
ast_map::node_item(@{
|
2012-07-18 09:31:53 -07:00
|
|
|
node: ast::item_impl(_, trait_types, self_ty, _), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-07-18 09:31:53 -07:00
|
|
|
let trait_types = vec::map(trait_types, |p| {
|
2012-04-13 12:22:35 -07:00
|
|
|
pprust::path_to_str(p.path)
|
2012-06-26 13:55:56 -07:00
|
|
|
});
|
2012-07-18 09:31:53 -07:00
|
|
|
(trait_types, some(pprust::ty_to_str(self_ty)))
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
2012-08-03 19:59:04 -07:00
|
|
|
_ => fail ~"expected impl"
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
{
|
2012-07-18 09:31:53 -07:00
|
|
|
trait_types: trait_types,
|
2012-01-31 16:35:54 -08:00
|
|
|
self_ty: self_ty,
|
2012-02-17 14:46:30 -08:00
|
|
|
methods: merge_methods(fold.ctxt, doc.id(), doc.methods)
|
2012-01-31 16:35:54 -08:00
|
|
|
with doc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2012-07-18 09:31:53 -07:00
|
|
|
fn should_add_impl_trait_types() {
|
2012-08-08 17:19:06 -07:00
|
|
|
let doc = test::mk_doc(~"impl int: j { fn a<T>() { } }");
|
2012-07-18 09:31:53 -07:00
|
|
|
assert doc.cratemod().impls()[0].trait_types[0] == ~"j";
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2012-07-18 09:31:53 -07:00
|
|
|
fn should_not_add_impl_trait_types_if_none() {
|
2012-08-08 17:19:06 -07:00
|
|
|
let doc = test::mk_doc(~"impl int { fn a() { } }");
|
2012-07-18 09:31:53 -07:00
|
|
|
assert vec::len(doc.cratemod().impls()[0].trait_types) == 0;
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_impl_self_ty() {
|
2012-08-08 17:19:06 -07:00
|
|
|
let doc = test::mk_doc(~"impl int { fn a() { } }");
|
2012-07-13 22:57:48 -07:00
|
|
|
assert doc.cratemod().impls()[0].self_ty == some(~"int");
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_impl_method_sigs() {
|
2012-08-08 17:19:06 -07:00
|
|
|
let doc = test::mk_doc(~"impl int { fn a<T>() -> int { fail } }");
|
2012-03-18 21:30:45 -07:00
|
|
|
assert doc.cratemod().impls()[0].methods[0].sig
|
2012-07-13 22:57:48 -07:00
|
|
|
== some(~"fn a<T>() -> int");
|
2012-01-31 16:35:54 -08:00
|
|
|
}
|
|
|
|
|
2012-02-01 22:41:41 -08:00
|
|
|
fn fold_type(
|
|
|
|
fold: fold::fold<astsrv::srv>,
|
|
|
|
doc: doc::tydoc
|
|
|
|
) -> doc::tydoc {
|
|
|
|
|
|
|
|
let srv = fold.ctxt;
|
|
|
|
|
|
|
|
{
|
2012-06-30 16:19:07 -07:00
|
|
|
sig: do astsrv::exec(srv) |ctxt| {
|
2012-08-06 12:34:08 -07:00
|
|
|
match ctxt.ast_map.get(doc.id()) {
|
2012-02-01 22:41:41 -08:00
|
|
|
ast_map::node_item(@{
|
|
|
|
ident: ident,
|
2012-07-11 10:28:30 -07:00
|
|
|
node: ast::item_ty(ty, params), _
|
2012-08-03 19:59:04 -07:00
|
|
|
}, _) => {
|
2012-07-30 16:01:07 -07:00
|
|
|
some(fmt!{
|
2012-02-01 22:41:41 -08:00
|
|
|
"type %s%s = %s",
|
2012-06-10 00:49:59 -07:00
|
|
|
*ident,
|
2012-02-01 22:41:41 -08:00
|
|
|
pprust::typarams_to_str(params),
|
|
|
|
pprust::ty_to_str(ty)
|
2012-07-30 16:01:07 -07:00
|
|
|
})
|
2012-02-01 22:41:41 -08:00
|
|
|
}
|
2012-08-03 19:59:04 -07:00
|
|
|
_ => fail ~"expected type"
|
2012-02-01 22:41:41 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
with doc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_add_type_signatures() {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = test::mk_doc(~"type t<T> = int;");
|
|
|
|
assert doc.cratemod().types()[0].sig == some(~"type t<T> = int");
|
2012-02-01 22:41:41 -08:00
|
|
|
}
|
|
|
|
|
2012-01-31 18:32:37 -08:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
2012-07-13 22:57:48 -07:00
|
|
|
fn mk_doc(source: ~str) -> doc::doc {
|
2012-06-30 16:19:07 -07:00
|
|
|
do astsrv::from_str(source) |srv| {
|
2012-07-13 22:57:48 -07:00
|
|
|
let doc = extract::from_srv(srv, ~"");
|
2012-02-20 21:08:19 -08:00
|
|
|
run(srv, doc)
|
|
|
|
}
|
2012-01-31 18:32:37 -08:00
|
|
|
}
|
2012-01-30 11:52:34 +01:00
|
|
|
}
|