src/doc: rename `DocComposite::add` into `add_child` to avoid conflict with `Template...

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/doc/doc_base.nit b/src/doc/doc_base.nit
index 56b57c2..615f98c 100644 (file)
--- a/src/doc/doc_base.nit
+++ b/src/doc/doc_base.nit
@@ -83,7 +83,9 @@ abstract class DocComposite
        # Add a `child` to `self`.
        #
        # Shortcut for `children.add`.
-       fun add(child: DocComposite) do children.add child
+       fun add_child(child: DocComposite) do
+               children.add child
+       end
 end
 
 # The `DocComposite` element that contains all the other.

diff --git a/src/doc/doc_phases/doc_hierarchies.nit b/src/doc/doc_phases/doc_hierarchies.nit
index ba98ee4..228607e 100644 (file)
--- a/src/doc/doc_phases/doc_hierarchies.nit
+++ b/src/doc/doc_phases/doc_hierarchies.nit
@@ -43,10 +43,10 @@ redef class MModulePage
                var section = new ImportationListSection
                var imports = self.imports.to_a
                v.name_sorter.sort(imports)
-               section.children.add new HierarchyListArticle(mentity, "Imports", imports)
+               section.add_child new HierarchyListArticle(mentity, "Imports", imports)
                var clients = self.clients.to_a
                v.name_sorter.sort(clients)
-               section.children.add new HierarchyListArticle(mentity, "Clients", clients)
+               section.add_child new HierarchyListArticle(mentity, "Clients", clients)
                root.children.insert(section, 1)
        end
 end
@@ -56,16 +56,16 @@ redef class MClassPage
                var section = new InheritanceListSection
                var parents = self.parents.to_a
                v.name_sorter.sort(parents)
-               section.children.add new HierarchyListArticle(mentity, "Parents", parents)
+               section.add_child new HierarchyListArticle(mentity, "Parents", parents)
                var ancestors = self.ancestors.to_a
                v.name_sorter.sort(ancestors)
-               section.children.add new HierarchyListArticle(mentity, "Ancestors", ancestors)
+               section.add_child new HierarchyListArticle(mentity, "Ancestors", ancestors)
                var children = self.children.to_a
                v.name_sorter.sort(children)
-               section.children.add new HierarchyListArticle(mentity, "Children", children)
+               section.add_child new HierarchyListArticle(mentity, "Children", children)
                var descendants = self.descendants.to_a
                v.name_sorter.sort(descendants)
-               section.children.add new HierarchyListArticle(mentity, "Descendants", descendants)
+               section.add_child new HierarchyListArticle(mentity, "Descendants", descendants)
                root.children.insert(section, 1)
        end
 end

diff --git a/src/doc/doc_phases/doc_intros_redefs.nit b/src/doc/doc_phases/doc_intros_redefs.nit
index 85c2c80..afd8e55 100644 (file)
--- a/src/doc/doc_phases/doc_intros_redefs.nit
+++ b/src/doc/doc_phases/doc_intros_redefs.nit
@@ -56,10 +56,10 @@ redef class DefinitionArticle
        private fun build_mmodule_list(v: IntroRedefListPhase, doc: DocModel, mmodule: MModule) do
                var intros = mmodule.intro_mclassdefs(v.ctx.min_visibility).to_a
                doc.mainmodule.linearize_mclassdefs(intros)
-               children.add new IntrosRedefsListArticle(mentity, "Introduces", intros)
+               add_child new IntrosRedefsListArticle(mentity, "Introduces", intros)
                var redefs = mmodule.redef_mclassdefs(v.ctx.min_visibility).to_a
                doc.mainmodule.linearize_mclassdefs(redefs)
-               children.add new IntrosRedefsListArticle(mentity, "Redefines", redefs)
+               add_child new IntrosRedefsListArticle(mentity, "Redefines", redefs)
        end
 
        # TODO this should move to MEntity?
@@ -67,11 +67,11 @@ redef class DefinitionArticle
                var intros = mclassdef.collect_intro_mpropdefs(v.ctx.min_visibility).to_a
                # FIXME avoid diff changes
                # v.ctx.mainmodule.linearize_mpropdefs(intros)
-               children.add new IntrosRedefsListArticle(mentity, "Introduces", intros)
+               add_child new IntrosRedefsListArticle(mentity, "Introduces", intros)
                var redefs = mclassdef.collect_redef_mpropdefs(v.ctx.min_visibility).to_a
                # FIXME avoid diff changes
                # v.ctx.mainmodule.linearize_mpropdefs(redefs)
-               children.add new IntrosRedefsListArticle(mentity, "Redefines", redefs)
+               add_child new IntrosRedefsListArticle(mentity, "Redefines", redefs)
        end
 
 end

diff --git a/src/doc/doc_phases/doc_structure.nit b/src/doc/doc_phases/doc_structure.nit
index 6fc7468..1e0d773 100644 (file)
--- a/src/doc/doc_phases/doc_structure.nit
+++ b/src/doc/doc_phases/doc_structure.nit
@@ -51,9 +51,9 @@ end
 redef class MGroupPage
        redef fun apply_structure(v, doc) do
                if mentity.is_root then
-                       root.add new IntroArticle(mentity.mproject)
+                       root.add_child new IntroArticle(mentity.mproject)
                else
-                       root.add new IntroArticle(mentity)
+                       root.add_child new IntroArticle(mentity)
                end
                var concerns = self.concerns
                if concerns == null or concerns.is_empty then return
@@ -63,12 +63,12 @@ redef class MGroupPage
                concerns.sort_with(v.concerns_sorter)
                mentity.mproject.booster_rank = 0
                mentity.booster_rank = 0
-               root.add new ConcernsArticle(mentity, concerns)
+               root.add_child new ConcernsArticle(mentity, concerns)
                for mentity in concerns do
                        if mentity isa MModule then
-                               root.add new DefinitionArticle(mentity)
+                               root.add_child new DefinitionArticle(mentity)
                        else
-                               root.add new ConcernSection(mentity)
+                               root.add_child new ConcernSection(mentity)
                        end
                end
        end
@@ -76,7 +76,7 @@ end
 
 redef class MModulePage
        redef fun apply_structure(v, doc) do
-               root.add new IntroArticle(mentity)
+               root.add_child new IntroArticle(mentity)
                var concerns = self.concerns
                if concerns == null or concerns.is_empty then return
                # FIXME avoid diff
@@ -87,7 +87,7 @@ redef class MModulePage
                mentity.mgroup.mproject.booster_rank = 0
                mentity.mgroup.booster_rank = 0
                mentity.booster_rank = 0
-               root.add new ConcernsArticle(mentity, concerns)
+               root.add_child new ConcernsArticle(mentity, concerns)
                # reference list
                for mentity in concerns do
                        var section = new ConcernSection(mentity)
@@ -98,16 +98,16 @@ redef class MModulePage
                                        var article = new DefinitionArticle(mclass)
                                        var mclassdefs = mclassdefs_for(mclass).to_a
                                        if not mclassdefs.has(mclass.intro) then
-                                               article.add(new DefinitionArticle(mclass.intro))
+                                               article.add_child(new DefinitionArticle(mclass.intro))
                                        end
                                        doc.mainmodule.linearize_mclassdefs(mclassdefs)
                                        for mclassdef in mclassdefs do
-                                               article.add(new DefinitionArticle(mclassdef))
+                                               article.add_child(new DefinitionArticle(mclassdef))
                                        end
-                                       section.add article
+                                       section.add_child article
                                end
                        end
-                       root.add section
+                       root.add_child section
                end
        end
 
@@ -136,7 +136,7 @@ end
 
 redef class MClassPage
        redef fun apply_structure(v, doc) do
-               root.add new IntroArticle(mentity)
+               root.add_child new IntroArticle(mentity)
                var concerns = self.concerns
                if concerns == null or concerns.is_empty then return
                # FIXME diff hack
@@ -147,7 +147,7 @@ redef class MClassPage
                mentity.intro_mmodule.mgroup.mproject.booster_rank = 0
                mentity.intro_mmodule.mgroup.booster_rank = 0
                mentity.intro_mmodule.booster_rank = 0
-               root.add new ConcernsArticle(mentity, concerns)
+               root.add_child new ConcernsArticle(mentity, concerns)
                for mentity in concerns do
                        var section = new ConcernSection(mentity)
                        if mentity isa MModule then
@@ -157,12 +157,12 @@ redef class MClassPage
                                        v.name_sorter.sort(group)
                                        for mprop in group do
                                                for mpropdef in mpropdefs_for(mprop, mentity) do
-                                                       section.add new DefinitionArticle(mpropdef)
+                                                       section.add_child new DefinitionArticle(mpropdef)
                                                end
                                        end
                                end
                        end
-                       root.add section
+                       root.add_child section
                end
        end
 
@@ -196,7 +196,7 @@ end
 
 redef class MPropertyPage
        redef fun apply_structure(v, doc) do
-               root.add new IntroArticle(mentity)
+               root.add_child new IntroArticle(mentity)
                var concerns = self.concerns
                if concerns == null or concerns.is_empty then return
                # FIXME diff hack
@@ -207,7 +207,7 @@ redef class MPropertyPage
                mentity.intro.mclassdef.mmodule.mgroup.mproject.booster_rank = 0
                mentity.intro.mclassdef.mmodule.mgroup.booster_rank = 0
                mentity.intro.mclassdef.mmodule.booster_rank = 0
-               root.add new ConcernsArticle(mentity, concerns)
+               root.add_child new ConcernsArticle(mentity, concerns)
                for mentity in concerns do
                        var section = new ConcernSection(mentity)
                        if mentity isa MModule then
@@ -215,10 +215,10 @@ redef class MPropertyPage
                                var mpropdefs = mpropdefs_for(mentity).to_a
                                v.name_sorter.sort(mpropdefs)
                                for mpropdef in mpropdefs do
-                                       section.add new DefinitionArticle(mpropdef)
+                                       section.add_child new DefinitionArticle(mpropdef)
                                end
                        end
-                       root.add section
+                       root.add_child section
                end
        end