nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib: fix wrong `git.directory` in some contrib projects
[nit.git]
/
src
/
doc
/
doc_base.nit
diff --git
a/src/doc/doc_base.nit
b/src/doc/doc_base.nit
index
c6dabf8
..
ce36170
100644
(file)
--- a/
src/doc/doc_base.nit
+++ b/
src/doc/doc_base.nit
@@
-17,6
+17,7
@@
module doc_base
import toolcontext
import model_ext
import toolcontext
import model_ext
+import model::model_views
# The model of a Nitdoc documentation.
#
# The model of a Nitdoc documentation.
#
@@
-25,6
+26,9
@@
import model_ext
# The model is populated through `DocPhase` to be constructed.
# It is a placeholder to share data between each phase.
class DocModel
# The model is populated through `DocPhase` to be constructed.
# It is a placeholder to share data between each phase.
class DocModel
+ super ModelView
+
+ autoinit model, mainmodule, filter
# `DocPage` composing the documentation associated to their ids.
#
# `DocPage` composing the documentation associated to their ids.
#
@@
-33,12
+37,6
@@
class DocModel
# See `add_page`.
var pages: Map[String, DocPage] = new HashMap[String, DocPage]
# See `add_page`.
var pages: Map[String, DocPage] = new HashMap[String, DocPage]
- # Nit `Model` from which we extract the documentation.
- var model: Model is writable
-
- # The entry point of the `model`.
- var mainmodule: MModule is writable
-
# Add a `page` to this documentation.
fun add_page(page: DocPage) do
if pages.has_key(page.id) then
# Add a `page` to this documentation.
fun add_page(page: DocPage) do
if pages.has_key(page.id) then
@@
-144,6
+142,7
@@
abstract class DocComposite
# Depth of `self` in the composite tree.
fun depth: Int do
# Depth of `self` in the composite tree.
fun depth: Int do
+ var parent = self.parent
if parent == null then return 0
return parent.depth + 1
end
if parent == null then return 0
return parent.depth + 1
end
@@
-320,6
+319,7
@@
redef class MModule
# Avoid id conflict with group
redef fun nitdoc_id do
# Avoid id conflict with group
redef fun nitdoc_id do
+ var mgroup = self.mgroup
if mgroup == null then return super
return "{mgroup.full_name}::{full_name}".to_cmangle
end
if mgroup == null then return super
return "{mgroup.full_name}::{full_name}".to_cmangle
end