---

yaml
---
r: 7338
b: refs/heads/master
c: 5457b4d
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e77b8db7077bc6eca5955149820f331618977df9
+refs/heads/master: 5457b4d3fbdcedef80176eeb44d2acd575bf5d3f

trunk/src/rustdoc/fold.rs

@@ -0,0 +1,106 @@
+export fold;
+export fold_crate, fold_mod, fold_fn, fold_modlist, fold_fnlist;
+export default_seq_fold;
+
+tag fold = t;
+
+type fold_crate = fn~(fold: fold, doc: doc::cratedoc) -> doc::cratedoc;
+type fold_mod = fn~(fold: fold, doc: doc::moddoc) -> doc::moddoc;
+type fold_fn = fn~(fold: fold, doc: doc::fndoc) -> doc::fndoc;
+type fold_modlist = fn~(fold: fold, list: doc::modlist) -> doc::modlist;
+type fold_fnlist = fn~(fold: fold, list: doc::fnlist) -> doc::fnlist;
+
+type t = {
+    fold_crate: fold_crate,
+    fold_mod: fold_mod,
+    fold_fn: fold_fn,
+    fold_modlist: fold_modlist,
+    fold_fnlist: fold_fnlist
+};
+
+
+// This exists because fn types don't infer correctly as record
+// initializers, but they do as function arguments
+fn mk_fold(
+    fold_crate: fold_crate,
+    fold_mod: fold_mod,
+    fold_fn: fold_fn,
+    fold_modlist: fold_modlist,
+    fold_fnlist: fold_fnlist
+) -> fold {
+    fold({
+        fold_crate: fold_crate,
+        fold_mod: fold_mod,
+        fold_fn: fold_fn,
+        fold_modlist: fold_modlist,
+        fold_fnlist: fold_fnlist
+    })
+}
+
+fn default_seq_fold() -> fold {
+    mk_fold(
+        default_seq_fold_crate,
+        default_seq_fold_mod,
+        default_seq_fold_fn,
+        default_seq_fold_modlist,
+        default_seq_fold_fnlist
+    )
+}
+
+fn default_seq_fold_crate(
+    fold: fold,
+    doc: doc::cratedoc
+) -> doc::cratedoc {
+    ~{
+        topmod: fold.fold_mod(fold, doc.topmod)
+    }
+}
+
+fn default_seq_fold_mod(
+    fold: fold,
+    doc: doc::moddoc
+) -> doc::moddoc {
+    ~{
+        name: doc.name,
+        mods: fold.fold_modlist(fold, doc.mods),
+        fns: fold.fold_fnlist(fold, doc.fns)
+    }
+}
+
+fn default_seq_fold_fn(
+    _fold: fold,
+    doc: doc::fndoc
+) -> doc::fndoc {
+    doc
+}
+
+fn default_seq_fold_modlist(
+    fold: fold,
+    list: doc::modlist
+) -> doc::modlist {
+    doc::modlist(vec::map(*list) {|doc|
+        fold.fold_mod(fold, doc)
+    })
+}
+
+fn default_seq_fold_fnlist(
+    fold: fold,
+    list: doc::fnlist
+) -> doc::fnlist {
+    doc::fnlist(vec::map(*list) {|doc|
+        fold.fold_fn(fold, doc)
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn default_fold_should_produce_same_doc() {
+        let source = "mod a { fn b() { } mod c { fn d() { } } }";
+        let ast = parse::from_str(source);
+        let doc = extract::extract(ast, "");
+        let fld = default_seq_fold();
+        let folded = fld.fold_crate(fld, doc);
+        assert doc == folded;
+    }
+}

trunk/src/rustdoc/rustdoc.rc

@@ -11,4 +11,5 @@ mod parse;
 mod extract;
 mod attr_parser;
 mod doc;
-mod gen;
+mod gen;
+mod fold;