r
/
bookshelf-doc
mirror of https://github.com/jrpotter/bookshelf-doc
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up docstring module

main
Xubai Wang 2022-02-18 12:52:01 +08:00
parent d8a5f52c10
commit 3687b3466a
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DocGen4/Output.lean
View File

@ -71,7 +71,7 @@ def htmlOutput (result : AnalyzerResult) (root : String) : IO Unit := do
let mut declList := #[] let mut declList := #[]
for (_, mod) in result.moduleInfo.toArray do for (_, mod) in result.moduleInfo.toArray do
for decl in mod.members.filter ModuleMember.isDocInfo do for decl in filterMapDocInfo mod.members do
let findHtml := ReaderT.run (findRedirectHtml decl.getName) config let findHtml := ReaderT.run (findRedirectHtml decl.getName) config
let findDir := basePath / "find" / decl.getName.toString let findDir := basePath / "find" / decl.getName.toString
FS.createDirAll findDir FS.createDirAll findDir

7
DocGen4/Output/Module.lean
View File

@ -178,10 +178,11 @@ def internalNav (members : Array Name) (moduleName : Name) : HtmlM Html := do
</nav> </nav>
def moduleToHtml (module : Module) : HtmlM Html := withReader (setCurrentName module.name) do def moduleToHtml (module : Module) : HtmlM Html := withReader (setCurrentName module.name) do
let docInfos ← module.members.mapM (λ i => moduleMemberToHtml module.name i) let memberDocs ← module.members.mapM (λ i => moduleMemberToHtml module.name i)
let memberNames := filterMapDocInfo module.members |>.map DocInfo.getName
templateExtends (baseHtmlArray module.name.toString) $ pure #[ templateExtends (baseHtmlArray module.name.toString) $ pure #[
←internalNav (module.members.filter ModuleMember.isDocInfo |>.map ModuleMember.getName) module.name, ←internalNav memberNames module.name,
Html.element "main" false #[] docInfos Html.element "main" false #[] memberDocs
] ]
end Output end Output

11
DocGen4/Process.lean
View File

@ -461,10 +461,6 @@ def getDeclarationRange : ModuleMember → DeclarationRange
def order (l r : ModuleMember) : Bool := def order (l r : ModuleMember) : Bool :=
Position.lt l.getDeclarationRange.pos r.getDeclarationRange.pos Position.lt l.getDeclarationRange.pos r.getDeclarationRange.pos
def isDocInfo : ModuleMember → Bool
| docInfo _ => true
| _ => false
def getName : ModuleMember → Name def getName : ModuleMember → Name
| docInfo i => i.getName | docInfo i => i.getName
| modDoc i => Name.anonymous | modDoc i => Name.anonymous
@ -475,6 +471,13 @@ def getDocString : ModuleMember → Option String
end ModuleMember end ModuleMember
def filterMapDocInfo (ms : Array ModuleMember) : Array DocInfo :=
ms.filterMap filter
where
filter : ModuleMember → Option DocInfo
| ModuleMember.docInfo i => some i
| _ => none
structure AnalyzerResult where structure AnalyzerResult where
name2ModIdx : HashMap Name ModuleIdx name2ModIdx : HashMap Name ModuleIdx
moduleNames : Array Name moduleNames : Array Name