X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 41fed1e..7e6fb6f 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -165,6 +165,12 @@ private class NaiveInterpreter if i == null and not self.is_escaping then n.debug("inconsitance: no value and not escaping.") end + var implicit_cast_to = n.implicit_cast_to + if implicit_cast_to != null then + var mtype = self.unanchor_type(implicit_cast_to) + if not self.is_subtype(i.mtype, mtype) then n.fatal(self, "Cast failed") + end + #n.debug("OUT Execute expr: value is {i}") #if not is_subtype(i.mtype, n.mtype.as(not null)) then n.debug("Expected {n.mtype.as(not null)} got {i}") frame.current_node = old @@ -335,9 +341,11 @@ private class NaiveInterpreter var mproperty = mpropdef.mproperty if self.modelbuilder.mpropdef2npropdef.has_key(mpropdef) then var npropdef = self.modelbuilder.mpropdef2npropdef[mpropdef] + self.parameter_check(npropdef, mpropdef, args) return npropdef.call(self, mpropdef, args) else if mproperty.name == "init" then var nclassdef = self.modelbuilder.mclassdef2nclassdef[mpropdef.mclassdef] + self.parameter_check(nclassdef, mpropdef, args) return nclassdef.call(self, mpropdef, args) else fatal("Fatal Error: method {mpropdef} not found in the AST") @@ -345,6 +353,28 @@ private class NaiveInterpreter end end + # Generate type checks in the C code to check covariant parameters + fun parameter_check(node: ANode, mpropdef: MMethodDef, args: Array[Instance]) + do + var msignature = mpropdef.msignature + for i in [0..msignature.arity[ do + # skip test for vararg since the array is instantiated with the correct polymorphic type + if msignature.vararg_rank == i then continue + + # skip if the cast is not required + var origmtype = mpropdef.mproperty.intro.msignature.mparameters[i].mtype + if not origmtype.need_anchor then continue + + # get the parameter type + var mtype = msignature.mparameters[i].mtype + var anchor = args.first.mtype.as(MClassType) + mtype = mtype.anchor_to(self.mainmodule, anchor) + if not args[i+1].mtype.is_subtype(self.mainmodule, anchor, mtype) then + node.fatal(self, "Cast failed") + end + end + end + fun call_closure(closure: ClosureInstance, args: Array[Instance]): nullable Instance do var nclosuredef = closure.nclosuredef @@ -385,16 +415,7 @@ private class NaiveInterpreter fatal("Reciever is null") abort end - var propdefs = mproperty.lookup_definitions(self.mainmodule, mtype) - if propdefs.length > 1 then - fatal("NOT YET IMPLEMETED ERROR: Property conflict: {propdefs.join(", ")}") - abort - end - assert propdefs.length == 1 else - fatal("Fatal Error: No property '{mproperty}' for '{recv}'") - abort - end - var propdef = propdefs.first + var propdef = mproperty.lookup_first_definition(self.mainmodule, mtype) return self.call(propdef, args) end @@ -417,8 +438,9 @@ private class NaiveInterpreter if cache.has_key(mtype) then return cache[mtype] var res = new Array[AAttrPropdef] - for cd in mtype.collect_mclassdefs(self.mainmodule) - do + var cds = mtype.collect_mclassdefs(self.mainmodule).to_a + self.mainmodule.linearize_mclassdefs(cds) + for cd in cds do var n = self.modelbuilder.mclassdef2nclassdef[cd] for npropdef in n.n_propdefs do if npropdef isa AAttrPropdef then @@ -444,7 +466,6 @@ private class NaiveInterpreter # Check that non nullable attributes of `recv' are correctly initialized. # This function is used as the last instruction of a new - # FIXME: this will work better once there is nullable types fun check_init_instance(recv: Instance) do if not recv isa MutableInstance then return @@ -478,7 +499,7 @@ abstract class Instance fun eq_is(o: Instance): Bool do return self is o # Human readable object identity "Type#number" - redef fun to_s do return "{mtype}#{object_id}" + redef fun to_s do return "{mtype}" # Return the integer value if the instance is an integer. # else aborts @@ -656,11 +677,11 @@ redef class AInternMethPropdef end else if pname == "output_class_name" then var recv = args.first - print recv.mtype.as(MClassType).mclass + print recv.mtype return null else if pname == "native_class_name" then var recv = args.first - var txt = recv.mtype.as(MClassType).mclass.to_s + var txt = recv.mtype.to_s return v.native_string_instance(txt) else if pname == "==" then # == is correclt redefined for instances @@ -730,18 +751,27 @@ redef class AInternMethPropdef return v.int_instance(recv <=> args[1].val.as(Char)) end else if cname == "Float" then + var recv = args[0].to_f if pname == "unary -" then - return v.float_instance(-args[0].to_f) + return v.float_instance(-recv) else if pname == "+" then - return v.float_instance(args[0].to_f + args[1].to_f) + return v.float_instance(recv + args[1].to_f) else if pname == "-" then - return v.float_instance(args[0].to_f - args[1].to_f) + return v.float_instance(recv - args[1].to_f) else if pname == "*" then - return v.float_instance(args[0].to_f * args[1].to_f) + return v.float_instance(recv * args[1].to_f) else if pname == "/" then - return v.float_instance(args[0].to_f / args[1].to_f) + return v.float_instance(recv / args[1].to_f) + else if pname == "<" then + return v.bool_instance(recv < args[1].to_f) + else if pname == ">" then + return v.bool_instance(recv > args[1].to_f) + else if pname == "<=" then + return v.bool_instance(recv <= args[1].to_f) + else if pname == ">=" then + return v.bool_instance(recv >= args[1].to_f) else if pname == "to_i" then - return v.int_instance(args[0].to_f.to_i) + return v.int_instance(recv.to_i) end else if cname == "NativeString" then var recvval = args.first.val.as(Buffer) @@ -880,6 +910,8 @@ redef class AExternMethPropdef else if pname == "system" then var res = sys.system(recvval.to_s) return v.int_instance(res) + else if pname == "atof" then + return v.float_instance(recvval.to_f) end else if cname == "Int" then if pname == "rand" then @@ -890,6 +922,24 @@ redef class AExternMethPropdef return v.float_instance(args[0].to_f.cos) else if pname == "sin" then return v.float_instance(args[0].to_f.sin) + else if pname == "tan" then + return v.float_instance(args[0].to_f.tan) + else if pname == "acos" then + return v.float_instance(args[0].to_f.acos) + else if pname == "asin" then + return v.float_instance(args[0].to_f.asin) + else if pname == "atan" then + return v.float_instance(args[0].to_f.atan) + else if pname == "sqrt" then + return v.float_instance(args[0].to_f.sqrt) + else if pname == "exp" then + return v.float_instance(args[0].to_f.exp) + else if pname == "log" then + return v.float_instance(args[0].to_f.log) + else if pname == "pow" 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) end else if pname == "native_argc" then return v.int_instance(v.arguments.length) @@ -898,6 +948,9 @@ redef class AExternMethPropdef return v.native_string_instance(txt) else if pname == "get_time" then return v.int_instance(get_time) + else if pname == "srand_from" then + srand_from(args[1].to_i) + return null else if pname == "atan2" then return v.float_instance(atan2(args[1].to_f, args[2].to_f)) else if pname == "pi" then @@ -1532,12 +1585,7 @@ redef class ASuperExpr # stantard call-next-method var mpropdef = v.frame.mpropdef - # FIXME: we do not want an ugly static call! - var mpropdefs = mpropdef.mproperty.lookup_super_definitions(mpropdef.mclassdef.mmodule, mpropdef.mclassdef.bound_mtype) - if mpropdefs.length != 1 then - debug("Warning: NOT YET IMPLEMENTED: multiple MPRODFEFS for super {mpropdef} for {recv}: {mpropdefs.join(", ")}") - end - mpropdef = mpropdefs.first + mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype) assert mpropdef isa MMethodDef var res = v.call(mpropdef, args) return res @@ -1572,6 +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") var mproperty = self.mproperty.as(not null) return v.read_attribute(mproperty, recv) end @@ -1582,6 +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") var i = v.expr(self.n_value) if i == null then return var mproperty = self.mproperty.as(not null) @@ -1595,6 +1645,7 @@ 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") var value = v.expr(self.n_value) if value == null then return var mproperty = self.mproperty.as(not null) @@ -1611,6 +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") var mproperty = self.mproperty.as(not null) assert recv isa MutableInstance return v.bool_instance(recv.attributes.has_key(mproperty))