# A version of the naive Nit interpreter for PNaCl.
module pnacl_nit
-import naive_interpreter
-import debugger
+import interpreter::naive_interpreter
+import interpreter::debugger
import pnacl
intrude import toolcontext
-intrude import modelbuilder
+intrude import loader
intrude import standard::file
# We redefine exit to start a new thread before killing the one that called exit.
redef class ToolContext
# We don't need 'the compute_nit_dir'.
- redef fun compute_nit_dir: nullable String
+ redef fun compute_nit_dir
do
return "/pnacl"
end
end
-# We have to redef some IFStream methods because we don't use NativeFiles anymore.
-redef class IFStream
+# We have to redef some FileReader methods because we don't use NativeFiles anymore.
+redef class FileReader
# Looks in the 'files' HashMap.
redef init open(path: String)
self.path = path
var file = sys.files[path]
prepare_buffer(file.length)
- _buffer.append(file)
+ path.copy_to_native(_buffer, file.length, 0, 0)
end
redef fun close
redef fun fill_buffer
do
- _buffer.clear
+ buffer_reset
end_reached = true
end
# 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
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)