import typing
import auto_super_init
import frontend
+import common_ffi
redef class ToolContext
# --discover-call-trace
if initprop != null then
interpreter.send(initprop, [mainobj])
end
- interpreter.check_init_instance(mainobj)
var mainprop = mainmodule.try_get_primitive_method("main", sys_type.mclass)
if mainprop != null then
interpreter.send(mainprop, [mainobj])
var res = new MutableInstance(mtype)
self.init_instance(res)
self.send(self.force_get_primitive_method("with_native", mtype), [res, nat, self.int_instance(values.length)])
- self.check_init_instance(res)
return res
end
# Store known method, used to trace methods as thez are reached
var discover_call_trace: Set[MMethodDef] = new HashSet[MMethodDef]
- # Execute `mpropdef` for a `args` (where `args[0]` is the receiver).
- # Return a falue if `mpropdef` is a function, or null if it is a procedure.
- # The call is direct/static. There is no message-seding/late-binding.
- fun call(mpropdef: MMethodDef, args: Array[Instance]): nullable Instance
+ # Common code for calls to injected methods and normal methods
+ fun call_commons(mpropdef: MMethodDef, args: Array[Instance]): Array[Instance]
do
var vararg_rank = mpropdef.msignature.vararg_rank
if vararg_rank >= 0 then
args.add(rawargs[i+1])
end
end
+ return args
+ end
+
+ # Execute `mpropdef` for a `args` (where `args[0]` is the receiver).
+ # Return a falue if `mpropdef` is a function, or null if it is a procedure.
+ # The call is direct/static. There is no message-seding/late-binding.
+ fun call(mpropdef: MMethodDef, args: Array[Instance]): nullable Instance
+ do
+ args = call_commons(mpropdef, args)
return call_without_varargs(mpropdef, args)
end
self.discover_call_trace.add mpropdef
self.debug("Discovered {mpropdef}")
end
- if args.length < mpropdef.msignature.arity + 1 or args.length > mpropdef.msignature.arity + 1 then
- fatal("NOT YET IMPLEMENTED: Invalid arity for {mpropdef}. {args.length} arguments given.")
- end
+ assert args.length == mpropdef.msignature.arity + 1 else debug("Invalid arity for {mpropdef}. {args.length} arguments given.")
# Look for the AST node that implements the property
var mproperty = mpropdef.mproperty
end
end
- # Execute `mproperty` for a `args` (where `args[0]` is the receiver).
- # Return a falue if `mproperty` is a function, or null if it is a procedure.
- # The call is polimotphic. There is a message-seding/late-bindng according to te receiver (args[0]).
- fun send(mproperty: MMethod, args: Array[Instance]): nullable Instance
+ # Common code for runtime injected calls and normal calls
+ fun send_commons(mproperty: MMethod, args: Array[Instance], mtype: MType): nullable Instance
do
- var recv = args.first
- var mtype = recv.mtype
if mtype isa MNullType then
if mproperty.name == "==" then
return self.bool_instance(args[0] == args[1])
else if mproperty.name == "!=" then
return self.bool_instance(args[0] != args[1])
end
- #fatal("Reciever is null. {mproperty}. {args.join(" ")} {self.frame.current_node.class_name}")
- fatal("Reciever is null")
- abort
+ #fatal("Receiver is null. {mproperty}. {args.join(" ")} {self.frame.current_node.class_name}")
+ fatal("Receiver is null")
end
+ return null
+ end
+
+ # Execute a full `callsite` for given `args`
+ # Use this method, instead of `send` to execute and control the aditionnal behavior of the call-sites
+ fun callsite(callsite: nullable CallSite, arguments: Array[Instance]): nullable Instance
+ do
+ return send(callsite.mproperty, arguments)
+ end
+
+ # Execute `mproperty` for a `args` (where `args[0]` is the receiver).
+ # Return a falue if `mproperty` is a function, or null if it is a procedure.
+ # The call is polimotphic. There is a message-seding/late-bindng according to te receiver (args[0]).
+ fun send(mproperty: MMethod, args: Array[Instance]): nullable Instance
+ do
+ var recv = args.first
+ var mtype = recv.mtype
+ var ret = send_commons(mproperty, args, mtype)
+ if ret != null then return ret
var propdef = mproperty.lookup_first_definition(self.mainmodule, mtype)
return self.call(propdef, args)
end
end
end
- # Check that non nullable attributes of `recv` are correctly initialized.
- # This function is used as the last instruction of a new
- fun check_init_instance(recv: Instance)
- do
- if not recv isa MutableInstance then return
- for npropdef in collect_attr_propdef(recv.mtype) do
- if npropdef.n_expr == null then
- # Force read to check the initialization
- self.read_attribute(npropdef.mpropdef.mproperty, recv)
- end
- end
- end
-
# This function determine the correct type according the reciever of the current definition (self).
fun unanchor_type(mtype: MType): MType
do
end
redef class AConcreteMethPropdef
+
redef fun call(v, mpropdef, args)
do
var f = new Frame(self, self.mpropdef.as(not null), args)
+ call_commons(v, mpropdef, args, f)
+ v.frames.shift
+ if v.returnmark == f then
+ v.returnmark = null
+ var res = v.escapevalue
+ v.escapevalue = null
+ return res
+ end
+ return null
+ end
+
+ private fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame)
+ do
for i in [0..mpropdef.msignature.arity[ do
var variable = self.n_signature.n_params[i].variable
assert variable != null
- f.map[variable] = args[i+1]
+ f.map[variable] = arguments[i+1]
end
v.frames.unshift(f)
# Call the implicit super-init
var auto_super_inits = self.auto_super_inits
if auto_super_inits != null then
- var selfarg = [args.first]
+ var args = [arguments.first]
for auto_super_init in auto_super_inits do
- if auto_super_init.intro.msignature.arity == 0 then
- v.send(auto_super_init, selfarg)
- else
- v.send(auto_super_init, args)
+ args.clear
+ for i in [0..auto_super_init.msignature.arity+1[ do
+ args.add(arguments[i])
end
+ v.callsite(auto_super_init, args)
end
end
v.stmt(self.n_block)
- v.frames.shift
- if v.returnmark == f then
- v.returnmark = null
- var res = v.escapevalue
- v.escapevalue = null
- return res
- end
- return null
end
end
if arg1 >= recvval.length or arg1 < 0 then
debug("Illegal access on {recvval} for element {arg1}/{recvval.length}")
end
- return v.char_instance(recvval[arg1])
+ return v.char_instance(recvval.chars[arg1])
else if pname == "[]=" then
var arg1 = args[1].to_i
if arg1 >= recvval.length or arg1 < 0 then
debug("Illegal access on {recvval} for element {arg1}/{recvval.length}")
end
- recvval[arg1] = args[2].val.as(Char)
+ recvval.chars[arg1] = args[2].val.as(Char)
return null
else if pname == "copy_to" then
# sig= copy_to(dest: NativeString, length: Int, from: Int, to: Int)
else if pname == "file_chdir" then
recvval.to_s.chdir
return null
+ else if pname == "file_realpath" then
+ return v.native_string_instance(recvval.to_s.realpath)
else if pname == "get_environ" then
var txt = recvval.to_s.environ
return v.native_string_instance(txt)
var vari = v.frame.map[self.variable.as(not null)]
var value = v.expr(self.n_value)
if value == null then return
- var res = v.send(reassign_property.mproperty, [vari, value])
+ var res = v.callsite(reassign_callsite, [vari, value])
assert res != null
v.frame.map[self.variable.as(not null)] = res
end
do
var col = v.expr(self.n_expr)
if col == null then return
+ if col.mtype isa MNullType then fatal(v, "Receiver is null")
+
#self.debug("col {col}")
var iter = v.send(v.force_get_primitive_method("iterator", col.mtype), [col]).as(not null)
#self.debug("iter {iter}")
end
end
-redef class AEeExpr
- redef fun expr(v)
- do
- var i = v.expr(self.n_expr)
- if i == null then return null
- var i2 = v.expr(self.n_expr2)
- if i2 == null then return null
- return v.bool_instance(i.eq_is(i2))
- end
-end
-
redef class AIntExpr
redef fun expr(v)
do
var res = new MutableInstance(mtype)
v.init_instance(res)
v.send(v.force_get_primitive_method("init", mtype), [res, e1, e2])
- v.check_init_instance(res)
return res
end
end
var res = new MutableInstance(mtype)
v.init_instance(res)
v.send(v.force_get_primitive_method("without_last", mtype), [res, e1, e2])
- v.check_init_instance(res)
return res
end
end
if i == null then return null
args.add(i)
end
- var mproperty = self.mproperty.as(not null)
- var res = v.send(mproperty, args)
+ var res = v.callsite(callsite, args)
return res
end
end
var value = v.expr(self.n_value)
if value == null then return
- var mproperty = self.mproperty.as(not null)
- var read = v.send(mproperty, args)
+ var read = v.callsite(callsite, args)
assert read != null
- var write = v.send(self.reassign_property.mproperty, [read, value])
+ var write = v.callsite(reassign_callsite, [read, value])
assert write != null
args.add(write)
- v.send(self.write_mproperty.as(not null), args)
+ v.callsite(write_callsite, args)
end
end
if i == null then return null
args.add(i)
end
- if args.length == 1 then
- args = v.frame.arguments
- end
- var mproperty = self.mproperty
- if mproperty != null then
- if mproperty.intro.msignature.arity == 0 then
- args = [recv]
+ var callsite = self.callsite
+ if callsite != null then
+ # Add additionnals arguments for the super init call
+ if args.length == 1 then
+ for i in [0..callsite.mproperty.intro.msignature.arity[ do
+ args.add(v.frame.arguments[i+1])
+ end
end
# Super init call
- var res = v.send(mproperty, args)
+ var res = v.callsite(callsite, args)
return res
end
+ if args.length == 1 then
+ args = v.frame.arguments
+ end
+
# stantard call-next-method
var mpropdef = v.frame.mpropdef
mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype)
if i == null then return null
args.add(i)
end
- var mproperty = self.mproperty.as(not null)
- var res2 = v.send(mproperty, args)
+ var res2 = v.callsite(callsite, args)
if res2 != null then
#self.debug("got {res2} from {mproperty}. drop {recv}")
return res2
end
- v.check_init_instance(recv)
return recv
end
end
do
var recv = v.expr(self.n_expr)
if recv == null then return null
- if recv.mtype isa MNullType then fatal(v, "Reciever is null")
+ if recv.mtype isa MNullType then fatal(v, "Receiver is null")
var mproperty = self.mproperty.as(not null)
return v.read_attribute(mproperty, recv)
end
do
var recv = v.expr(self.n_expr)
if recv == null then return
- if recv.mtype isa MNullType then fatal(v, "Reciever is null")
+ if recv.mtype isa MNullType then fatal(v, "Receiver is null")
var i = v.expr(self.n_value)
if i == null then return
var mproperty = self.mproperty.as(not null)
do
var recv = v.expr(self.n_expr)
if recv == null then return
- if recv.mtype isa MNullType then fatal(v, "Reciever is null")
+ if recv.mtype isa MNullType then fatal(v, "Receiver is null")
var value = v.expr(self.n_value)
if value == null then return
var mproperty = self.mproperty.as(not null)
var attr = v.read_attribute(mproperty, recv)
- var res = v.send(reassign_property.mproperty, [attr, value])
+ var res = v.callsite(reassign_callsite, [attr, value])
assert res != null
assert recv isa MutableInstance
recv.attributes[mproperty] = res
do
var recv = v.expr(self.n_expr)
if recv == null then return null
- if recv.mtype isa MNullType then fatal(v, "Reciever is null")
+ if recv.mtype isa MNullType then fatal(v, "Receiver is null")
var mproperty = self.mproperty.as(not null)
assert recv isa MutableInstance
return v.bool_instance(recv.attributes.has_key(mproperty))
nitlanguage / nit.git / blobdiff