nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nitcc: tests script return non-zero on failure (print is not enough)
[nit.git]
/
src
/
nit.nit
diff --git
a/src/nit.nit
b/src/nit.nit
index
9410b4d
..
be6c665
100644
(file)
--- a/
src/nit.nit
+++ b/
src/nit.nit
@@
-18,7
+18,7
@@
module nit
import interpreter
module nit
import interpreter
-import frontend
+import frontend::code_gen
import parser_util
import vm
import parser_util
import vm
@@
-64,6
+64,12
@@
if opt_eval.value then
modelbuilder.load_rt_module(parent, amodule, "-")
mmodules = [amodule.mmodule.as(not null)]
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
else
mmodules = modelbuilder.parse([progname])
end
@@
-77,11
+83,7
@@
var mainmodule = toolcontext.make_main_module(mmodules)
var self_mm = mainmodule
var self_args = arguments
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)
modelbuilder.run_virtual_machine(self_mm, self_args)
else
modelbuilder.run_naive_interpreter(self_mm, self_args)