Merge: Cleanup auto_super_init

[nit.git] / src / nitdoc.nit

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 7c1dd33..2591863 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -23,6 +23,8 @@ import doc
 redef class ToolContext
        # Nitdoc generation phase.
        var docphase: Phase = new Nitdoc(self, null)
 redef class ToolContext
        # Nitdoc generation phase.
        var docphase: Phase = new Nitdoc(self, null)

+
+       init do super # to fix ambiguous linearization

 end
 
 # Nitdoc phase explores the model and generate pages for each mentities found
 end
 
 # Nitdoc phase explores the model and generate pages for each mentities found

@@ -34,13 +36,18 @@ private class Nitdoc
 
                var phases = [
                        new ExtractionPhase(toolcontext, doc),
 
                var phases = [
                        new ExtractionPhase(toolcontext, doc),

+                       new IndexingPhase(toolcontext, doc),

                        new MakePagePhase(toolcontext, doc),
                        new POSetPhase(toolcontext, doc),
                        new ConcernsPhase(toolcontext, doc),
                        new StructurePhase(toolcontext, doc),
                        new InheritanceListsPhase(toolcontext, doc),
                        new IntroRedefListPhase(toolcontext, doc),
                        new MakePagePhase(toolcontext, doc),
                        new POSetPhase(toolcontext, doc),
                        new ConcernsPhase(toolcontext, doc),
                        new StructurePhase(toolcontext, doc),
                        new InheritanceListsPhase(toolcontext, doc),
                        new IntroRedefListPhase(toolcontext, doc),

-                       new GraphPhase(toolcontext, doc): DocPhase]
+                       new LinListPhase(toolcontext, doc),
+                       new GraphPhase(toolcontext, doc),
+                       new ReadmePhase(toolcontext, doc),
+                       new RenderHTMLPhase(toolcontext, doc),
+                       new DocTestPhase(toolcontext, doc): DocPhase]

 
                for phase in phases do
                        toolcontext.info("# {phase.class_name}", 1)
 
                for phase in phases do
                        toolcontext.info("# {phase.class_name}", 1)