X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 0c6c5ed..291f222 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -18,9 +18,9 @@ module naive_interpreter import literal -import typing -import auto_super_init -import frontend +import common_ffi +import semantize +private import parser::tables redef class ToolContext # --discover-call-trace @@ -62,8 +62,8 @@ redef class ModelBuilder if initprop != null then interpreter.send(initprop, [mainobj]) end - interpreter.check_init_instance(mainobj) - var mainprop = mainmodule.try_get_primitive_method("main", sys_type.mclass) + var mainprop = mainmodule.try_get_primitive_method("run", sys_type.mclass) or else + mainmodule.try_get_primitive_method("main", sys_type.mclass) if mainprop != null then interpreter.send(mainprop, [mainobj]) end @@ -170,7 +170,7 @@ private class NaiveInterpreter 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") + if not self.is_subtype(i.mtype, mtype) then n.fatal(self, "Cast failed. Expected `{implicit_cast_to}`, got `{i.mtype}`") end #n.debug("OUT Execute expr: value is {i}") @@ -243,14 +243,13 @@ private class NaiveInterpreter var res = new MutableInstance(mtype) self.init_instance(res) self.send(self.force_get_primitive_method("with_native", mtype), [res, nat, self.int_instance(values.length)]) - self.check_init_instance(res) return res end # 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) @@ -265,7 +264,7 @@ private class NaiveInterpreter # 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") @@ -298,10 +297,8 @@ private class NaiveInterpreter # Store known method, used to trace methods as thez are reached var discover_call_trace: Set[MMethodDef] = new HashSet[MMethodDef] - # Execute `mpropdef` for a `args` (where `args[0]` is the receiver). - # Return a falue if `mpropdef` is a function, or null if it is a procedure. - # The call is direct/static. There is no message-seding/late-binding. - fun call(mpropdef: MMethodDef, args: Array[Instance]): nullable Instance + # Common code for calls to injected methods and normal methods + fun call_commons(mpropdef: MMethodDef, args: Array[Instance]): Array[Instance] do var vararg_rank = mpropdef.msignature.vararg_rank if vararg_rank >= 0 then @@ -328,6 +325,15 @@ private class NaiveInterpreter args.add(rawargs[i+1]) end end + return args + end + + # Execute `mpropdef` for a `args` (where `args[0]` is the receiver). + # Return a falue if `mpropdef` is a function, or null if it is a procedure. + # The call is direct/static. There is no message-seding/late-binding. + fun call(mpropdef: MMethodDef, args: Array[Instance]): nullable Instance + do + args = call_commons(mpropdef, args) return call_without_varargs(mpropdef, args) end @@ -341,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 @@ -376,30 +380,60 @@ private class NaiveInterpreter # 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") + var amtype = mtype.anchor_to(self.mainmodule, anchor) + if not args[i+1].mtype.is_subtype(self.mainmodule, anchor, amtype) then + node.fatal(self, "Cast failed. Expected `{mtype}`, got `{args[i+1].mtype}`") end end 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]). - fun send(mproperty: MMethod, args: Array[Instance]): nullable Instance + # Common code for runtime injected calls and normal calls + fun send_commons(mproperty: MMethod, args: Array[Instance], mtype: MType): nullable Instance do - var recv = args.first - var mtype = recv.mtype if mtype isa MNullType then if mproperty.name == "==" then return self.bool_instance(args[0] == args[1]) 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") - abort + #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 + var initializers = callsite.mpropdef.initializers + if not initializers.is_empty then + assert initializers.length == arguments.length - 1 else debug("expected {initializers.length} got {arguments.length - 1}") + var recv = arguments.first + var i = 1 + for p in initializers do + if p isa MMethod then + self.send(p, [recv, arguments[i]]) + else if p isa MAttribute then + assert recv isa MutableInstance + recv.attributes[p] = arguments[i] + else abort + i += 1 + end + return send(callsite.mproperty, [recv]) + end + 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]). + fun send(mproperty: MMethod, args: Array[Instance]): nullable Instance + do + var recv = args.first + var mtype = recv.mtype + var ret = send_commons(mproperty, args, mtype) + if ret != null then return ret var propdef = mproperty.lookup_first_definition(self.mainmodule, mtype) return self.call(propdef, args) end @@ -416,6 +450,20 @@ private class NaiveInterpreter return recv.attributes[mproperty] end + # Replace in `recv` the value of the attribute `mproperty` by `value` + fun write_attribute(mproperty: MAttribute, recv: Instance, value: Instance) + do + assert recv isa MutableInstance + recv.attributes[mproperty] = value + end + + # Is the attribute `mproperty` initialized the instance `recv`? + fun isset_attribute(mproperty: MAttribute, recv: Instance): Bool + do + assert recv isa MutableInstance + return recv.attributes.has_key(mproperty) + end + # Collect attributes of a type in the order of their init fun collect_attr_propdef(mtype: MType): Array[AAttrPropdef] do @@ -449,19 +497,6 @@ private class NaiveInterpreter end end - # Check that non nullable attributes of `recv` are correctly initialized. - # This function is used as the last instruction of a new - fun check_init_instance(recv: Instance) - do - if not recv isa MutableInstance then return - for npropdef in collect_attr_propdef(recv.mtype) do - if npropdef.n_expr == null then - # Force read to check the initialization - self.read_attribute(npropdef.mpropdef.mproperty, recv) - end - end - end - # This function determine the correct type according the reciever of the current definition (self). fun unanchor_type(mtype: MType): MType do @@ -481,7 +516,7 @@ abstract class Instance fun is_true: Bool do abort # Return true if `self` IS `o` (using the Nit semantic of is) - fun eq_is(o: Instance): Bool do return self is o + fun eq_is(o: Instance): Bool do return self.is_same_instance(o) # Human readable object identity "Type#number" redef fun to_s do return "{mtype}" @@ -537,7 +572,7 @@ class PrimitiveInstance[E: Object] redef fun eq_is(o) do if not o isa PrimitiveInstance[Object] then return false - return self.val is o.val + return self.val.is_same_instance(o.val) end redef fun to_s do return "{mtype}#{val.object_id}({val})" @@ -567,11 +602,11 @@ redef class ANode private fun fatal(v: NaiveInterpreter, message: String) do if v.modelbuilder.toolcontext.opt_no_color.value == true then - stderr.write("Runtime error: {message} ({location.file.filename}:{location.line_start})\n") + sys.stderr.write("Runtime error: {message} ({location.file.filename}:{location.line_start})\n") else - stderr.write("{location}: Runtime error: {message}\n{location.colored_line("0;31")}\n") - stderr.write(v.stack_trace) - stderr.write("\n") + sys.stderr.write("{location}: Runtime error: {message}\n{location.colored_line("0;31")}\n") + sys.stderr.write(v.stack_trace) + sys.stderr.write("\n") end exit(1) end @@ -586,45 +621,66 @@ redef class APropdef end end -redef class AConcreteMethPropdef +redef class AMethPropdef + super TablesCapable + redef fun call(v, mpropdef, args) do var f = new Frame(self, self.mpropdef.as(not null), args) + var res = call_commons(v, mpropdef, args, f) + v.frames.shift + if v.returnmark == f then + v.returnmark = null + res = v.escapevalue + v.escapevalue = null + return res + end + return res + end + + private fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame): nullable Instance + 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) + if mpropdef.is_abstract then + v.fatal("Abstract method `{mpropdef.mproperty.name}` called on `{arguments.first.mtype}`") + abort + end + # 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 + assert auto_super_init.mproperty != mpropdef.mproperty + v.callsite(auto_super_init, args) end end + if auto_super_call then + # standard call-next-method + var superpd = mpropdef.lookup_next_definition(v.mainmodule, arguments.first.mtype) + v.call_without_varargs(superpd, arguments) + end - v.stmt(self.n_block) - v.frames.shift - if v.returnmark == f then - v.returnmark = null - var res = v.escapevalue - v.escapevalue = null - return res + if n_block != null then + v.stmt(self.n_block) + return null + else + return intern_call(v, mpropdef, arguments) end - return null end -end -redef class AInternMethPropdef - redef fun call(v, mpropdef, args) + private fun intern_call(v: NaiveInterpreter, mpropdef: MMethodDef, args: Array[Instance]): nullable Instance do var pname = mpropdef.mproperty.name var cname = mpropdef.mclassdef.mclass.name @@ -654,18 +710,17 @@ redef class AInternMethPropdef return v.bool_instance(args[0] != args[1]) else if pname == "is_same_type" then return v.bool_instance(args[0].mtype == args[1].mtype) + else if pname == "is_same_instance" then + return v.bool_instance(args[1] != null and args[0].eq_is(args[1])) else if pname == "exit" then exit(args[1].to_i) abort else if pname == "sys" then return v.mainobj else if cname == "Int" then + var recvval = args[0].to_i if pname == "unary -" then return v.int_instance(-args[0].to_i) - else if pname == "succ" then - return v.int_instance(args[0].to_i + 1) - else if pname == "prec" then - return v.int_instance(args[0].to_i - 1) else if pname == "+" then return v.int_instance(args[0].to_i + args[1].to_i) else if pname == "-" then @@ -694,15 +749,28 @@ redef class AInternMethPropdef return v.int_instance(args[0].to_i.lshift(args[1].to_i)) else if pname == "rshift" then return v.int_instance(args[0].to_i.rshift(args[1].to_i)) + else if pname == "rand" then + var res = recvval.rand + return v.int_instance(res) + else if pname == "bin_and" then + return v.int_instance(args[0].to_i.bin_and(args[1].to_i)) + else if pname == "bin_or" then + return v.int_instance(args[0].to_i.bin_or(args[1].to_i)) + else if pname == "bin_xor" then + return v.int_instance(args[0].to_i.bin_xor(args[1].to_i)) + else if pname == "native_int_to_s" then + return v.native_string_instance(recvval.to_s) + else if pname == "strerror_ext" then + return v.native_string_instance(recvval.strerror) end else if cname == "Char" then var recv = args[0].val.as(Char) if pname == "ascii" then return v.int_instance(recv.ascii) - else if pname == "succ" then - return v.char_instance(recv.succ) - else if pname == "prec" then - return v.char_instance(recv.prec) + else if pname == "successor" then + return v.char_instance(recv.successor(args[1].to_i)) + else if pname == "predecessor" then + return v.char_instance(recv.predecessor(args[1].to_i)) else if pname == "<" then return v.bool_instance(recv < args[1].val.as(Char)) else if pname == ">" then @@ -736,25 +804,58 @@ redef class AInternMethPropdef return v.bool_instance(recv >= args[1].to_f) else if pname == "to_i" then return v.int_instance(recv.to_i) + else if pname == "cos" 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) + else if pname == "abs" then + return v.float_instance(args[0].to_f.abs) + else if pname == "hypot_with" then + return v.float_instance(args[0].to_f.hypot_with(args[1].to_f)) + else if pname == "is_nan" then + return v.bool_instance(args[0].to_f.is_nan) + else if pname == "is_inf_extern" then + return v.bool_instance(args[0].to_f.is_inf != 0) end else if cname == "NativeString" then + if pname == "init" then + return v.native_string_instance("!" * args[1].to_i) + end var recvval = args.first.val.as(Buffer) if pname == "[]" then var arg1 = args[1].to_i if arg1 >= recvval.length or arg1 < 0 then debug("Illegal access on {recvval} for element {arg1}/{recvval.length}") end - return v.char_instance(recvval[arg1]) + return v.char_instance(recvval.chars[arg1]) else if pname == "[]=" then var arg1 = args[1].to_i if arg1 >= recvval.length or arg1 < 0 then debug("Illegal access on {recvval} for element {arg1}/{recvval.length}") end - recvval[arg1] = args[2].val.as(Char) + recvval.chars[arg1] = args[2].val.as(Char) 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 @@ -770,14 +871,36 @@ redef class AInternMethPropdef 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) + else if pname == "file_exists" then + return v.bool_instance(recvval.to_s.file_exists) + else if pname == "file_mkdir" then + recvval.to_s.mkdir + return null + else if pname == "file_chdir" then + recvval.to_s.chdir + return null + else if pname == "file_realpath" then + return v.native_string_instance(recvval.to_s.realpath) + else if pname == "get_environ" then + var txt = recvval.to_s.environ + return v.native_string_instance(txt) + 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 pname == "calloc_string" then return v.native_string_instance("!" * args[1].to_i) else if cname == "NativeArray" then + if pname == "init" then + var val = new Array[Instance].filled_with(v.null_instance, args[1].to_i) + return new PrimitiveInstance[Array[Instance]](args[0].mtype, val) + end var recvval = args.first.val.as(Array[Instance]) if pname == "[]" then if args[1].to_i >= recvval.length or args[1].to_i < 0 then @@ -787,134 +910,54 @@ redef class AInternMethPropdef else if pname == "[]=" then recvval[args[1].to_i] = args[2] return null + else if pname == "length" then + return v.int_instance(recvval.length) else if pname == "copy_to" then recvval.copy(0, args[2].to_i, args[1].val.as(Array[Instance]), 0) return null end - else if pname == "calloc_array" then - var recvtype = args.first.mtype.as(MClassType) - 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 - end -end - -redef class AbstractArray[E] - fun copy(start: Int, len: Int, dest: AbstractArray[E], new_start: Int) - do - self.copy_to(start, len, dest, new_start) - end -end - -redef class AExternInitPropdef - redef fun call(v, mpropdef, args) - do - var pname = mpropdef.mproperty.name - var cname = mpropdef.mclassdef.mclass.name - if pname == "native_stdout" then - return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, stdout) - else if pname == "native_stdin" then - return new PrimitiveInstance[IStream](mpropdef.mclassdef.mclass.mclass_type, stdin) - else if pname == "native_stderr" then - return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, stderr) - else if pname == "io_open_read" then - var a1 = args[1].val.as(Buffer) - return new PrimitiveInstance[IStream](mpropdef.mclassdef.mclass.mclass_type, new IFStream.open(a1.to_s)) - else if pname == "io_open_write" then - var a1 = args[1].val.as(Buffer) - return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, new OFStream.open(a1.to_s)) - end - fatal(v, "NOT YET IMPLEMENTED extern init {mpropdef}") - abort - end -end - -redef class AExternMethPropdef - super TablesCapable - redef fun call(v, mpropdef, args) - do - var pname = mpropdef.mproperty.name - var cname = mpropdef.mclassdef.mclass.name - if cname == "Int" then - var recvval = args.first.val.as(Int) - if pname == "rand" then - var res = recvval.rand - return v.int_instance(res) - else if pname == "native_int_to_s" then - return v.native_string_instance(recvval.to_s) - end else if cname == "NativeFile" then + if pname == "native_stdout" then + return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, sys.stdout) + else if pname == "native_stdin" then + return new PrimitiveInstance[IStream](mpropdef.mclassdef.mclass.mclass_type, sys.stdin) + else if pname == "native_stderr" then + return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, sys.stderr) + else if pname == "io_open_read" then + var a1 = args[1].val.as(Buffer) + return new PrimitiveInstance[IStream](mpropdef.mclassdef.mclass.mclass_type, new IFStream.open(a1.to_s)) + else if pname == "io_open_write" then + var a1 = args[1].val.as(Buffer) + return new PrimitiveInstance[OStream](mpropdef.mclassdef.mclass.mclass_type, new OFStream.open(a1.to_s)) + end 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 return v.int_instance(0) + else if pname == "address_is_null" then + return v.false_instance end - else if cname == "NativeString" then - var recvval = args.first.val.as(Buffer) - if pname == "file_exists" then - return v.bool_instance(recvval.to_s.file_exists) - else if pname == "file_mkdir" then - recvval.to_s.mkdir - return null - else if pname == "file_chdir" then - recvval.to_s.chdir - return null - else if pname == "get_environ" then - var txt = recvval.to_s.environ - return v.native_string_instance(txt) - 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.int_instance(args[0].to_i.rand) - end - else if cname == "Float" then - if pname == "cos" 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 == "calloc_array" then + var recvtype = args.first.mtype.as(MClassType) + 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) else if pname == "native_argc" then return v.int_instance(v.arguments.length) else if pname == "native_argv" then @@ -939,55 +982,77 @@ redef class AExternMethPropdef return v.int_instance(parser_action(args[1].to_i, args[2].to_i)) else if pname == "file_getcwd" then return v.native_string_instance(getcwd) + else if pname == "errno" then + return v.int_instance(sys.errno) + else if pname == "address_is_null" then + return v.false_instance + end + if mpropdef.is_intern then + fatal(v, "NOT YET IMPLEMENTED intern {mpropdef}") + else if mpropdef.is_extern then + fatal(v, "NOT YET IMPLEMENTED extern {mpropdef}") + else + fatal(v, "NOT YET IMPLEMENTED {mpropdef}") end - fatal(v, "NOT YET IMPLEMENTED extern {mpropdef}") abort end end +redef class AbstractArray[E] + fun copy(start: Int, len: Int, dest: AbstractArray[E], new_start: Int) + do + self.copy_to(start, len, dest, new_start) + end +end + redef class AAttrPropdef redef fun call(v, mpropdef, args) do var recv = args.first assert recv isa MutableInstance var attr = self.mpropdef.mproperty - if args.length == 1 then - return v.read_attribute(attr, recv) - else + if mpropdef == mreadpropdef then + assert args.length == 1 + if not is_lazy or v.isset_attribute(attr, recv) then return v.read_attribute(attr, recv) + return evaluate_expr(v, recv) + else if mpropdef == mwritepropdef then assert args.length == 2 - recv.attributes[attr] = args[1] + v.write_attribute(attr, recv, args[1]) return null + else + abort end end # Evaluate and set the default value of the attribute in `recv` private fun init_expr(v: NaiveInterpreter, recv: Instance) do - assert recv isa MutableInstance + if is_lazy then return var nexpr = self.n_expr if nexpr != null then - var f = new Frame(self, self.mpropdef.as(not null), [recv]) - v.frames.unshift(f) - var val = v.expr(nexpr) - assert val != null - v.frames.shift - assert not v.is_escaping - recv.attributes[self.mpropdef.mproperty] = val + evaluate_expr(v, recv) return end var mtype = self.mpropdef.static_mtype.as(not null) mtype = mtype.anchor_to(v.mainmodule, recv.mtype.as(MClassType)) if mtype isa MNullableType then - recv.attributes[self.mpropdef.mproperty] = v.null_instance + v.write_attribute(self.mpropdef.mproperty, recv, v.null_instance) end end -end -redef class ADeferredMethPropdef - redef fun call(v, mpropdef, args) + private fun evaluate_expr(v: NaiveInterpreter, recv: Instance): Instance do - fatal(v, "Deferred method called") - abort + assert recv isa MutableInstance + var nexpr = self.n_expr + assert nexpr != null + var f = new Frame(self, self.mpropdef.as(not null), [recv]) + v.frames.unshift(f) + var val = v.expr(nexpr) + assert val != null + v.frames.shift + assert not v.is_escaping + v.write_attribute(self.mpropdef.mproperty, recv, val) + return val end end @@ -995,21 +1060,32 @@ redef class AClassdef # Execute an implicit `mpropdef` associated with the current node. private fun call(v: NaiveInterpreter, mpropdef: MMethodDef, args: Array[Instance]): nullable Instance do + if mpropdef.mproperty.is_root_init then + assert self.super_inits == null + assert args.length == 1 + if not mpropdef.is_intro then + # standard call-next-method + var superpd = mpropdef.lookup_next_definition(v.mainmodule, args.first.mtype) + v.call_without_varargs(superpd, args) + end + return null + end + var super_inits = self.super_inits if super_inits != null then - assert args.length == 1 + var args_of_super = args + if args.length > 1 then args_of_super = [args.first] for su in super_inits do - v.send(su, args) + v.send(su, args_of_super) end - return null end var recv = args.first assert recv isa MutableInstance var i = 1 # Collect undefined attributes for npropdef in self.n_propdefs do - if npropdef isa AAttrPropdef and npropdef.n_expr == null then - recv.attributes[npropdef.mpropdef.mproperty] = args[i] + if npropdef isa AAttrPropdef and not npropdef.noinit and npropdef.n_expr == null then + v.write_attribute(npropdef.mpropdef.mproperty, recv, args[i]) i += 1 end end @@ -1094,7 +1170,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_property.mproperty, [vari, value]) + var res = v.callsite(reassign_callsite, [vari, value]) assert res != null v.frame.map[self.variable.as(not null)] = res end @@ -1231,20 +1307,22 @@ 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) + var iter = v.callsite(method_iterator, [col]).as(not null) #self.debug("iter {iter}") loop - var isok = v.send(v.force_get_primitive_method("is_ok", iter.mtype), [iter]).as(not null) + var isok = v.callsite(method_is_ok, [iter]).as(not null) if not isok.is_true then return if self.variables.length == 1 then - var item = v.send(v.force_get_primitive_method("item", iter.mtype), [iter]).as(not null) + var item = v.callsite(method_item, [iter]).as(not null) #self.debug("item {item}") v.frame.map[self.variables.first] = item else if self.variables.length == 2 then - var key = v.send(v.force_get_primitive_method("key", iter.mtype), [iter]).as(not null) + var key = v.callsite(method_key, [iter]).as(not null) v.frame.map[self.variables[0]] = key - var item = v.send(v.force_get_primitive_method("item", iter.mtype), [iter]).as(not null) + var item = v.callsite(method_item, [iter]).as(not null) v.frame.map[self.variables[1]] = item else abort @@ -1253,7 +1331,7 @@ redef class AForExpr if v.is_break(self.escapemark) then return v.is_continue(self.escapemark) # Clear the break if v.is_escaping then return - v.send(v.force_get_primitive_method("next", iter.mtype), [iter]) + v.callsite(method_next, [iter]) end end end @@ -1326,17 +1404,6 @@ redef class AOrElseExpr end end -redef class AEeExpr - redef fun expr(v) - do - var i = v.expr(self.n_expr) - if i == null then return null - var i2 = v.expr(self.n_expr2) - if i2 == null then return null - return v.bool_instance(i.eq_is(i2)) - end -end - redef class AIntExpr redef fun expr(v) do @@ -1409,8 +1476,7 @@ redef class ACrangeExpr var mtype = v.unanchor_type(self.mtype.as(not null)) var res = new MutableInstance(mtype) v.init_instance(res) - v.send(v.force_get_primitive_method("init", mtype), [res, e1, e2]) - v.check_init_instance(res) + v.callsite(init_callsite, [res, e1, e2]) return res end end @@ -1425,8 +1491,7 @@ redef class AOrangeExpr var mtype = v.unanchor_type(self.mtype.as(not null)) var res = new MutableInstance(mtype) v.init_instance(res) - v.send(v.force_get_primitive_method("without_last", mtype), [res, e1, e2]) - v.check_init_instance(res) + v.callsite(init_callsite, [res, e1, e2]) return res end end @@ -1467,10 +1532,10 @@ redef class AAsCastExpr do var i = v.expr(self.n_expr) if i == null then return null - var mtype = v.unanchor_type(self.mtype.as(not null)) - if not v.is_subtype(i.mtype, mtype) then - #fatal(v, "Cast failed expected {mtype}, got {i}") - fatal(v, "Cast failed") + var mtype = self.mtype.as(not null) + var amtype = v.unanchor_type(mtype) + if not v.is_subtype(i.mtype, amtype) then + fatal(v, "Cast failed. Expected `{amtype}`, got `{i.mtype}`") end return i end @@ -1516,14 +1581,13 @@ redef class ASendExpr var recv = v.expr(self.n_expr) if recv == null then return null var args = [recv] - for a in self.raw_arguments.as(not null) do + for a in self.raw_arguments do var i = v.expr(a) if i == null then return null args.add(i) end - var mproperty = self.mproperty.as(not null) - var res = v.send(mproperty, args) + var res = v.callsite(callsite, args) return res end end @@ -1534,7 +1598,7 @@ redef class ASendReassignFormExpr var recv = v.expr(self.n_expr) if recv == null then return var args = [recv] - for a in self.raw_arguments.as(not null) do + for a in self.raw_arguments do var i = v.expr(a) if i == null then return args.add(i) @@ -1542,16 +1606,15 @@ redef class ASendReassignFormExpr var value = v.expr(self.n_value) if value == null then return - var mproperty = self.mproperty.as(not null) - var read = v.send(mproperty, args) + var read = v.callsite(callsite, args) assert read != null - var write = v.send(self.reassign_property.mproperty, [read, value]) + var write = v.callsite(reassign_callsite, [read, value]) assert write != null args.add(write) - v.send(self.write_mproperty.as(not null), args) + v.callsite(write_callsite, args) end end @@ -1565,24 +1628,27 @@ redef class ASuperExpr if i == null then return null args.add(i) end - if args.length == 1 then - args = v.frame.arguments - end - var mproperty = self.mproperty - if mproperty != null then - if mproperty.intro.msignature.arity == 0 then - args = [recv] + var callsite = self.callsite + if callsite != null then + # Add additionnals arguments for the super init call + if args.length == 1 then + for i in [0..callsite.msignature.arity[ do + args.add(v.frame.arguments[i+1]) + end end # Super init call - var res = v.send(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 + var mpropdef = self.mpropdef mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype) - assert mpropdef isa MMethodDef var res = v.call_without_varargs(mpropdef, args) return res end @@ -1600,13 +1666,11 @@ redef class ANewExpr if i == null then return null args.add(i) end - var mproperty = self.mproperty.as(not null) - var res2 = v.send(mproperty, args) + var res2 = v.callsite(callsite, args) if res2 != null then #self.debug("got {res2} from {mproperty}. drop {recv}") return res2 end - v.check_init_instance(recv) return recv end end @@ -1616,7 +1680,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 @@ -1627,12 +1691,11 @@ 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) - assert recv isa MutableInstance - recv.attributes[mproperty] = i + v.write_attribute(mproperty, recv, i) end end @@ -1641,15 +1704,14 @@ 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_property.mproperty, [attr, value]) + var res = v.callsite(reassign_callsite, [attr, value]) assert res != null - assert recv isa MutableInstance - recv.attributes[mproperty] = res + v.write_attribute(mproperty, recv, res) end end @@ -1658,10 +1720,9 @@ 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)) + return v.bool_instance(v.isset_attribute(mproperty, recv)) end end