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

diff --git a/src/nit.nit b/src/nit.nit
index 8be9ae2..6441b1a 100644
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -18,17 +18,17 @@
 module nit
 
 import interpreter
-import frontend
+import frontend::code_gen
 import parser_util
 import vm
-import vm_optimizations
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext
 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")
+# Add an option "-o" to enable compatibility with the tests.sh script
+var opt = new OptionString("Does nothing. Used for compatibility.", "-o")
+opt.hidden = true
 toolcontext.option_context.add_option(opt)
 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")
@@ -64,24 +64,27 @@ if opt_eval.value then
 	modelbuilder.load_rt_module(parent, amodule, "-")
 
 	mmodules = [amodule.mmodule.as(not null)]
+else if progname == "-" then
+	var content = stdin.read_all
+	var amodule = toolcontext.parse_module(content)
+	toolcontext.check_errors
+	modelbuilder.load_rt_module(null, amodule, "-")
+	mmodules = [amodule.mmodule.as(not null)]
 else
 	mmodules = modelbuilder.parse([progname])
 end
 
 modelbuilder.run_phases
+toolcontext.run_global_phases(modelbuilder.parsed_modules)
 
-if toolcontext.opt_only_metamodel.value then exit(0)
+if toolcontext.opt_only_metamodel.value then toolcontext.quit
 
 var mainmodule = toolcontext.make_main_module(mmodules)
 
 var self_mm = mainmodule
 var self_args = arguments
 
-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
+if opt_vm.value then
 	modelbuilder.run_virtual_machine(self_mm, self_args)
 else
 	modelbuilder.run_naive_interpreter(self_mm, self_args)