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

diff --git a/src/nit.nit b/src/nit.nit
index 6e24920..5a74d48 100644
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -19,15 +19,20 @@ module nit
 
 import interpreter
 import frontend
+import parser_util
+import vm
 
 # 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."
+toolcontext.option_context.options_before_rest = true
+toolcontext.tooldescription = "Usage: nit [OPTION]... <file.nit>...\nInterprets and debugs 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)
+var opt_eval = new OptionBool("Specifies the program from command-line", "-e")
+var opt_loop = new OptionBool("Repeatedly run the program for each line in file-name arguments", "-n")
+var opt_vm = new OptionBool("Run the virtual machine instead of the naive interpreter (experimental)", "--vm")
+toolcontext.option_context.add_option(opt_eval, opt_loop, opt_vm)
 # We do not add other options, so process them now!
 toolcontext.process_options(args)
 
@@ -40,22 +45,34 @@ var arguments = toolcontext.option_context.rest
 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
+var mmodules: Array[MModule]
 
-if toolcontext.opt_only_metamodel.value then exit(0)
+if opt_eval.value then
+	var amodule = toolcontext.parse_module(progname)
+	toolcontext.check_errors
 
-var mainmodule: nullable MModule
+	var parent = null
+	if opt_loop.value then
+		parent = modelbuilder.get_mmodule_by_name(null, null, "niti_runtime")
+		if parent == null then
+			toolcontext.check_errors
+			abort
+		end
+	end
 
-# Here we launch the interpreter on the main module
-if mmodules.length == 1 then
-	mainmodule = mmodules.first
+	modelbuilder.load_rt_module(parent, amodule, "-")
+
+	mmodules = [amodule.mmodule.as(not null)]
 else
-	mainmodule = new MModule(model, null, mmodules.first.name, mmodules.first.location)
-	mainmodule.set_imported_mmodules(mmodules)
+	mmodules = modelbuilder.parse([progname])
 end
 
+modelbuilder.run_phases
+
+if toolcontext.opt_only_metamodel.value then exit(0)
+
+var mainmodule = toolcontext.make_main_module(mmodules)
+
 var self_mm = mainmodule
 var self_args = arguments
 
@@ -63,6 +80,8 @@ if toolcontext.opt_debugger_autorun.value then
 	modelbuilder.run_debugger_autorun(self_mm, self_args)
 else if toolcontext.opt_debugger_mode.value then
 	modelbuilder.run_debugger(self_mm, self_args)
+else if opt_vm.value then
+	modelbuilder.run_virtual_machine(self_mm, self_args)
 else
 	modelbuilder.run_naive_interpreter(self_mm, self_args)
 end