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
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?
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
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")
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
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
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
# 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
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
private fun fatal(v: NaiveInterpreter, message: String)
do
if v.modelbuilder.toolcontext.opt_no_color.value == true then
- print("Runtime error: {message} ({location.file.filename}:{location.line_start})")
+ stderr.write("Runtime error: {message} ({location.file.filename}:{location.line_start})\n")
else
- print("{location}: Runtime error: {message}\n{location.colored_line("0;31")}")
- print(v.stack_trace)
+ stderr.write("{location}: Runtime error: {message}\n{location.colored_line("0;31")}\n")
+ stderr.write(v.stack_trace)
+ stderr.write("\n")
end
exit(1)
end
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
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)
end
else if pname == "calloc_array" then
var recvtype = args.first.mtype.as(MClassType)
- var mtype: MType = recvtype.supertype_to(v.mainmodule, recvtype, v.mainmodule.get_primitive_class("ArrayCapable"))
- mtype = mtype.as(MGenericType).arguments.first
+ var mtype: MType
+ mtype = recvtype.supertype_to(v.mainmodule, recvtype, v.mainmodule.get_primitive_class("ArrayCapable"))
+ 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
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
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)
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
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
if i == null then return null
val.add(i)
end
- var mtype = v.unanchor_type(self.mtype.as(not null)).as(MGenericType)
+ var mtype = v.unanchor_type(self.mtype.as(not null)).as(MClassType)
var elttype = mtype.arguments.first
return v.array_instance(val, elttype)
end
# 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
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
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)
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)
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))
nitlanguage / nit.git / blobdiff