Merge branch 'phases'

[nit.git] / src / nitmetrics.nit

diff --git a/src/nitmetrics.nit b/src/nitmetrics.nit
index dd88504..0f6f430 100644 (file)
--- a/src/nitmetrics.nit
+++ b/src/nitmetrics.nit
@@ -18,7 +18,7 @@
 module nitmetrics
 
 import modelbuilder
-import exprbuilder
+import frontend
 import metrics
 
 # Create a tool context to handle options and paths
@@ -39,8 +39,8 @@ 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_and_build(arguments)
-modelbuilder.full_propdef_semantic_analysis
+var mmodules = modelbuilder.parse(arguments)
+modelbuilder.run_phases
 
 if mmodules.length == 0 then return
 
@@ -64,12 +64,6 @@ if all or toolcontext.opt_inheritance.value then
        compute_inheritance_metrics(toolcontext, model)
 end
 
-# Genericity usage metrics
-if all or toolcontext.opt_genericity.value then
-       print ""
-       compute_genericity_metrics(toolcontext, model)
-end
-
 # Refinement usage metrics
 if all or toolcontext.opt_refinement.value then
        print ""