X-Git-Url: http://nitlanguage.org diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 8f2d95b..291f222 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -18,10 +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 @@ -63,7 +62,8 @@ redef class ModelBuilder if initprop != null then interpreter.send(initprop, [mainobj]) end - 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 @@ -406,6 +406,22 @@ private class NaiveInterpreter # 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 @@ -434,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 @@ -572,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 @@ -591,23 +621,24 @@ 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, arguments: 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 @@ -617,6 +648,11 @@ redef class AConcreteMethPropdef 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 @@ -626,16 +662,25 @@ redef class AConcreteMethPropdef 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) + 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 @@ -673,6 +718,7 @@ 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 == "+" then @@ -703,6 +749,19 @@ 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) @@ -745,8 +804,41 @@ 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 @@ -783,10 +875,32 @@ redef class AInternMethPropdef 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 @@ -802,71 +916,20 @@ redef class AInternMethPropdef 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) - else if pname == "strerror_ext" then - return v.native_string_instance(recvval.strerror) - 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) @@ -883,59 +946,18 @@ redef class AExternMethPropdef 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 == "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) - 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 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 @@ -965,54 +987,72 @@ redef class AExternMethPropdef else if pname == "address_is_null" then return v.false_instance end - fatal(v, "NOT YET IMPLEMENTED extern {mpropdef}") + 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 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, "Abstract method `{mpropdef.mproperty.name}` called on `{args.first.mtype}`") - 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 @@ -1020,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 @@ -1530,7 +1581,7 @@ 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) @@ -1547,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) @@ -1582,7 +1633,7 @@ redef class ASuperExpr if callsite != null then # Add additionnals arguments for the super init call if args.length == 1 then - for i in [0..callsite.mproperty.intro.msignature.arity[ do + for i in [0..callsite.msignature.arity[ do args.add(v.frame.arguments[i+1]) end end @@ -1644,8 +1695,7 @@ redef class AAttrAssignExpr 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 @@ -1661,8 +1711,7 @@ redef class AAttrReassignExpr var attr = v.read_attribute(mproperty, recv) 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 @@ -1673,8 +1722,7 @@ redef class AIssetAttrExpr if recv == null then return 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