X-Git-Url: http://nitlanguage.org

diff --git a/src/modelize/modelize_property.nit b/src/modelize/modelize_property.nit
index 0a948d2..be862c6 100644
--- a/src/modelize/modelize_property.nit
+++ b/src/modelize/modelize_property.nit
@@ -158,9 +158,6 @@ redef class ModelBuilder
 			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
@@ -182,18 +179,11 @@ redef class ModelBuilder
 		var initializers = new Array[MProperty]
 		for npropdef in nclassdef.n_propdefs do
 			if npropdef isa AMethPropdef then
+				if not npropdef.is_autoinit then continue # Skip non tagged autoinit
 				if npropdef.mpropdef == null then return # Skip broken method
-				var at = npropdef.get_single_annotation("autoinit", self)
-				if at == null then continue # Skip non tagged init
-
 				var sig = npropdef.mpropdef.msignature
 				if sig == null then continue # Skip broken method
 
-				if not npropdef.mpropdef.is_intro then
-					self.error(at, "Error: `autoinit` cannot be set on redefinitions.")
-					continue
-				end
-
 				for param in sig.mparameters do
 					var ret_type = param.mtype
 					var mparameter = new MParameter(param.name, ret_type, false, ret_type isa MNullableType)
@@ -315,7 +305,12 @@ redef class ModelBuilder
 					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(", ")})")
+							var proposal = new ArraySet[MProperty]
+							for spd2 in spropdefs do
+								proposal.add_all spd2.initializers
+							end
+							proposal.add_all initializers
+							self.error(nclassdef, "Error: cannot generate automatic init for class {mclassdef.mclass}. Conflict in the order in inherited initializers {spd}({spd.initializers.join(", ")}) and {longest}({longest.initializers.join(", ")}). Use `autoinit` to order initializers. eg `autoinit {proposal.join(", ")}`")
 							# TODO: invalidate the initializer to avoid more errors
 							return
 						end
@@ -743,6 +738,8 @@ end
 redef class AMethPropdef
 	redef type MPROPDEF: MMethodDef
 
+	# Is the method annotated `autoinit`?
+	var is_autoinit = false
 
 	# Can self be used as a root init?
 	private fun look_like_a_root_init(modelbuilder: ModelBuilder, mclassdef: MClassDef): Bool
@@ -988,6 +985,17 @@ redef class AMethPropdef
 		# Check annotations
 		var at = self.get_single_annotation("lazy", modelbuilder)
 		if at != null then modelbuilder.error(at, "Syntax Error: `lazy` must be used on attributes.")
+
+		var atautoinit = self.get_single_annotation("autoinit", modelbuilder)
+		if atautoinit != null then
+			if not mpropdef.is_intro then
+				modelbuilder.error(atautoinit, "Error: `autoinit` cannot be set on redefinitions.")
+			else if not mclassdef.is_intro then
+				modelbuilder.error(atautoinit, "Error: `autoinit` cannot be used in class refinements.")
+			else
+				self.is_autoinit = true
+			end
+		end
 	end
 
 	redef fun check_signature(modelbuilder)
@@ -1135,6 +1143,10 @@ end
 redef class AAttrPropdef
 	redef type MPROPDEF: MAttributeDef
 
+	# The static type of the property (declared, inferred or inherited)
+	# This attribute is also used to check if the property was analyzed and is valid.
+	var mtype: nullable MType
+
 	# Is the node tagged `noinit`?
 	var noinit = false
 
@@ -1209,8 +1221,7 @@ redef class AAttrPropdef
 				return
 			end
 			if atabstract != null then
-				modelbuilder.error(atnoinit, "Error: `noautoinit` attributes cannot be abstract.")
-				return
+				modelbuilder.warning(atnoinit, "useless-noautoinit", "Warning: superfluous `noautoinit` on abstract attribute.")
 			end
 		end
 
@@ -1245,6 +1256,10 @@ redef class AAttrPropdef
 			return
 		end
 
+		if not mclassdef.is_intro and not has_value and not noinit then
+			modelbuilder.advice(self, "attr-in-refinement", "Warning: attributes in refinement need a value or `noautoinit`.")
+		end
+
 		var writename = name + "="
 		var atwritable = self.get_single_annotation("writable", modelbuilder)
 		if atwritable != null then
@@ -1278,6 +1293,22 @@ redef class AAttrPropdef
 		modelbuilder.mpropdef2npropdef[mwritepropdef] = self
 		mwritepropdef.mdoc = mreadpropdef.mdoc
 		if atabstract != null then mwritepropdef.is_abstract = true
+
+		var atautoinit = self.get_single_annotation("autoinit", modelbuilder)
+		if atautoinit != null then
+			if has_value then
+				modelbuilder.error(atautoinit, "Error: `autoinit` attributes cannot have an initial value.")
+			else if not mwritepropdef.is_intro then
+				modelbuilder.error(atautoinit, "Error: `autoinit` attributes cannot be set on redefinitions.")
+			else if not mclassdef.is_intro then
+				modelbuilder.error(atautoinit, "Error: `autoinit` attributes cannot be used in class refinements.")
+			else if atabstract == null then
+				modelbuilder.warning(atautoinit, "useless-autoinit", "Warning: superfluous `autoinit` on attribute.")
+			end
+		else if atabstract != null then
+			# By default, abstract attribute are not autoinit
+			noinit = true
+		end
 	end
 
 	redef fun build_signature(modelbuilder)
@@ -1355,6 +1386,8 @@ redef class AAttrPropdef
 			return
 		end
 
+		self.mtype = mtype
+
 		if mpropdef != null then
 			mpropdef.static_mtype = mtype
 		end
@@ -1385,7 +1418,7 @@ redef class AAttrPropdef
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skipped
 		var ntype = self.n_type
-		var mtype = self.mpropdef.static_mtype
+		var mtype = self.mtype
 		if mtype == null then return # Error thus skipped
 
 		var mclassdef = mpropdef.mclassdef