X-Git-Url: http://nitlanguage.org

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 02f3bb1..e0c343a 100644
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 # Documentation generator for the nit language.
+#
 # Generate API documentation in HTML format from nit source code.
 module nitdoc
 
@@ -20,29 +21,54 @@ import modelbuilder
 import doc
 
 redef class ToolContext
-	var docphase: Phase = new NitdocPhase(self, null)
+	# Nitdoc generation phase.
+	var docphase: Phase = new Nitdoc(self, null)
 end
 
-private class NitdocPhase
+# Nitdoc phase explores the model and generate pages for each mentities found
+private class Nitdoc
 	super Phase
 	redef fun process_mainmodule(mainmodule, mmodules)
 	do
-		# generate doc
-		var nitdoc = new Nitdoc(toolcontext, mainmodule.model, mainmodule)
-		nitdoc.generate
+		var doc = new DocModel(mainmodule.model, mainmodule)
+
+		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 LinListPhase(toolcontext, doc),
+			new GraphPhase(toolcontext, doc),
+			new RenderHTMLPhase(toolcontext, doc): DocPhase]
+
+		for phase in phases do
+			toolcontext.info("# {phase.class_name}", 1)
+			phase.apply
+		end
 	end
 end
 
-# process options
+# build toolcontext
 var toolcontext = new ToolContext
+var tpl = new Template
+tpl.add "Usage: nitdoc [OPTION]... <file.nit>...\n"
+tpl.add "Generates HTML pages of API documentation from Nit source files."
+toolcontext.tooldescription = tpl.write_to_string
+
+# process options
 toolcontext.process_options(args)
 var arguments = toolcontext.option_context.rest
 
 # build model
 var model = new Model
 var mbuilder = new ModelBuilder(model, toolcontext)
-var mmodules = mbuilder.parse(arguments)
+var mmodules = mbuilder.parse_full(arguments)
 
+# process
 if mmodules.is_empty then return
 mbuilder.run_phases
 toolcontext.run_global_phases(mmodules)