X-Git-Url: http://nitlanguage.org diff --git a/src/modelize_property.nit b/src/modelize_property.nit index 3563862..57e847b 100644 --- a/src/modelize_property.nit +++ b/src/modelize_property.nit @@ -18,6 +18,7 @@ module modelize_property import modelize_class +private import annotation redef class ToolContext var modelize_property_phase: Phase = new ModelizePropertyPhase(self, [modelize_class_phase]) @@ -67,6 +68,11 @@ redef class ModelBuilder process_default_constructors(nclassdef) end + # the root init of the Object class + # Is usually implicitly defined + # Then explicit or implicit definitions of root-init are attached to it + var the_root_init_mmethod: nullable MMethod + # Introduce or inherit default constructor # This is the last part of `build_properties`. private fun process_default_constructors(nclassdef: AClassdef) @@ -76,29 +82,60 @@ redef class ModelBuilder # Are we a refinement if not mclassdef.is_intro then return + var mmodule = nclassdef.mclassdef.mmodule + + # Look for the init in Object, or create it + if mclassdef.mclass.name == "Object" and the_root_init_mmethod == null then + # Create the implicit root-init method + var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility) + mprop.is_root_init = true + var mpropdef = new MMethodDef(mclassdef, mprop, nclassdef.location) + var mparameters = new Array[MParameter] + var msignature = new MSignature(mparameters, null) + mpropdef.msignature = msignature + mpropdef.new_msignature = msignature + mprop.is_init = true + nclassdef.mfree_init = mpropdef + self.toolcontext.info("{mclassdef} gets a free empty constructor {mpropdef}{msignature}", 3) + the_root_init_mmethod = mprop + return + end + # Is the class forbid constructors? if not mclassdef.mclass.kind.need_init then return # Is there already a constructor defined? + var defined_init: nullable MMethodDef = null for mpropdef in mclassdef.mpropdefs do if not mpropdef isa MMethodDef then continue - if mpropdef.mproperty.is_init then return + if not mpropdef.mproperty.is_init then continue + if mpropdef.mproperty.is_root_init then + assert defined_init == null + defined_init = mpropdef + else + # An explicit old-style init, so return + return + end end if not nclassdef isa AStdClassdef then return - 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 + # Do we inherit a old-style constructor? + var combine = new Array[MMethod] # old-style constructors without arguments + var inhc: nullable MClass = null # single super-class with a constructor with arguments + if defined_init == null then for st in mclassdef.supertypes do var c = st.mclass if not c.kind.need_init then continue 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) - continue + if candidate != null then + if candidate.is_root_init then continue + if candidate.intro.msignature != null then + if candidate.intro.msignature.arity == 0 then + combine.add(candidate) + continue + end + end end var inhc2 = c.inherit_init_from if inhc2 == null then inhc2 = c @@ -112,15 +149,33 @@ redef class ModelBuilder # Collect undefined attributes var mparameters = new Array[MParameter] + var initializers = new Array[MProperty] var anode: nullable ANode = null for npropdef in nclassdef.n_propdefs do - if npropdef isa AAttrPropdef and npropdef.n_expr == null then + if npropdef isa AAttrPropdef then if npropdef.mpropdef == null then return # Skip broken attribute + var at = npropdef.get_single_annotation("noinit", self) + if at != null then + npropdef.noinit = true + if npropdef.n_expr != null then + self.error(at, "Error: `noinit` attributes cannot have an initial value") + end + continue # Skip noinit attributes + end + if npropdef.n_expr != null then continue 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) + var msetter = npropdef.mwritepropdef + if msetter == null then + # No setter, it is a old-style attribute, so just add it + initializers.add(npropdef.mpropdef.mproperty) + else + # Add the setter to the list + initializers.add(msetter.mproperty) + end if anode == null then anode = npropdef end end @@ -134,15 +189,14 @@ redef class ModelBuilder # TODO: actively inherit the consturctor self.toolcontext.info("{mclassdef} inherits all constructors from {inhc}", 3) - mclassdef.mclass.inherit_init_from = inhc - return + #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 if mparameters.is_empty and combine.length == 1 then # No need to create a local init, the inherited one is enough @@ -152,13 +206,75 @@ redef class ModelBuilder return end nclassdef.super_inits = combine + var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility) + var mpropdef = new MMethodDef(mclassdef, mprop, nclassdef.location) + 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 + + if the_root_init_mmethod == null then return + + # Look for nost-specific new-stype init definitions + var spropdefs = the_root_init_mmethod.lookup_super_definitions(mclassdef.mmodule, mclassdef.bound_mtype) + if spropdefs.is_empty then + toolcontext.fatal_error(nclassdef.location, "Fatal error: {mclassdef} does not specialize {the_root_init_mmethod.intro_mclassdef}. Possible duplication of the root class `Object`?") + end + + # Search the longest-one and checks for conflict + var longest = spropdefs.first + if spropdefs.length > 1 then + # Check for conflict in the order of initializers + # Each initializer list must me a prefix of the longest list + # part 1. find the longest list + for spd in spropdefs do + if spd.initializers.length > longest.initializers.length then longest = spd + end + # part 2. compare + for spd in spropdefs do + var i = 0 + for p in spd.initializers do + if p != longest.initializers[i] then + self.error(nclassdef, "Error: conflict for inherited inits {spd}({spd.initializers.join(", ")}) and {longest}({longest.initializers.join(", ")})") + return + end + i += 1 + end + end + end + + # Can we just inherit? + if spropdefs.length == 1 and mparameters.is_empty and defined_init == null then + self.toolcontext.info("{mclassdef} inherits the basic constructor {longest}", 3) + return + end + + # Combine the inherited list to what is collected + if longest.initializers.length > 0 then + mparameters.prepend longest.new_msignature.mparameters + initializers.prepend longest.initializers + end + + # If we already have a basic init definition, then setup its initializers + if defined_init != null then + defined_init.initializers.add_all(initializers) + var msignature = new MSignature(mparameters, null) + defined_init.new_msignature = msignature + self.toolcontext.info("{mclassdef} extends its basic constructor signature to {defined_init}{msignature}", 3) + return end - var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility) + # Else create the local implicit basic init definition + var mprop = the_root_init_mmethod.as(not null) var mpropdef = new MMethodDef(mclassdef, mprop, nclassdef.location) + mpropdef.has_supercall = true + mpropdef.initializers.add_all(initializers) var msignature = new MSignature(mparameters, null) - mpropdef.msignature = msignature - mprop.is_init = true + mpropdef.new_msignature = msignature + mpropdef.msignature = new MSignature(new Array[MParameter], null) # always an empty real signature nclassdef.mfree_init = mpropdef self.toolcontext.info("{mclassdef} gets a free constructor for attributes {mpropdef}{msignature}", 3) end @@ -173,7 +289,7 @@ redef class ModelBuilder # It is a case-by case var vis_type: nullable MVisibility = null # The own visibility of the type var mmodule_type: nullable MModule = null # The origial module of the type - if mtype isa MNullableType then mtype = mtype.mtype + mtype = mtype.as_notnullable if mtype isa MClassType then vis_type = mtype.mclass.visibility mmodule_type = mtype.mclass.intro.mmodule @@ -201,7 +317,11 @@ redef class ModelBuilder # No error, try to go deeper in generic types if node isa AType then - for a in node.n_types do check_visibility(a, a.mtype.as(not null), mpropdef) + for a in node.n_types do + var t = a.mtype + if t == null then continue # Error, thus skipped + check_visibility(a, t, mpropdef) + end else if mtype isa MGenericType then for t in mtype.arguments do check_visibility(node, t, mpropdef) end @@ -421,6 +541,31 @@ end redef class AMethPropdef redef type MPROPDEF: MMethodDef + + # Can self be used as a root init? + private fun look_like_a_root_init(modelbuilder: ModelBuilder): Bool + do + # Need the `init` keyword + if n_kwinit == null then return false + # Need to by anonymous + if self.n_methid != null then return false + # No parameters + if self.n_signature.n_params.length > 0 then return false + # Cannot be private or something + if not self.n_visibility isa APublicVisibility then return false + # No annotation on itself + if get_single_annotation("old_style_init", modelbuilder) != null then return false + # Nor on its module + var amod = self.parent.parent.as(AModule) + var amoddecl = amod.n_moduledecl + if amoddecl != null then + var old = amoddecl.get_single_annotation("old_style_init", modelbuilder) + if old != null then return false + end + + return true + end + redef fun build_property(modelbuilder, mclassdef) do var n_kwinit = n_kwinit @@ -457,15 +602,22 @@ 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 and look_like_a_root_init(modelbuilder) then + mprop = modelbuilder.the_root_init_mmethod + end if mprop == null then var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility) mprop = new MMethod(mclassdef, name, mvisibility) + if look_like_a_root_init(modelbuilder) and modelbuilder.the_root_init_mmethod == null then + modelbuilder.the_root_init_mmethod = mprop + mprop.is_root_init = true + end mprop.is_init = is_init mprop.is_new = n_kwnew != null if parent isa ATopClassdef then mprop.is_toplevel = true if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mprop) then return else - if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, not self isa AMainMethPropdef, mprop) then return + if not mprop.is_root_init and not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, not self isa AMainMethPropdef, mprop) then return check_redef_property_visibility(modelbuilder, self.n_visibility, mprop) end mclassdef.mprop2npropdef[mprop] = self @@ -624,10 +776,23 @@ end redef class AAttrPropdef redef type MPROPDEF: MAttributeDef + # Is the node tagged `noinit`? + var noinit = false + + # Is the node taggeg lazy? + var is_lazy = false + + # The guard associated to a lasy attribute. + # Because some engines does not have a working `isset`, + # this additionnal attribute is used to guard the lazy initialization. + # TODO: to remove once isset is correctly implemented + var mlazypropdef: nullable MAttributeDef + # The associated getter (read accessor) if any var mreadpropdef: nullable MMethodDef writable # The associated setter (write accessor) if any var mwritepropdef: nullable MMethodDef writable + redef fun build_property(modelbuilder, mclassdef) do var mclass = mclassdef.mclass @@ -668,48 +833,13 @@ redef class AAttrPropdef set_doc(mpropdef) var nreadable = self.n_readable - if nreadable != null then - 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, mclassdef, nreadable.n_visibility) - mreadprop = new MMethod(mclassdef, readname, mvisibility) - if not self.check_redef_keyword(modelbuilder, mclassdef, nreadable.n_kwredef, false, mreadprop) then return - else - if not self.check_redef_keyword(modelbuilder, mclassdef, nreadable.n_kwredef, true, mreadprop) then return - check_redef_property_visibility(modelbuilder, nreadable.n_visibility, mreadprop) - end - mclassdef.mprop2npropdef[mreadprop] = self - - var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location) - self.mreadpropdef = mreadpropdef - modelbuilder.mpropdef2npropdef[mreadpropdef] = self - mreadpropdef.mdoc = mpropdef.mdoc - end - + if nreadable != null then modelbuilder.error(nreadable, "Error: old-style getter no more supported") var nwritable = self.n_writable - if nwritable != null then - 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, mclassdef, nwritable.n_visibility) - mwriteprop = new MMethod(mclassdef, writename, mvisibility) - if not self.check_redef_keyword(modelbuilder, mclassdef, nwritable.n_kwredef, false, mwriteprop) then return - else - if not self.check_redef_keyword(modelbuilder, mclassdef, nwritable.n_kwredef, true, mwriteprop) then return - check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop) - end - mclassdef.mprop2npropdef[mwriteprop] = self - - var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location) - self.mwritepropdef = mwritepropdef - modelbuilder.mpropdef2npropdef[mwritepropdef] = self - mwritepropdef.mdoc = mpropdef.mdoc - end + if nwritable != null then modelbuilder.error(nwritable, "Error: old-style setter no more supported") else # New attribute style var nid2 = self.n_id2.as(not null) - var mprop = new MAttribute(mclassdef, "@" + name, none_visibility) + var mprop = new MAttribute(mclassdef, "_" + name, private_visibility) var mpropdef = new MAttributeDef(mclassdef, mprop, self.location) self.mpropdef = mpropdef modelbuilder.mpropdef2npropdef[mpropdef] = self @@ -732,24 +862,55 @@ redef class AAttrPropdef modelbuilder.mpropdef2npropdef[mreadpropdef] = self mreadpropdef.mdoc = mpropdef.mdoc + var atlazy = self.get_single_annotation("lazy", modelbuilder) + if atlazy != null then + if n_expr == null then + modelbuilder.error(atlazy, "Error: a lazy attribute needs a value") + end + is_lazy = true + var mlazyprop = new MAttribute(mclassdef, "lazy _" + name, none_visibility) + var mlazypropdef = new MAttributeDef(mclassdef, mlazyprop, self.location) + self.mlazypropdef = mlazypropdef + end + + var atreadonly = self.get_single_annotation("readonly", modelbuilder) + if atreadonly != null then + if n_expr == null then + modelbuilder.error(atreadonly, "Error: a readonly attribute needs a value") + end + # No setter, so just leave + return + end + var writename = name + "=" var nwritable = self.n_writable + var atwritable = self.get_single_annotation("writable", modelbuilder) + if atwritable != null then + if not atwritable.n_args.is_empty then + writename = atwritable.arg_as_id(modelbuilder) or else writename + end + end var mwriteprop = modelbuilder.try_get_mproperty_by_name(nid2, mclassdef, writename).as(nullable MMethod) var nwkwredef: nullable Token = null if nwritable != null then nwkwredef = nwritable.n_kwredef + if atwritable != null then nwkwredef = atwritable.n_kwredef if mwriteprop == null then var mvisibility if nwritable != null then mvisibility = new_property_visibility(modelbuilder, mclassdef, nwritable.n_visibility) + else if atwritable != null then + mvisibility = new_property_visibility(modelbuilder, mclassdef, atwritable.n_visibility) else mvisibility = private_visibility end mwriteprop = new MMethod(mclassdef, writename, mvisibility) if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, false, mwriteprop) then return else - if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, true, mwriteprop) then return + if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef or else n_kwredef, true, mwriteprop) then return if nwritable != null then check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop) + else if atwritable != null then + check_redef_property_visibility(modelbuilder, atwritable.n_visibility, mwriteprop) end end mclassdef.mprop2npropdef[mwriteprop] = self @@ -769,12 +930,21 @@ redef class AAttrPropdef var mmodule = mclassdef.mmodule var mtype: nullable MType = null + var mreadpropdef = self.mreadpropdef + var ntype = self.n_type if ntype != null then mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) if mtype == null then return end + # Inherit the type from the getter (usually an abstact getter) + if mtype == null and mreadpropdef != null and not mreadpropdef.is_intro then + var msignature = mreadpropdef.mproperty.intro.msignature + if msignature == null then return # Error, thus skiped + mtype = msignature.return_mtype + end + var nexpr = self.n_expr if mtype == null then if nexpr != null then @@ -802,11 +972,9 @@ redef class AAttrPropdef modelbuilder.error(self, "Error: Untyped attribute {mpropdef}. Implicit typing allowed only for literals and new.") end - else - modelbuilder.error(self, "Error: Untyped attribute {mpropdef}") + if mtype == null then return end - else - assert ntype != null + else if ntype != null then if nexpr isa ANewExpr then var xmtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type) if xmtype == mtype and modelbuilder.toolcontext.opt_warn.value >= 2 then @@ -815,17 +983,19 @@ redef class AAttrPropdef end end - if mtype == null then return + if mtype == null then + modelbuilder.error(self, "Error: Untyped attribute {mpropdef}") + return + end mpropdef.static_mtype = mtype - var mreadpropdef = self.mreadpropdef if mreadpropdef != null then var msignature = new MSignature(new Array[MParameter], mtype) mreadpropdef.msignature = msignature end - var msritepropdef = self.mwritepropdef + var mwritepropdef = self.mwritepropdef if mwritepropdef != null then var name: String if n_id != null then @@ -837,6 +1007,11 @@ redef class AAttrPropdef var msignature = new MSignature([mparameter], null) mwritepropdef.msignature = msignature end + + var mlazypropdef = self.mlazypropdef + if mlazypropdef != null then + mlazypropdef.static_mtype = modelbuilder.model.get_mclasses_by_name("Bool").first.mclass_type + end end redef fun check_signature(modelbuilder) @@ -912,7 +1087,7 @@ 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, mclassdef.bound_mtype, prt) and + if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) or not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then var node: ANode if nsig != null then node = nsig else node = self @@ -960,6 +1135,11 @@ redef class ATypePropdef self.mpropdef = mpropdef modelbuilder.mpropdef2npropdef[mpropdef] = self set_doc(mpropdef) + + var atfixed = get_single_annotation("fixed", modelbuilder) + if atfixed != null then + mpropdef.is_fixed = true + end end redef fun build_signature(modelbuilder) @@ -986,27 +1166,46 @@ redef class ATypePropdef var bound = self.mpropdef.bound if bound == null then return # Error thus skiped - modelbuilder.check_visibility(n_type.as(not null), bound, mpropdef) - - # Fast case: the bound is not a formal type - if not bound isa MVirtualType then return + modelbuilder.check_visibility(n_type, bound, mpropdef) 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] - loop - if seen.has(bound) then + # Check circularity + if bound isa MVirtualType then + # Slow case: progress on each resolution until: (i) we loop, or (ii) we found a non formal type + var seen = [self.mpropdef.mproperty.mvirtualtype] + loop + if seen.has(bound) then + seen.add(bound) + modelbuilder.error(self, "Error: circularity of virtual type definition: {seen.join(" -> ")}") + return + end seen.add(bound) - modelbuilder.error(self, "Error: circularity of virtual type definition: {seen.join(" -> ")}") - return + var next = bound.lookup_bound(mmodule, anchor) + if not next isa MVirtualType then break + bound = next + end + end + + # Check redefinitions + bound = mpropdef.bound.as(not null) + for p in mpropdef.mproperty.lookup_super_definitions(mmodule, anchor) do + var supbound = p.bound.as(not null) + if p.is_fixed then + modelbuilder.error(self, "Redef Error: Virtual type {mpropdef.mproperty} is fixed in super-class {p.mclassdef.mclass}") + break + end + if p.mclassdef.mclass == mclassdef.mclass then + # Still a warning to pass existing bad code + modelbuilder.warning(n_type, "Redef Error: a virtual type cannot be refined.") + break + end + if not bound.is_subtype(mmodule, anchor, supbound) then + modelbuilder.error(n_type, "Redef Error: Wrong bound type. Found {bound}, expected a subtype of {supbound}, as in {p}.") + break end - seen.add(bound) - var next = bound.lookup_bound(mmodule, anchor) - if not next isa MVirtualType then break - bound = next end end end