autosuper: remove heuristic where a homonymous named constructor is implicitly called
[nit.git] / src / semantize / auto_super_init.nit
index 6627047..defe5a2 100644 (file)
@@ -56,8 +56,10 @@ redef class AMethPropdef
        # Collect initializers and build the auto-init
        fun do_auto_super_init(modelbuilder: ModelBuilder)
        do
-               var mclassdef = self.parent.as(AClassdef).mclassdef.as(not null)
-               var mpropdef = self.mpropdef.as(not null)
+               var mclassdef = self.parent.as(AClassdef).mclassdef
+               if mclassdef == null or mclassdef.is_broken then return # skip error
+               var mpropdef = self.mpropdef
+               if mpropdef == null or mpropdef.is_broken then return # skip error
                var mmodule = mpropdef.mclassdef.mmodule
                var anchor = mclassdef.bound_mtype
                var recvtype = mclassdef.mclass.mclass_type
@@ -67,20 +69,10 @@ redef class AMethPropdef
 
                # Collect only for constructors
                if not mpropdef.mproperty.is_init or mpropdef.mproperty.is_new then
-                       if nosuper != null then modelbuilder.error(nosuper, "Error: nosuper only in `init`")
+                       if nosuper != null then modelbuilder.error(nosuper, "Error: `nosuper` only allowed in `init`.")
                        return
                end
 
-               # FIXME: THIS IS STUPID (be here to keep the old code working)
-               if not mpropdef.mclassdef.is_intro then return
-
-               # Do we inherit for a constructor?
-               var skip = true
-               for cd in mclassdef.in_hierarchy.direct_greaters do
-                       if cd.mclass.kind.need_init then skip = false
-               end
-               if skip then return
-
                # Now we search for the absence of any explicit super-init invocation
                #  * via a "super"
                #  * via a call of an other init
@@ -90,7 +82,7 @@ redef class AMethPropdef
                        v.enter_visit(nblock)
                        var anode = v.has_explicit_super_init
                        if anode != null then
-                               if nosuper != null then modelbuilder.error(anode, "Error: method is annotated nosuper but a constructor call is present")
+                               if nosuper != null then modelbuilder.error(anode, "Error: method is annotated `nosuper` but a super-constructor call is present.")
                                return
                        end
                        if v.is_broken then return # skip
@@ -109,41 +101,17 @@ redef class AMethPropdef
                # Still here? So it means that we must determine what super inits need to be automatically invoked
                # The code that follow is required to deal with complex cases with old-style and new-style inits
 
-               # Look for old-style super constructors
                var auto_super_inits = new Array[CallSite]
-               for msupertype in mclassdef.supertypes do
-                       # FIXME: the order is quite arbitrary
-                       if not msupertype.mclass.kind.need_init then continue
-                       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
-                               candidate = modelbuilder.try_get_mproperty_by_name2(self, mmodule, msupertype, "init")
-                       end
-                       if candidate == null then
-                               modelbuilder.error(self, "Error: Cannot do an implicit constructor call in {mpropdef}; there is no constructor named {mpropdef.mproperty.name} in {msupertype}.")
-                               return
-                       end
-                       assert candidate isa MMethod
-
-                       # Skip new-style init
-                       if candidate.is_root_init then continue
-
-                       var candidatedefs = candidate.lookup_definitions(mmodule, anchor)
-                       var candidatedef = candidatedefs.first
-                       # TODO, we drop the others propdefs in the callsite, that is not great :(
 
-                       var msignature = candidatedef.new_msignature or else candidatedef.msignature
-                       msignature = msignature.resolve_for(recvtype, anchor, mmodule, true)
-
-                       var callsite = new CallSite(self, recvtype, mmodule, anchor, true, candidate, candidatedef, msignature, false)
-                       auto_super_inits.add(callsite)
-                       modelbuilder.toolcontext.info("Old-style auto-super init for {mpropdef} to {candidate.full_name}", 4)
-               end
-
-               # No old style? The look for new-style super constructors (called from a old style constructor)
+               # The look for new-style super constructors (called from a old style constructor)
                var the_root_init_mmethod = modelbuilder.the_root_init_mmethod
                if the_root_init_mmethod != null and auto_super_inits.is_empty then
                        var candidatedefs = the_root_init_mmethod.lookup_definitions(mmodule, anchor)
+                       if candidatedefs.is_empty then
+                               # skip broken
+                               is_broken = true
+                               return
+                       end
 
                        # Search the longest-one and checks for conflict
                        var candidatedef = candidatedefs.first
@@ -159,7 +127,7 @@ redef class AMethPropdef
                                        var i = 0
                                        for p in spd.initializers do
                                                if p != candidatedef.initializers[i] then
-                                                       modelbuilder.error(self, "Error: Cannot do an implicit constructor call to comflicting for inherited inits {spd}({spd.initializers.join(", ")}) and {candidatedef}({candidatedef.initializers.join(", ")}). NOTE: Do not mix old-style and new-style init!")
+                                                       modelbuilder.error(self, "Error: cannot do an implicit constructor call to conflicting inherited inits `{spd}({spd.initializers.join(", ")}`) and `{candidatedef}({candidatedef.initializers.join(", ")}`). NOTE: Do not mix old-style and new-style init!")
                                                        return
                                                end
                                                i += 1
@@ -170,12 +138,12 @@ redef class AMethPropdef
                        var msignature = candidatedef.new_msignature or else candidatedef.msignature
                        msignature = msignature.resolve_for(recvtype, anchor, mmodule, true)
 
-                       var callsite = new CallSite(self, recvtype, mmodule, anchor, true, the_root_init_mmethod, candidatedef, msignature, false)
+                       var callsite = new CallSite(hot_location, recvtype, mmodule, anchor, true, the_root_init_mmethod, candidatedef, msignature, false)
                        auto_super_inits.add(callsite)
                        modelbuilder.toolcontext.info("Auto-super init for {mpropdef} to {the_root_init_mmethod.full_name}", 4)
                end
                if auto_super_inits.is_empty then
-                       modelbuilder.error(self, "Error: No constructors to call implicitely in {mpropdef}. Call one explicitely.")
+                       modelbuilder.error(self, "Error: no constructors to call implicitly in `{mpropdef}`. Call one explicitly.")
                        return
                end
 
@@ -185,7 +153,7 @@ redef class AMethPropdef
                        var msig = mpropdef.msignature.as(not null)
                        var supermsig = auto_super_init.msignature
                        if supermsig.arity > msig.arity then
-                               modelbuilder.error(self, "Error: Cannot do an implicit constructor call to {auto_super_init_def}{supermsig}. Expected at least {supermsig.arity} arguments, got {msig.arity}.")
+                               modelbuilder.error(self, "Error: cannot do an implicit constructor call to `{auto_super_init_def}{supermsig}`. Expected at least `{supermsig.arity}` arguments, got `{msig.arity}`.")
                                continue
                        end
                        var i = 0
@@ -194,7 +162,7 @@ redef class AMethPropdef
                                var sub = p.mtype
                                var sup = sp.mtype
                                if not sub.is_subtype(mmodule, anchor, sup) then
-                                       modelbuilder.error(self, "Error: Cannot do an implicit constructor call to {auto_super_init_def}{supermsig}. Expected argument #{i} of type {sp.mtype}, got implicit argument {p.name} of type {p.mtype}.")
+                                       modelbuilder.error(self, "Error: cannot do an implicit constructor call to `{auto_super_init_def}{supermsig}`. Expected argument #{i} of type `{sp.mtype}`, got implicit argument `{p.name}` of type `{p.mtype}`.")
                                        break
                                end
                                i += 1