Merge branch 'bench'

[nit.git] / src / nit.nit

diff --git a/src/nit.nit b/src/nit.nit
index eca3d4f..e3d6f6d 100644 (file)
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -18,7 +18,7 @@
 module nit
 
 import modelbuilder
-import exprbuilder
+import frontend
 import naive_interpreter
 import debugger
 #import interpretor_type_test
@@ -44,16 +44,16 @@ end
 var progname = arguments.first
 
 # Here we load an process all modules passed on the command line
-var mmodules = modelbuilder.parse_and_build([progname])
-modelbuilder.full_propdef_semantic_analysis
-
-if toolcontext.opt_only_metamodel.value then exit(0)
+var mmodules = modelbuilder.parse([progname])
+modelbuilder.run_phases
 
 # Here we launch the interpreter on the main module
 assert mmodules.length == 1
 var mainmodule = mmodules.first
 
-if toolcontext.opt_debugger_mode.value then
+if toolcontext.opt_debugger_autorun.value then
+       modelbuilder.run_debugger_autorun(mainmodule, arguments)
+else if toolcontext.opt_debugger_mode.value then
        modelbuilder.run_debugger(mainmodule, arguments)
 else
        modelbuilder.run_naive_interpreter(mainmodule, arguments)