X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 76b11fa..4b1030a 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -347,9 +347,7 @@ private class NaiveInterpreter 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 @@ -398,12 +396,19 @@ private class NaiveInterpreter 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]). @@ -602,12 +607,12 @@ redef class AConcreteMethPropdef 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) @@ -615,13 +620,13 @@ redef class AConcreteMethPropdef # 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 @@ -1104,7 +1109,7 @@ redef class AVarReassignExpr 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 @@ -1241,6 +1246,8 @@ redef class AForExpr 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}") @@ -1519,7 +1526,7 @@ redef class ASendExpr args.add(i) end - var res = v.send(callsite.mproperty, args) + var res = v.callsite(callsite, args) return res end end @@ -1538,15 +1545,15 @@ redef class ASendReassignFormExpr 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 @@ -1560,20 +1567,24 @@ redef class ASuperExpr 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) @@ -1595,7 +1606,7 @@ redef class ANewExpr 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 @@ -1609,7 +1620,7 @@ redef class AAttrExpr 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 @@ -1620,7 +1631,7 @@ redef class AAttrAssignExpr 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) @@ -1634,12 +1645,12 @@ redef class AAttrReassignExpr 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 @@ -1651,7 +1662,7 @@ redef class AIssetAttrExpr 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))