Rename REAMDE to README.md

[nit.git] / src / nit.nit

diff --git a/src/nit.nit b/src/nit.nit
index caaf869..5a74d48 100644 (file)
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -17,20 +17,24 @@
 # A naive Nit interpreter
 module nit
 
-import modelbuilder
+import interpreter
 import frontend
-import transform
-import naive_interpreter
-import debugger
-#import interpretor_type_test
+import parser_util
+import vm
 
 # 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")
 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")
+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
+toolcontext.process_options(args)
 
 # We need a model to collect stufs
 var model = new Model
@@ -38,24 +42,47 @@ var model = new Model
 var modelbuilder = new ModelBuilder(model, toolcontext)
 
 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])
+var mmodules: Array[MModule]
+
+if opt_eval.value then
+       var amodule = toolcontext.parse_module(progname)
+       toolcontext.check_errors
+
+       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
+
+       modelbuilder.load_rt_module(parent, amodule, "-")
+
+       mmodules = [amodule.mmodule.as(not null)]
+else
+       mmodules = modelbuilder.parse([progname])
+end
+
 modelbuilder.run_phases
 
-# Here we launch the interpreter on the main module
-assert mmodules.length == 1
-var mainmodule = mmodules.first
+if toolcontext.opt_only_metamodel.value then exit(0)
+
+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(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 if opt_vm.value then
+       modelbuilder.run_virtual_machine(self_mm, self_args)
 else
-       modelbuilder.run_naive_interpreter(mainmodule, arguments)
+       modelbuilder.run_naive_interpreter(self_mm, self_args)
 end
+