bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: Fix some script-mangled idents

Browse source
This commit is contained in:
Brian Anderson 2012-09-18 18:06:01 -07:00
parent afdd8204ea
commit bd4365f15b
2 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/rustdoc/doc.rs
View file

@ -372,8 +372,8 @@ impl Doc {
impl ModDoc { impl ModDoc {
fn mods() -> ~[ModDoc] { fn mods() -> ~[ModDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
ModTag(ModDoc) => Some(ModDoc), ModTag(ModDoc) => Some(ModDoc),
_ => None _ => None
} }
@ -381,8 +381,8 @@ impl ModDoc {
} }
fn nmods() -> ~[NmodDoc] { fn nmods() -> ~[NmodDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
NmodTag(nModDoc) => Some(nModDoc), NmodTag(nModDoc) => Some(nModDoc),
_ => None _ => None
} }
@ -390,8 +390,8 @@ impl ModDoc {
} }
fn fns() -> ~[FnDoc] { fn fns() -> ~[FnDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
FnTag(FnDoc) => Some(FnDoc), FnTag(FnDoc) => Some(FnDoc),
_ => None _ => None
} }
@ -399,8 +399,8 @@ impl ModDoc {
} }
fn consts() -> ~[ConstDoc] { fn consts() -> ~[ConstDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
ConstTag(ConstDoc) => Some(ConstDoc), ConstTag(ConstDoc) => Some(ConstDoc),
_ => None _ => None
} }
@ -408,8 +408,8 @@ impl ModDoc {
} }
fn enums() -> ~[EnumDoc] { fn enums() -> ~[EnumDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
EnumTag(EnumDoc) => Some(EnumDoc), EnumTag(EnumDoc) => Some(EnumDoc),
_ => None _ => None
} }
@ -417,8 +417,8 @@ impl ModDoc {
} }
fn traits() -> ~[TraitDoc] { fn traits() -> ~[TraitDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
TraitTag(TraitDoc) => Some(TraitDoc), TraitTag(TraitDoc) => Some(TraitDoc),
_ => None _ => None
} }
@ -426,8 +426,8 @@ impl ModDoc {
} }
fn impls() -> ~[ImplDoc] { fn impls() -> ~[ImplDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
ImplTag(ImplDoc) => Some(ImplDoc), ImplTag(ImplDoc) => Some(ImplDoc),
_ => None _ => None
} }
@ -435,8 +435,8 @@ impl ModDoc {
} }
fn types() -> ~[TyDoc] { fn types() -> ~[TyDoc] {
do vec::filter_map(self.items) |ItemTag| { do vec::filter_map(self.items) |itemtag| {
match ItemTag { match itemtag {
TyTag(TyDoc) => Some(TyDoc), TyTag(TyDoc) => Some(TyDoc),
_ => None _ => None
} }

74
src/rustdoc/extract.rs
View file

@ -44,21 +44,21 @@ fn extract(
doc::Doc_({ doc::Doc_({
pages: ~[ pages: ~[
doc::CratePage({ doc::CratePage({
topmod: top_ModDoc_from_crate(crate, default_name), topmod: top_moddoc_from_crate(crate, default_name),
}) })
] ]
}) })
} }
fn top_ModDoc_from_crate( fn top_moddoc_from_crate(
crate: @ast::crate, crate: @ast::crate,
default_name: ~str default_name: ~str
) -> doc::ModDoc { ) -> doc::ModDoc {
ModDoc_from_mod(mk_ItemDoc(ast::crate_node_id, default_name), moddoc_from_mod(mk_itemdoc(ast::crate_node_id, default_name),
crate.node.module) crate.node.module)
} }
fn mk_ItemDoc(id: ast::node_id, name: ~str) -> doc::ItemDoc { fn mk_itemdoc(id: ast::node_id, name: ~str) -> doc::ItemDoc {
{ {
id: id, id: id,
name: name, name: name,
@ -70,53 +70,53 @@ fn mk_ItemDoc(id: ast::node_id, name: ~str) -> doc::ItemDoc {
} }
} }
fn ModDoc_from_mod( fn moddoc_from_mod(
ItemDoc: doc::ItemDoc, itemdoc: doc::ItemDoc,
module_: ast::_mod module_: ast::_mod
) -> doc::ModDoc { ) -> doc::ModDoc {
doc::ModDoc_({ doc::ModDoc_({
item: ItemDoc, item: itemdoc,
items: do vec::filter_map(module_.items) |item| { items: do vec::filter_map(module_.items) |item| {
let ItemDoc = mk_ItemDoc(item.id, to_str(item.ident)); let ItemDoc = mk_itemdoc(item.id, to_str(item.ident));
match item.node { match item.node {
ast::item_mod(m) => { ast::item_mod(m) => {
Some(doc::ModTag( Some(doc::ModTag(
ModDoc_from_mod(ItemDoc, m) moddoc_from_mod(ItemDoc, m)
)) ))
} }
ast::item_foreign_mod(nm) => { ast::item_foreign_mod(nm) => {
Some(doc::NmodTag( Some(doc::NmodTag(
nModDoc_from_mod(ItemDoc, nm) nmoddoc_from_mod(ItemDoc, nm)
)) ))
} }
ast::item_fn(*) => { ast::item_fn(*) => {
Some(doc::FnTag( Some(doc::FnTag(
FnDoc_from_fn(ItemDoc) fndoc_from_fn(ItemDoc)
)) ))
} }
ast::item_const(_, _) => { ast::item_const(_, _) => {
Some(doc::ConstTag( Some(doc::ConstTag(
ConstDoc_from_const(ItemDoc) constdoc_from_const(ItemDoc)
)) ))
} }
ast::item_enum(enum_definition, _) => { ast::item_enum(enum_definition, _) => {
Some(doc::EnumTag( Some(doc::EnumTag(
EnumDoc_from_enum(ItemDoc, enum_definition.variants) enumdoc_from_enum(ItemDoc, enum_definition.variants)
)) ))
} }
ast::item_trait(_, _, methods) => { ast::item_trait(_, _, methods) => {
Some(doc::TraitTag( Some(doc::TraitTag(
TraitDoc_from_trait(ItemDoc, methods) traitdoc_from_trait(ItemDoc, methods)
)) ))
} }
ast::item_impl(_, _, _, methods) => { ast::item_impl(_, _, _, methods) => {
Some(doc::ImplTag( Some(doc::ImplTag(
ImplDoc_from_impl(ItemDoc, methods) impldoc_from_impl(ItemDoc, methods)
)) ))
} }
ast::item_ty(_, _) => { ast::item_ty(_, _) => {
Some(doc::TyTag( Some(doc::TyTag(
TyDoc_from_ty(ItemDoc) tydoc_from_ty(ItemDoc)
)) ))
} }
_ => None _ => None
@ -126,37 +126,37 @@ fn ModDoc_from_mod(
}) })
} }
fn nModDoc_from_mod( fn nmoddoc_from_mod(
ItemDoc: doc::ItemDoc, itemdoc: doc::ItemDoc,
module_: ast::foreign_mod module_: ast::foreign_mod
) -> doc::NmodDoc { ) -> doc::NmodDoc {
let mut fns = ~[]; let mut fns = ~[];
for module_.items.each |item| { for module_.items.each |item| {
let ItemDoc = mk_ItemDoc(item.id, to_str(item.ident)); let ItemDoc = mk_itemdoc(item.id, to_str(item.ident));
match item.node { match item.node {
ast::foreign_item_fn(*) => { ast::foreign_item_fn(*) => {
vec::push(fns, FnDoc_from_fn(ItemDoc)); vec::push(fns, fndoc_from_fn(ItemDoc));
} }
ast::foreign_item_const(*) => {} // XXX: Not implemented. ast::foreign_item_const(*) => {} // XXX: Not implemented.
} }
} }
{ {
item: ItemDoc, item: itemdoc,
fns: fns, fns: fns,
index: None index: None
} }
} }
fn FnDoc_from_fn(ItemDoc: doc::ItemDoc) -> doc::FnDoc { fn fndoc_from_fn(itemdoc: doc::ItemDoc) -> doc::FnDoc {
{ {
item: ItemDoc, item: itemdoc,
sig: None sig: None
} }
} }
fn ConstDoc_from_const(ItemDoc: doc::ItemDoc) -> doc::ConstDoc { fn constdoc_from_const(itemdoc: doc::ItemDoc) -> doc::ConstDoc {
{ {
item: ItemDoc, item: itemdoc,
sig: None sig: None
} }
} }
@ -168,12 +168,12 @@ fn should_extract_const_name_and_id() {
assert doc.cratemod().consts()[0].name() == ~"a"; assert doc.cratemod().consts()[0].name() == ~"a";
} }
fn EnumDoc_from_enum( fn enumdoc_from_enum(
ItemDoc: doc::ItemDoc, itemdoc: doc::ItemDoc,
variants: ~[ast::variant] variants: ~[ast::variant]
) -> doc::EnumDoc { ) -> doc::EnumDoc {
{ {
item: ItemDoc, item: itemdoc,
variants: variantdocs_from_variants(variants) variants: variantdocs_from_variants(variants)
} }
} }
@ -206,12 +206,12 @@ fn should_extract_enum_variants() {
assert doc.cratemod().enums()[0].variants[0].name == ~"v"; assert doc.cratemod().enums()[0].variants[0].name == ~"v";
} }
fn TraitDoc_from_trait( fn traitdoc_from_trait(
ItemDoc: doc::ItemDoc, itemdoc: doc::ItemDoc,
methods: ~[ast::trait_method] methods: ~[ast::trait_method]
) -> doc::TraitDoc { ) -> doc::TraitDoc {
{ {
item: ItemDoc, item: itemdoc,
methods: do vec::map(methods) |method| { methods: do vec::map(methods) |method| {
match method { match method {
ast::required(ty_m) => { ast::required(ty_m) => {
@ -251,12 +251,12 @@ fn should_extract_trait_methods() {
assert doc.cratemod().traits()[0].methods[0].name == ~"f"; assert doc.cratemod().traits()[0].methods[0].name == ~"f";
} }
fn ImplDoc_from_impl( fn impldoc_from_impl(
ItemDoc: doc::ItemDoc, itemdoc: doc::ItemDoc,
methods: ~[@ast::method] methods: ~[@ast::method]
) -> doc::ImplDoc { ) -> doc::ImplDoc {
{ {
item: ItemDoc, item: itemdoc,
trait_types: ~[], trait_types: ~[],
self_ty: None, self_ty: None,
methods: do vec::map(methods) |method| { methods: do vec::map(methods) |method| {
@ -278,11 +278,11 @@ fn should_extract_impl_methods() {
assert doc.cratemod().impls()[0].methods[0].name == ~"f"; assert doc.cratemod().impls()[0].methods[0].name == ~"f";
} }
fn TyDoc_from_ty( fn tydoc_from_ty(
ItemDoc: doc::ItemDoc itemdoc: doc::ItemDoc
) -> doc::TyDoc { ) -> doc::TyDoc {
{ {
item: ItemDoc, item: itemdoc,
sig: None sig: None
} }
} }