src: remove useless comparisons on null

[nit.git] / src / nit.nit

diff --git a/src/nit.nit b/src/nit.nit
index dc48db8..24bb00e 100644 (file)
--- a/src/nit.nit
+++ b/src/nit.nit
@@ -17,31 +17,55 @@
 # A naive Nit interpreter
 module nit
 
-import naive_interpreter
-import debugger
-import debugger_socket
+import interpreter
+import frontend
+import parser_util
 
 # 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.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")
+toolcontext.option_context.add_option(opt_mixins, opt_eval, opt_loop)
 # We do not add other options, so process them now!
 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
 
 # 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
+               var nruntime = modelbuilder.load_module("niti_runtime")
+               if nruntime == null then
+                       toolcontext.check_errors
+                       abort
+               end
+               parent = nruntime.mmodule
+       end
+
+       modelbuilder.load_rt_module(parent, amodule, "-")
+
+       mmodules = [amodule.mmodule.as(not null)]
+else
+       mmodules = modelbuilder.parse([progname])
+end
+
 mmodules.add_all modelbuilder.parse(opt_mixins.value)
 modelbuilder.run_phases
 
@@ -57,8 +81,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)