From 1d288bc7de56ec27aaa6a47d5540a168ca56c944 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 1 May 2014 13:42:46 -0400 Subject: [PATCH] src: remove remaining references of subclasses on AMethPropdef Only some references of AExternPropdef remain for the moment. Signed-off-by: Jean Privat --- src/abstract_compiler.nit | 51 +++++---- src/compiler_ffi.nit | 13 +-- src/naive_interpreter.nit | 248 ++++++++++++++++++++----------------------- src/rapid_type_analysis.nit | 21 ++-- 4 files changed, 155 insertions(+), 178 deletions(-) diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index 7d10d12..e5cba5c 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -1545,6 +1545,7 @@ redef class MMethodDef # Can the body be inlined? fun can_inline(v: VISITOR): Bool do + if is_abstract then return true var modelbuilder = v.compiler.modelbuilder if modelbuilder.mpropdef2npropdef.has_key(self) then var npropdef = modelbuilder.mpropdef2npropdef[self] @@ -1617,13 +1618,16 @@ redef class APropdef fun can_inline: Bool do return true end -redef class AConcreteMethPropdef +redef class AMethPropdef redef fun compile_to_c(v, mpropdef, arguments) do - for i in [0..mpropdef.msignature.arity[ do - var variable = self.n_signature.n_params[i].variable.as(not null) - v.assign(v.variable(variable), arguments[i+1]) + if mpropdef.is_abstract then + var cn = v.class_name_string(arguments.first) + v.add("fprintf(stderr, \"Runtime error: Abstract method `%s` called on `%s`\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});") + v.add_raw_abort + return end + # Call the implicit super-init var auto_super_inits = self.auto_super_inits if auto_super_inits != null then @@ -1636,7 +1640,23 @@ redef class AConcreteMethPropdef v.compile_callsite(auto_super_init, args) end end - v.stmt(self.n_block) + + var n_block = n_block + if n_block != null then + for i in [0..mpropdef.msignature.arity[ do + var variable = self.n_signature.n_params[i].variable.as(not null) + v.assign(v.variable(variable), arguments[i+1]) + end + v.stmt(n_block) + else if mpropdef.is_intern then + compile_intern_to_c(v, mpropdef, arguments) + else if mpropdef.is_extern then + if mpropdef.mproperty.is_init then + compile_externinit_to_c(v, mpropdef, arguments) + else + compile_externmeth_to_c(v, mpropdef, arguments) + end + end end redef fun can_inline @@ -1648,10 +1668,8 @@ redef class AConcreteMethPropdef if nblock isa ABlockExpr and nblock.n_expr.length == 0 then return true return false end -end -redef class AInternMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_intern_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var pname = mpropdef.mproperty.name var cname = mpropdef.mclassdef.mclass.name @@ -1884,10 +1902,8 @@ redef class AInternMethPropdef v.add("printf(\"NOT YET IMPLEMENTED {class_name}:{mpropdef} at {location.to_s}\\n\");") debug("Not implemented {mpropdef}") end -end -redef class AExternMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_externmeth_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var externname var nextern = self.n_extern @@ -1916,10 +1932,8 @@ redef class AExternMethPropdef v.ret(res) end end -end -redef class AExternInitPropdef - redef fun compile_to_c(v, mpropdef, arguments) + fun compile_externinit_to_c(v: AbstractCompilerVisitor, mpropdef: MMethodDef, arguments: Array[RuntimeVariable]) do var externname var nextern = self.n_extern @@ -2015,15 +2029,6 @@ redef class AClassdef end end -redef class ADeferredMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) do - var cn = v.class_name_string(arguments.first) - v.add("fprintf(stderr, \"Runtime error: Abstract method `%s` called on `%s`\", \"{mpropdef.mproperty.name.escape_to_c}\", {cn});") - v.add_raw_abort - end - redef fun can_inline do return true -end - redef class AExpr # Try to compile self as an expression # Do not call this method directly, use `v.expr` instead diff --git a/src/compiler_ffi.nit b/src/compiler_ffi.nit index 2583252..24eb876 100644 --- a/src/compiler_ffi.nit +++ b/src/compiler_ffi.nit @@ -79,7 +79,7 @@ redef class MModule end end -redef class AExternPropdef +redef class AMethPropdef fun compile_ffi_support_to_c(v: AbstractCompilerVisitor) do var mmodule = mpropdef.mclassdef.mmodule @@ -95,6 +95,8 @@ redef class AExternPropdef # FFI part compile_ffi_method(amodule) + assert self isa AExternPropdef + # nitni - Compile missing callbacks mmodule.ensure_compile_nitni_base(v) var ccu = mmodule.nitni_ccu.as(not null) @@ -124,10 +126,8 @@ redef class AExternPropdef # manage nitni callback set mmodule.foreign_callbacks.join(foreign_callbacks) end -end -redef class AExternMethPropdef - redef fun compile_to_c(v, mpropdef, arguments) + redef fun compile_externmeth_to_c(v, mpropdef, arguments) do var mmodule = mpropdef.mclassdef.mmodule var amodule = v.compiler.modelbuilder.mmodule2nmodule[mmodule] @@ -190,10 +190,8 @@ redef class AExternMethPropdef compile_ffi_support_to_c(v) end -end -redef class AExternInitPropdef - redef fun compile_to_c(v, mpropdef, arguments) + redef fun compile_externinit_to_c(v, mpropdef, arguments) do var mmodule = mpropdef.mclassdef.mmodule var amodule = v.compiler.modelbuilder.mmodule2nmodule[mmodule] @@ -206,7 +204,6 @@ redef class AExternInitPropdef end amodule.mmodule.uses_ffi = true - var mclass_type = mpropdef.mclassdef.bound_mtype var externname = mpropdef.mproperty.build_cname(mpropdef.mclassdef.bound_mtype, mmodule, "___impl", long_signature) diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 8f2d95b..510d0a0 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -591,23 +591,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 +618,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 @@ -630,12 +636,15 @@ redef class AConcreteMethPropdef 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 @@ -673,6 +682,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 +713,13 @@ 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) @@ -745,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) @@ -783,6 +830,24 @@ 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) @@ -802,71 +867,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, 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) @@ -883,59 +897,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,11 +938,24 @@ 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 @@ -1008,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 diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit index a40ca22..3d7ec38 100644 --- a/src/rapid_type_analysis.nit +++ b/src/rapid_type_analysis.nit @@ -203,6 +203,7 @@ class RapidTypeAnalysis while not todo.is_empty do var mmethoddef = todo.shift + var mmeth = mmethoddef.mproperty #print "# visit {mmethoddef}" var v = new RapidTypeVisitor(self, mmethoddef.mclassdef.bound_mtype, mmethoddef) @@ -220,7 +221,7 @@ class RapidTypeAnalysis for i in [0..mmethoddef.msignature.arity[ do - var origtype = mmethoddef.mproperty.intro.msignature.mparameters[i].mtype + var origtype = mmeth.intro.msignature.mparameters[i].mtype if not origtype.need_anchor then continue # skip non covariant stuff var paramtype = mmethoddef.msignature.mparameters[i].mtype #paramtype = v.cleanup_type(paramtype).as(not null) @@ -229,7 +230,7 @@ class RapidTypeAnalysis if not modelbuilder.mpropdef2npropdef.has_key(mmethoddef) then # It is an init for a class? - if mmethoddef.mproperty.name == "init" then + if mmeth.name == "init" then var nclassdef = self.modelbuilder.mclassdef2nclassdef[mmethoddef.mclassdef] var super_inits = nclassdef.super_inits if super_inits != null then @@ -247,27 +248,23 @@ class RapidTypeAnalysis var npropdef = modelbuilder.mpropdef2npropdef[mmethoddef] - if npropdef isa AConcreteMethPropdef then + if npropdef isa AMethPropdef then var auto_super_inits = npropdef.auto_super_inits if auto_super_inits != null then for auto_super_init in auto_super_inits do v.add_callsite(auto_super_init) end end - else if npropdef isa AInternMethPropdef or - (npropdef isa AExternMethPropdef and npropdef.n_extern != null) then + end + + if mmeth.is_new then + v.add_type(v.receiver) + else if mmethoddef.is_intern or mmethoddef.is_extern then # UGLY: We force the "instantation" of the concrete return type if any var ret = mmethoddef.msignature.return_mtype if ret != null and ret isa MClassType and ret.mclass.kind != abstract_kind and ret.mclass.kind != interface_kind then v.add_type(ret) end - else if npropdef isa AExternMethPropdef then - var nclassdef = npropdef.parent.as(AClassdef) - v.enter_visit(npropdef) - else if npropdef isa AExternInitPropdef then - v.add_type(v.receiver) - else - end v.enter_visit(npropdef) -- 1.7.9.5