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

diff --git a/src/nitmetrics.nit b/src/nitmetrics.nit
index b7cdeb7..89bec39 100644
--- a/src/nitmetrics.nit
+++ b/src/nitmetrics.nit
@@ -23,15 +23,13 @@ import metrics
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
+toolcontext.tooldescription = "Usage: nitmetrics [OPTION]... <file.nit>...\mComputes 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
@@ -42,17 +40,6 @@ var modelbuilder = new ModelBuilder(model, toolcontext)
 var mmodules = modelbuilder.parse(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)
+toolcontext.run_global_phases(mmodules)