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

diff --git a/src/nit.nit b/src/nit.nit
index caaf869..dc48db8 100644
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -17,45 +17,54 @@
 # A naive Nit interpreter
 module nit
 
-import modelbuilder
-import frontend
-import transform
 import naive_interpreter
 import debugger
-#import interpretor_type_test
+import debugger_socket
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
+toolcontext.tooldescription = "Usage: nit [OPTION]... <file.nit>...\nInterprets and debbugs Nit programs."
 # Add an option "-o" to enable compatibilit with the tests.sh script
 var opt = new OptionString("compatibility (does noting)", "-o")
 toolcontext.option_context.add_option(opt)
+var opt_mixins = new OptionArray("Additionals module to min-in", "-m")
+toolcontext.option_context.add_option(opt_mixins)
 # We do not add other options, so process them now!
-toolcontext.process_options
+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)
+var modelbuilder = new ModelBuilder(model, toolcontext.as(not null))
 
 var arguments = toolcontext.option_context.rest
-if arguments.is_empty or toolcontext.opt_help.value then
-	toolcontext.option_context.usage
-	return
-end
 var progname = arguments.first
 
 # Here we load an process all modules passed on the command line
 var mmodules = modelbuilder.parse([progname])
+mmodules.add_all modelbuilder.parse(opt_mixins.value)
 modelbuilder.run_phases
 
+if toolcontext.opt_only_metamodel.value then exit(0)
+
+var mainmodule: nullable MModule
+
 # Here we launch the interpreter on the main module
-assert mmodules.length == 1
-var mainmodule = mmodules.first
+if mmodules.length == 1 then
+	mainmodule = mmodules.first
+else
+	mainmodule = new MModule(model, null, mmodules.first.name, mmodules.first.location)
+	mainmodule.set_imported_mmodules(mmodules)
+end
+
+var self_mm = mainmodule.as(not null)
+var self_args = arguments.as(not null)
 
 if toolcontext.opt_debugger_autorun.value then
-	modelbuilder.run_debugger_autorun(mainmodule, arguments)
+	modelbuilder.run_debugger_autorun(self_mm, self_args)
 else if toolcontext.opt_debugger_mode.value then
-	modelbuilder.run_debugger(mainmodule, arguments)
+	modelbuilder.run_debugger(self_mm, self_args)
 else
-	modelbuilder.run_naive_interpreter(mainmodule, arguments)
+	modelbuilder.run_naive_interpreter(self_mm, self_args)
 end
+