X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 239167e..510d0a0 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -249,7 +249,7 @@ private class NaiveInterpreter # 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) @@ -264,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") @@ -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 @@ -404,6 +402,13 @@ private class NaiveInterpreter 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]). @@ -586,51 +591,60 @@ 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) - call_commons(v, mpropdef, args, f) + var res = call_commons(v, mpropdef, args, f) v.frames.shift if v.returnmark == f then v.returnmark = null - var res = v.escapevalue + res = v.escapevalue v.escapevalue = null return res end - return null + return res 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): 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 + v.callsite(auto_super_init, args) end end - v.stmt(self.n_block) + if n_block != null then + v.stmt(self.n_block) + return null + else + return intern_call(v, mpropdef, arguments) + end 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 @@ -668,12 +682,9 @@ redef class AInternMethPropdef 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 @@ -702,15 +713,22 @@ 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 == "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 @@ -744,6 +762,36 @@ 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 var recvval = args.first.val.as(Buffer) @@ -762,7 +810,7 @@ redef class AInternMethPropdef 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 @@ -778,10 +826,28 @@ 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) @@ -795,136 +861,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, 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 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 == "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 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 @@ -949,12 +933,29 @@ 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 @@ -993,14 +994,6 @@ redef class AAttrPropdef end end -redef class ADeferredMethPropdef - redef fun call(v, mpropdef, args) - do - fatal(v, "Abstract method `{mpropdef.mproperty.name}` called on `{args.first.mtype}`") - abort - end -end - redef class AClassdef # Execute an implicit `mpropdef` associated with the current node. private fun call(v: NaiveInterpreter, mpropdef: MMethodDef, args: Array[Instance]): nullable Instance @@ -1104,7 +1097,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 @@ -1244,19 +1237,19 @@ redef class AForExpr 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 @@ -1265,7 +1258,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 @@ -1410,7 +1403,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.callsite(init_callsite, [res, e1, e2]) return res end end @@ -1425,7 +1418,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.callsite(init_callsite, [res, e1, e2]) return res end end @@ -1521,7 +1514,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 @@ -1540,15 +1533,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 @@ -1562,24 +1555,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 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 + 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 @@ -1597,7 +1593,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 @@ -1641,7 +1637,7 @@ redef class AAttrReassignExpr 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