src: cleanup importations

[nit.git] / src / nit.nit

diff --git a/src/nit.nit b/src/nit.nit
index 36c3815..6e24920 100644 (file)
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -17,8 +17,8 @@
 # A naive Nit interpreter
 module nit
 
-import naive_interpreter
-import debugger
+import interpreter
+import frontend
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
@@ -34,7 +34,7 @@ toolcontext.process_options(args)
 # We need a model to collect stufs
 var model = new Model
 # An a model builder to parse files
-var modelbuilder = new ModelBuilder(model, toolcontext.as(not null))
+var modelbuilder = new ModelBuilder(model, toolcontext)
 
 var arguments = toolcontext.option_context.rest
 var progname = arguments.first
@@ -56,8 +56,8 @@ else
        mainmodule.set_imported_mmodules(mmodules)
 end
 
-var self_mm = mainmodule.as(not null)
-var self_args = arguments.as(not null)
+var self_mm = mainmodule
+var self_args = arguments
 
 if toolcontext.opt_debugger_autorun.value then
        modelbuilder.run_debugger_autorun(self_mm, self_args)