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
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]).
return null
end
- private fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, args: Array[Instance], f: Frame)
+ 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
return v.char_instance(recv.succ)
else if pname == "prec" then
return v.char_instance(recv.prec)
+ else if pname == "+" then
+ return v.char_instance(recv + args[1].to_i)
+ else if pname == "-" then
+ return v.char_instance(recv - args[1].to_i)
else if pname == "<" then
return v.bool_instance(recv < args[1].val.as(Char))
else if pname == ">" then
return v.float_instance(args[0].to_f.pow(args[1].to_f))
else if pname == "rand" then
return v.float_instance(args[0].to_f.rand)
+ else if pname == "abs" then
+ return v.float_instance(args[0].to_f.abs)
+ else if pname == "hypot_with" then
+ return v.float_instance(args[0].to_f.hypot_with(args[1].to_f))
+ else if pname == "is_nan" then
+ return v.bool_instance(args[0].to_f.is_nan)
+ else if pname == "is_inf_extern" then
+ return v.bool_instance(args[0].to_f.is_inf != 0)
end
else if pname == "native_argc" then
return v.int_instance(v.arguments.length)
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_callsite.mproperty, [vari, value])
+ var res = v.callsite(reassign_callsite, [vari, value])
assert res != null
v.frame.map[self.variable.as(not null)] = res
end
args.add(i)
end
- var res = v.send(callsite.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 read = v.send(callsite.mproperty, args)
+ var read = v.callsite(callsite, args)
assert read != null
- var write = v.send(reassign_callsite.mproperty, [read, value])
+ var write = v.callsite(reassign_callsite, [read, value])
assert write != null
args.add(write)
- v.send(write_callsite.mproperty, 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 callsite = self.callsite
if callsite != null then
- if callsite.mproperty.intro.msignature.arity == 0 then
- args = [recv]
+ # 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(callsite.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
+ var mpropdef = self.mpropdef
mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype)
- assert mpropdef isa MMethodDef
var res = v.call_without_varargs(mpropdef, args)
return res
end
if i == null then return null
args.add(i)
end
- var res2 = v.send(callsite.mproperty, args)
+ var res2 = v.callsite(callsite, args)
if res2 != null then
#self.debug("got {res2} from {mproperty}. drop {recv}")
return res2
if value == null then return
var mproperty = self.mproperty.as(not null)
var attr = v.read_attribute(mproperty, recv)
- var res = v.send(reassign_callsite.mproperty, [attr, value])
+ var res = v.callsite(reassign_callsite, [attr, value])
assert res != null
assert recv isa MutableInstance
recv.attributes[mproperty] = res