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

diff --git a/src/nitmetrics.nit b/src/nitmetrics.nit
index 6b12f88..3925360 100644
--- a/src/nitmetrics.nit
+++ b/src/nitmetrics.nit
@@ -17,21 +17,18 @@
 # A program that collects various metrics on nit programs and libraries
 module nitmetrics
 
-import modelbuilder
 import frontend
 import metrics
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
+toolcontext.tooldescription = "Usage: nitmetrics [OPTION]... <file.nit>...\nComputes various metrics on Nit programs."
+
 # We do not add other options, so process them now!
-toolcontext.process_options
+toolcontext.process_options(args)
 
 # Get arguments
 var arguments = toolcontext.option_context.rest
-if arguments.is_empty or toolcontext.opt_help.value then
-	toolcontext.option_context.usage
-	return
-end
 
 # We need a model to collect stufs
 var model = new Model
@@ -39,23 +36,9 @@ var model = new Model
 var modelbuilder = new ModelBuilder(model, toolcontext)
 
 # Here we load an process all modules passed on the command line
-var mmodules = modelbuilder.parse(arguments)
+var mmodules = modelbuilder.parse_full(arguments)
 modelbuilder.run_phases
 
-if mmodules.length == 0 then return
-
-var mainmodule: MModule
-if mmodules.length == 1 then
-	mainmodule = mmodules.first
-else
-	# We need a main module, so we build it by importing all modules
-	mainmodule = new MModule(model, null, "<main>", new Location(null, 0, 0, 0, 0))
-	mainmodule.set_imported_mmodules(mmodules)
-end
-
 print "*** METRICS ***"
 
-toolcontext.run_global_phases(mainmodule)
-
-# All metrics computation ?
-var all = toolcontext.opt_all.value
+toolcontext.run_global_phases(mmodules)