X-Git-Url: http://nitlanguage.org diff --git a/src/semantize/auto_super_init.nit b/src/semantize/auto_super_init.nit index 25874e2..1da19d4 100644 --- a/src/semantize/auto_super_init.nit +++ b/src/semantize/auto_super_init.nit @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Computing of super-constructors that must be implicitely called at the begin of constructors. +# Computing of super-constructors that must be implicitly called at the begin of constructors. # The current rules are a bit crazy but whatever. module auto_super_init @@ -22,6 +22,7 @@ import typing private import annotation redef class ToolContext + # Phase that inject `super` in constructors that need it. var auto_super_init_phase: Phase = new AutoSuperInitPhase(self, [typing_phase]) end @@ -39,6 +40,9 @@ private class AutoSuperInitVisitor end var has_explicit_super_init: nullable ANode = null + + # The method is broken, so avoid to display additional errors + var is_broken = false end @@ -52,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 then return # skip error + var mpropdef = self.mpropdef + if mpropdef == null then return # skip error var mmodule = mpropdef.mclassdef.mmodule var anchor = mclassdef.bound_mtype var recvtype = mclassdef.mclass.mclass_type @@ -62,21 +68,11 @@ redef class AMethPropdef var nosuper = get_single_annotation("nosuper", modelbuilder) # Collect only for constructors - if not mpropdef.mproperty.is_init then - if nosuper != null then modelbuilder.error(nosuper, "Error: nosuper only in `init`") + if not mpropdef.mproperty.is_init or mpropdef.mproperty.is_new then + 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 @@ -86,9 +82,10 @@ 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 end if nosuper != null then return @@ -97,6 +94,7 @@ redef class AMethPropdef if not mpropdef.is_intro then auto_super_call = true mpropdef.has_supercall = true + modelbuilder.toolcontext.info("Auto-super call for {mpropdef}", 4) return end @@ -114,7 +112,7 @@ redef class AMethPropdef 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}.") + 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 @@ -129,8 +127,9 @@ 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, candidate, candidatedef, msignature, false) + var callsite = new CallSite(hot_location, 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) @@ -152,7 +151,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 @@ -163,11 +162,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 @@ -177,7 +177,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 @@ -186,7 +186,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 @@ -205,8 +205,12 @@ end redef class ASendExpr redef fun accept_auto_super_init(v) do - var mproperty = self.callsite.mproperty - if mproperty.is_init then + var callsite = self.callsite + if callsite == null then + v.is_broken = true + return + end + if callsite.mproperty.is_init then v.has_explicit_super_init = self end end