import typing
import auto_super_init
import frontend
+import common_ffi
redef class ToolContext
# --discover-call-trace
# Return a new native string initialized with `txt`
fun native_string_instance(txt: String): Instance
do
- var val = new Buffer.from(txt)
+ var val = new FlatBuffer.from(txt)
val.add('\0')
var ic = self.mainmodule.get_primitive_class("NativeString")
return new PrimitiveInstance[Buffer](ic.mclass_type, val)
# Return a stack stace. One line per function
fun stack_trace: String
do
- var b = new Buffer
+ var b = new FlatBuffer
b.append(",---- Stack trace -- - - -\n")
for f in frames do
b.append("| {f.mpropdef} ({f.current_node.location})\n")
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
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")
+ #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]).
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 null
else if pname == "copy_to" then
# sig= copy_to(dest: NativeString, length: Int, from: Int, to: Int)
- var destval = args[1].val.as(Buffer)
+ var destval = args[1].val.as(FlatBuffer)
var lenval = args[2].to_i
var fromval = args[3].to_i
var toval = args[4].to_i
if toval + lenval >= destval.length then
debug("Illegal access on {destval} for element {toval}+{lenval}/{destval.length}")
end
- recvval.copy(fromval, lenval, destval, toval)
+ recvval.as(FlatBuffer).copy(fromval, lenval, destval, toval)
return null
else if pname == "atoi" then
return v.int_instance(recvval.to_i)
var recvval = args.first.val
if pname == "io_write" then
var a1 = args[1].val.as(Buffer)
- recvval.as(OStream).write(a1.substring(0, args[2].to_i))
+ recvval.as(OStream).write(a1.substring(0, args[2].to_i).to_s)
return args[2]
else if pname == "io_read" then
var str = recvval.as(IStream).read(args[2].to_i)
var a1 = args[1].val.as(Buffer)
- new Buffer.from(str).copy(0, str.length, a1, 0)
+ new FlatBuffer.from(str).copy(0, str.length, a1.as(FlatBuffer), 0)
return v.int_instance(str.length)
else if pname == "io_close" then
recvval.as(IOS).close
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
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}")
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
mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype)
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
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_callsite.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