nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Fix Music loading bug for friendz
[nit.git]
/
src
/
nitvm.nit
diff --git
a/src/nitvm.nit
b/src/nitvm.nit
index
9a62208
..
088cd92
100644
(file)
--- a/
src/nitvm.nit
+++ b/
src/nitvm.nit
@@
-18,6
+18,7
@@
module nitvm
import vm
module nitvm
import vm
+import frontend
# Create a tool context to handle options and paths
var toolcontext = new ToolContext
# Create a tool context to handle options and paths
var toolcontext = new ToolContext
@@
-34,7
+35,7
@@
toolcontext.process_options(args)
var model = new Model
# Add a model builder to parse files
var model = new Model
# Add 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
var arguments = toolcontext.option_context.rest
var progname = arguments.first
@@
-56,7
+57,7
@@
else
mainmodule.set_imported_mmodules(mmodules)
end
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
-modelbuilder.run_naive_interpreter(self_mm, self_args)
+modelbuilder.run_virtual_machine(self_mm, self_args)