X-Git-Url: http://nitlanguage.org diff --git a/src/modelize_property.nit b/src/modelize_property.nit index f36bd40..5a4ec42 100644 --- a/src/modelize_property.nit +++ b/src/modelize_property.nit @@ -48,6 +48,7 @@ redef class ModelBuilder var mclassdef = nclassdef.mclassdef.as(not null) if mclassdef.in_hierarchy == null then return # Skip error for superclassdef in mclassdef.in_hierarchy.direct_greaters do + if not mclassdef2nclassdef.has_key(superclassdef) then continue build_properties(mclassdef2nclassdef[superclassdef]) end @@ -55,10 +56,10 @@ redef class ModelBuilder npropdef.build_property(self, nclassdef) end for npropdef in nclassdef.n_propdefs do - npropdef.build_signature(self, nclassdef) + npropdef.build_signature(self) end for npropdef in nclassdef.n_propdefs do - npropdef.check_signature(self, nclassdef) + npropdef.check_signature(self) end process_default_constructors(nclassdef) end @@ -83,14 +84,14 @@ redef class ModelBuilder if not nclassdef isa AStdClassdef then return - var mmodule = nclassdef.mclassdef.mmodule + var mmodule = mclassdef.mmodule # Do we inherit for a constructor? var combine = new Array[MMethod] var inhc: nullable MClass = null for st in mclassdef.supertypes do var c = st.mclass if not c.kind.need_init then continue - st = st.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype) + st = st.anchor_to(mmodule, mclassdef.bound_mtype) var candidate = self.try_get_mproperty_by_name2(nclassdef, mmodule, st, "init").as(nullable MMethod) if candidate != null and candidate.intro.msignature.arity == 0 then combine.add(candidate) @@ -105,41 +106,49 @@ redef class ModelBuilder inhc = inhc2 end end + + # Collect undefined attributes + var mparameters = new Array[MParameter] + var anode: nullable ANode = null + for npropdef in nclassdef.n_propdefs do + if npropdef isa AAttrPropdef and npropdef.n_expr == null then + if npropdef.mpropdef == null then return # Skip broken attribute + var paramname = npropdef.mpropdef.mproperty.name.substring_from(1) + var ret_type = npropdef.mpropdef.static_mtype + if ret_type == null then return + var mparameter = new MParameter(paramname, ret_type, false) + mparameters.add(mparameter) + if anode == null then anode = npropdef + end + end + if anode == null then anode = nclassdef + if combine.is_empty and inhc != null then + if not mparameters.is_empty then + self.error(anode,"Error: {mclassdef} cannot inherit constructors from {inhc} because there is attributes without initial values: {mparameters.join(", ")}") + return + end + # TODO: actively inherit the consturctor self.toolcontext.info("{mclassdef} inherits all constructors from {inhc}", 3) mclassdef.mclass.inherit_init_from = inhc return end + if not combine.is_empty and inhc != null then self.error(nclassdef, "Error: Cannot provide a defaut constructor: conflict for {combine.join(", ")} and {inhc}") return end if not combine.is_empty then - nclassdef.super_inits = combine - var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility) - var mpropdef = new MMethodDef(mclassdef, mprop, nclassdef.location) - var mparameters = new Array[MParameter] - var msignature = new MSignature(mparameters, null) - mpropdef.msignature = msignature - mprop.is_init = true - nclassdef.mfree_init = mpropdef - self.toolcontext.info("{mclassdef} gets a free empty constructor {mpropdef}{msignature}", 3) - return - end - - # Collect undefined attributes - var mparameters = new Array[MParameter] - for npropdef in nclassdef.n_propdefs do - if npropdef isa AAttrPropdef and npropdef.n_expr == null then - if npropdef.mpropdef == null then return # Skip broken attribute - var paramname = npropdef.mpropdef.mproperty.name.substring_from(1) - var ret_type = npropdef.mpropdef.static_mtype - if ret_type == null then return - var mparameter = new MParameter(paramname, ret_type, false) - mparameters.add(mparameter) + if mparameters.is_empty and combine.length == 1 then + # No need to create a local init, the inherited one is enough + inhc = combine.first.intro_mclassdef.mclass + mclassdef.mclass.inherit_init_from = inhc + self.toolcontext.info("{mclassdef} inherits all constructors from {inhc}", 3) + return end + nclassdef.super_inits = combine end var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility) @@ -256,9 +265,9 @@ redef class APropdef var mpropdef: nullable MPROPDEF writable private fun build_property(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract - private fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract - private fun check_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract - private fun new_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility): MVisibility + private fun build_signature(modelbuilder: ModelBuilder) is abstract + private fun check_signature(modelbuilder: ModelBuilder) is abstract + private fun new_property_visibility(modelbuilder: ModelBuilder, mclassdef: MClassDef, nvisibility: nullable AVisibility): MVisibility do var mvisibility = public_visibility if nvisibility != null then @@ -268,7 +277,7 @@ redef class APropdef mvisibility = public_visibility end end - if nclassdef.mclassdef.mclass.visibility == private_visibility then + if mclassdef.mclass.visibility == private_visibility then if mvisibility == protected_visibility then assert nvisibility != null modelbuilder.error(nvisibility, "Error: The only legal visibility for properties in a private class is private.") @@ -285,10 +294,14 @@ redef class APropdef private fun set_doc(mpropdef: MPropDef) do var ndoc = self.n_doc - if ndoc != null then mpropdef.mdoc = ndoc.to_mdoc + if ndoc != null then + var mdoc = ndoc.to_mdoc + mpropdef.mdoc = mdoc + mdoc.original_mentity = mpropdef + end end - private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility, mprop: MProperty) + private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nvisibility: nullable AVisibility, mprop: MProperty) do if nvisibility == null then return var mvisibility = nvisibility.mvisibility @@ -335,15 +348,16 @@ redef class ASignature var ret_type: nullable MType = null # Visit and fill information about a signature - private fun visit_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef): Bool + private fun visit_signature(modelbuilder: ModelBuilder, mclassdef: MClassDef): Bool do + var mmodule = mclassdef.mmodule var param_names = self.param_names var param_types = self.param_types for np in self.n_params do param_names.add(np.n_id.text) var ntype = np.n_type if ntype != null then - var mtype = modelbuilder.resolve_mtype(nclassdef, ntype) + var mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) if mtype == null then return false # Skip error for i in [0..param_names.length-param_types.length[ do param_types.add(mtype) @@ -360,7 +374,7 @@ redef class ASignature end var ntype = self.n_type if ntype != null then - self.ret_type = modelbuilder.resolve_mtype(nclassdef, ntype) + self.ret_type = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) if self.ret_type == null then return false # Skip errir end @@ -369,7 +383,7 @@ redef class ASignature end # Build a visited signature - fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef): nullable MSignature + fun build_signature(modelbuilder: ModelBuilder): nullable MSignature do if param_names.length != param_types.length then # Some parameters are typed, other parameters are not typed. @@ -399,21 +413,23 @@ redef class AMethPropdef redef fun build_property(modelbuilder, nclassdef) do - var is_init = self isa AInitPropdef + var n_kwinit = n_kwinit + var n_kwnew = n_kwnew + var is_init = n_kwinit != null or n_kwnew != null var mclassdef = nclassdef.mclassdef.as(not null) var name: String var amethodid = self.n_methid var name_node: ANode if amethodid == null then - if self isa AMainMethPropdef then + if not is_init then name = "main" name_node = self - else if self isa AConcreteInitPropdef then + else if n_kwinit != null then name = "init" - name_node = self.n_kwinit.as(not null) - else if self isa AExternInitPropdef then + name_node = n_kwinit + else if n_kwnew != null then name = "init" - name_node = self.n_kwnew.as(not null) + name_node = n_kwnew else abort end @@ -433,10 +449,10 @@ redef class AMethPropdef var mprop: nullable MMethod = null if not is_init or n_kwredef != null then mprop = modelbuilder.try_get_mproperty_by_name(name_node, mclassdef, name).as(nullable MMethod) if mprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility) mprop = new MMethod(mclassdef, name, mvisibility) mprop.is_init = is_init - mprop.is_new = self isa AExternInitPropdef + mprop.is_new = n_kwnew != null if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mprop) then return else if n_kwredef == null then @@ -446,7 +462,7 @@ redef class AMethPropdef if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mprop) then return end end - check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop) + check_redef_property_visibility(modelbuilder, self.n_visibility, mprop) end nclassdef.mprop2npropdef[mprop] = self @@ -477,11 +493,12 @@ redef class AMethPropdef end end - redef fun build_signature(modelbuilder, nclassdef) + redef fun build_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var nsig = self.n_signature # Retrieve info from the signature AST @@ -490,7 +507,7 @@ redef class AMethPropdef var vararg_rank = -1 var ret_type: nullable MType = null # Return type from the AST if nsig != null then - if not nsig.visit_signature(modelbuilder, nclassdef) then return + if not nsig.visit_signature(modelbuilder, mclassdef) then return param_names = nsig.param_names param_types = nsig.param_types vararg_rank = nsig.vararg_rank @@ -513,8 +530,8 @@ redef class AMethPropdef end else if mpropdef.mproperty.is_init then # FIXME UGLY: inherit signature from a super-constructor - for msupertype in nclassdef.mclassdef.supertypes do - msupertype = msupertype.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype) + for msupertype in mclassdef.supertypes do + msupertype = msupertype.anchor_to(mmodule, mclassdef.bound_mtype) var candidate = modelbuilder.try_get_mproperty_by_name2(self, mmodule, msupertype, mpropdef.mproperty.name) if candidate != null then if msignature == null then @@ -555,13 +572,15 @@ redef class AMethPropdef mpropdef.msignature = msignature mpropdef.is_abstract = self isa ADeferredMethPropdef mpropdef.is_intern = self isa AInternMethPropdef + mpropdef.is_extern = self isa AExternPropdef end - redef fun check_signature(modelbuilder, nclassdef) + redef fun check_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var nsig = self.n_signature var mysignature = self.mpropdef.msignature if mysignature == null then return # Error thus skiped @@ -584,8 +603,8 @@ redef class AMethPropdef for i in [0..mysignature.arity[ do var myt = mysignature.mparameters[i].mtype var prt = msignature.mparameters[i].mtype - if not myt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, prt) or - not prt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, myt) then + if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) or + not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then modelbuilder.error(nsig.n_params[i], "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt} as in {mpropdef.mproperty.intro}.") end end @@ -594,7 +613,7 @@ redef class AMethPropdef if ret_type == null then # Inherit the return type ret_type = precursor_ret_type - else if not ret_type.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, precursor_ret_type) then + else if not ret_type.is_subtype(mmodule, mclassdef.bound_mtype, precursor_ret_type) then modelbuilder.error(nsig.n_type.as(not null), "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type} as in {mpropdef.mproperty.intro}.") end end @@ -644,12 +663,12 @@ redef class AAttrPropdef # Old attribute style var mprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, name) if mprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility) mprop = new MAttribute(mclassdef, name, mvisibility) if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return else assert mprop isa MAttribute - check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop) + check_redef_property_visibility(modelbuilder, self.n_visibility, mprop) if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return end nclassdef.mprop2npropdef[mprop] = self @@ -664,12 +683,12 @@ redef class AAttrPropdef var readname = name.substring_from(1) var mreadprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, readname).as(nullable MMethod) if mreadprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, nreadable.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, nreadable.n_visibility) mreadprop = new MMethod(mclassdef, readname, mvisibility) if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, false, mreadprop) then return else if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, true, mreadprop) then return - check_redef_property_visibility(modelbuilder, nclassdef, nreadable.n_visibility, mreadprop) + check_redef_property_visibility(modelbuilder, nreadable.n_visibility, mreadprop) end nclassdef.mprop2npropdef[mreadprop] = self @@ -684,12 +703,12 @@ redef class AAttrPropdef var writename = name.substring_from(1) + "=" var mwriteprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, writename).as(nullable MMethod) if mwriteprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, nwritable.n_visibility) mwriteprop = new MMethod(mclassdef, writename, mvisibility) if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, false, mwriteprop) then return else if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, true, mwriteprop) then return - check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop) + check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop) end nclassdef.mprop2npropdef[mwriteprop] = self @@ -710,12 +729,12 @@ redef class AAttrPropdef var readname = name var mreadprop = modelbuilder.try_get_mproperty_by_name(nid2, mclassdef, readname).as(nullable MMethod) if mreadprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility) mreadprop = new MMethod(mclassdef, readname, mvisibility) if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mreadprop) then return else if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mreadprop) then return - check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mreadprop) + check_redef_property_visibility(modelbuilder, self.n_visibility, mreadprop) end nclassdef.mprop2npropdef[mreadprop] = self @@ -732,7 +751,7 @@ redef class AAttrPropdef if mwriteprop == null then var mvisibility if nwritable != null then - mvisibility = new_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility) + mvisibility = new_property_visibility(modelbuilder, mclassdef, nwritable.n_visibility) else mvisibility = private_visibility end @@ -741,7 +760,7 @@ redef class AAttrPropdef else if not self.check_redef_keyword(modelbuilder, nclassdef, nwkwredef, true, mwriteprop) then return if nwritable != null then - check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop) + check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop) end end nclassdef.mprop2npropdef[mwriteprop] = self @@ -753,16 +772,17 @@ redef class AAttrPropdef end end - redef fun build_signature(modelbuilder, nclassdef) + redef fun build_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var mtype: nullable MType = null var ntype = self.n_type if ntype != null then - mtype = modelbuilder.resolve_mtype(nclassdef, ntype) + mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) if mtype == null then return end @@ -770,7 +790,7 @@ redef class AAttrPropdef if mtype == null then if nexpr != null then if nexpr isa ANewExpr then - mtype = modelbuilder.resolve_mtype(nclassdef, nexpr.n_type) + mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type) else if nexpr isa AIntExpr then var cla = modelbuilder.try_get_mclass_by_name(nexpr, mmodule, "Int") if cla != null then mtype = cla.mclass_type @@ -799,7 +819,7 @@ redef class AAttrPropdef else assert ntype != null if nexpr isa ANewExpr then - var xmtype = modelbuilder.resolve_mtype(nclassdef, nexpr.n_type) + var xmtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type) if xmtype == mtype and modelbuilder.toolcontext.opt_warn.value >= 2 then modelbuilder.warning(ntype, "Warning: useless type definition") end @@ -830,11 +850,12 @@ redef class AAttrPropdef end end - redef fun check_signature(modelbuilder, nclassdef) + redef fun check_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var ntype = self.n_type var mtype = self.mpropdef.static_mtype if mtype == null then return # Error thus skiped @@ -854,23 +875,24 @@ redef class AAttrPropdef # Check getter and setter var meth = self.mreadpropdef if meth != null then - self.check_method_signature(modelbuilder, nclassdef, meth) + self.check_method_signature(modelbuilder, meth) var node: nullable ANode = ntype if node == null then node = self modelbuilder.check_visibility(node, mtype, meth) end meth = self.mwritepropdef if meth != null then - self.check_method_signature(modelbuilder, nclassdef, meth) + self.check_method_signature(modelbuilder, meth) var node: nullable ANode = ntype if node == null then node = self modelbuilder.check_visibility(node, mtype, meth) end end - private fun check_method_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef, mpropdef: MMethodDef) + private fun check_method_signature(modelbuilder: ModelBuilder, mpropdef: MMethodDef) do - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var nsig = self.n_type var mysignature = mpropdef.msignature if mysignature == null then return # Error thus skiped @@ -901,8 +923,8 @@ redef class AAttrPropdef for i in [0..mysignature.arity[ do var myt = mysignature.mparameters[i].mtype var prt = msignature.mparameters[i].mtype - if not myt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, prt) and - not prt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, myt) then + if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) and + not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then var node: ANode if nsig != null then node = nsig else node = self modelbuilder.error(node, "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt}.") @@ -913,7 +935,7 @@ redef class AAttrPropdef if ret_type == null then # Inherit the return type ret_type = precursor_ret_type - else if not ret_type.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, precursor_ret_type) then + else if not ret_type.is_subtype(mmodule, mclassdef.bound_mtype, precursor_ret_type) then var node: ANode if nsig != null then node = nsig else node = self modelbuilder.error(node, "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type}.") @@ -932,7 +954,7 @@ redef class ATypePropdef var name = self.n_id.text var mprop = modelbuilder.try_get_mproperty_by_name(self.n_id, mclassdef, name) if mprop == null then - var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility) + var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility) mprop = new MVirtualTypeProp(mclassdef, name, mvisibility) for c in name.chars do if c >= 'a' and c<= 'z' then modelbuilder.warning(n_id, "Warning: lowercase in the virtual type {name}") @@ -942,31 +964,33 @@ redef class ATypePropdef else if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return assert mprop isa MVirtualTypeProp - check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop) + check_redef_property_visibility(modelbuilder, self.n_visibility, mprop) end nclassdef.mprop2npropdef[mprop] = self var mpropdef = new MVirtualTypeDef(mclassdef, mprop, self.location) self.mpropdef = mpropdef + modelbuilder.mpropdef2npropdef[mpropdef] = self set_doc(mpropdef) end - redef fun build_signature(modelbuilder, nclassdef) + redef fun build_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped - var mmodule = mpropdef.mclassdef.mmodule + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule var mtype: nullable MType = null var ntype = self.n_type - mtype = modelbuilder.resolve_mtype(nclassdef, ntype) + mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) if mtype == null then return mpropdef.bound = mtype # print "{mpropdef}: {mtype}" end - redef fun check_signature(modelbuilder, nclassdef) + redef fun check_signature(modelbuilder) do var mpropdef = self.mpropdef if mpropdef == null then return # Error thus skiped @@ -979,8 +1003,9 @@ redef class ATypePropdef # Fast case: the bound is not a formal type if not bound isa MVirtualType then return - var mmodule = nclassdef.mclassdef.mmodule - var anchor = nclassdef.mclassdef.bound_mtype + var mclassdef = mpropdef.mclassdef + var mmodule = mclassdef.mmodule + var anchor = mclassdef.bound_mtype # Slow case: progress on each resolution until: (i) we loop, or (ii) we found a non formal type var seen = [self.mpropdef.mproperty.mvirtualtype]