nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compiler: do not call C `nit_alloc` directly but a Nit method.
[nit.git]
/
src
/
doc
/
doc_base.nit
diff --git
a/src/doc/doc_base.nit
b/src/doc/doc_base.nit
index
29efa62
..
c77c332
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,7
@@
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
# `DocPage` composing the documentation associated to their ids.
#
# `DocPage` composing the documentation associated to their ids.
#
@@
-33,9
+35,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
# The entry point of the `model`.
var mainmodule: MModule is writable
@@
-144,6
+143,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
@@
-221,7
+221,7
@@
end
redef class ToolContext
# Directory where the Nitdoc is rendered.
redef class ToolContext
# Directory where the Nitdoc is rendered.
- var opt_dir = new OptionString("output directory", "-d", "--dir")
+ var opt_dir = new OptionString("Output directory", "-d", "--dir")
# Shortcut for `opt_dir.value` with default "doc".
var output_dir: String is lazy do return opt_dir.value or else "doc"
# Shortcut for `opt_dir.value` with default "doc".
var output_dir: String is lazy do return opt_dir.value or else "doc"
@@
-320,6
+320,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