X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index a420387..c17ec00 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -57,12 +57,12 @@ redef class ModelBuilder var mainobj = new MutableInstance(sys_type) interpreter.mainobj = mainobj interpreter.init_instance(mainobj) - var initprop = mainmodule.try_get_primitive_method("init", sys_type) + var initprop = mainmodule.try_get_primitive_method("init", sys_type.mclass) if initprop != null then interpreter.send(initprop, [mainobj]) end interpreter.check_init_instance(mainobj) - var mainprop = mainmodule.try_get_primitive_method("main", sys_type) + var mainprop = mainmodule.try_get_primitive_method("main", sys_type.mclass) if mainprop != null then interpreter.send(mainprop, [mainobj]) end @@ -102,7 +102,8 @@ private class NaiveInterpreter fun force_get_primitive_method(name: String, recv: MType): MMethod do - return self.modelbuilder.force_get_primitive_method(self.frame.current_node, name, recv, self.mainmodule) + assert recv isa MClassType + return self.modelbuilder.force_get_primitive_method(self.frame.current_node, name, recv.mclass, self.mainmodule) end # Is a return executed? @@ -438,8 +439,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 @@ -465,7 +467,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 @@ -751,18 +752,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) @@ -825,6 +835,11 @@ redef class AInternMethPropdef mtype = mtype.arguments.first var val = new Array[Instance].filled_with(v.null_instance, args[1].to_i) return new PrimitiveInstance[Array[Instance]](v.mainmodule.get_primitive_class("NativeArray").get_mtype([mtype]), val) + else if pname == "native_argc" then + return v.int_instance(v.arguments.length) + else if pname == "native_argv" then + var txt = v.arguments[args[1].to_i] + return v.native_string_instance(txt) end fatal(v, "NOT YET IMPLEMENTED intern {mpropdef}") abort @@ -901,6 +916,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 @@ -911,6 +928,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) @@ -919,6 +954,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 @@ -968,8 +1006,7 @@ redef class AAttrPropdef return end var mtype = self.mpropdef.static_mtype.as(not null) - # TODO The needinit info is statically computed, move it to modelbuilder or whatever - mtype = mtype.resolve_for(self.mpropdef.mclassdef.bound_mtype, self.mpropdef.mclassdef.bound_mtype, self.mpropdef.mclassdef.mmodule, true) + mtype = mtype.anchor_to(v.mainmodule, recv.mtype.as(MClassType)) if mtype isa MNullableType then recv.attributes[self.mpropdef.mproperty] = v.null_instance end @@ -1553,7 +1590,6 @@ redef class ASuperExpr # stantard call-next-method var mpropdef = v.frame.mpropdef - # FIXME: we do not want an ugly static call! mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype) assert mpropdef isa MMethodDef var res = v.call(mpropdef, args)