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

diff --git a/src/modelize/modelize_property.nit b/src/modelize/modelize_property.nit
index bb4d2cd..c224b29 100644
--- a/src/modelize/modelize_property.nit
+++ b/src/modelize/modelize_property.nit
@@ -17,10 +17,11 @@
 # Analysis and verification of property definitions to instantiate model element
 module modelize_property
 
-import modelize_class
+intrude import modelize_class
 private import annotation
 
 redef class ToolContext
+	# Run `AClassdef::build_property` on the classdefs of each module
 	var modelize_property_phase: Phase = new ModelizePropertyPhase(self, [modelize_class_phase])
 end
 
@@ -36,9 +37,47 @@ private class ModelizePropertyPhase
 end
 
 redef class ModelBuilder
-	# Register the npropdef associated to each mpropdef
-	# FIXME: why not refine the `MPropDef` class with a nullable attribute?
-	var mpropdef2npropdef = new HashMap[MPropDef, APropdef]
+	# Registration of the npropdef associated to each mpropdef.
+	#
+	# Public clients need to use `mpropdef2node` to access stuff.
+	private var mpropdef2npropdef = new HashMap[MPropDef, APropdef]
+
+	# Retrieve the associated AST node of a mpropertydef.
+	# This method is used to associate model entity with syntactic entities.
+	#
+	# If the property definition is not associated with a node, returns `null`.
+	fun mpropdef2node(mpropdef: MPropDef): nullable ANode
+	do
+		var res
+		res = mpropdef2npropdef.get_or_null(mpropdef)
+		if res != null then
+			# Run the phases on it
+			toolcontext.run_phases_on_npropdef(res)
+			return res
+		end
+		if mpropdef isa MMethodDef and mpropdef.mproperty.is_root_init then
+			res = mclassdef2nclassdef.get_or_null(mpropdef.mclassdef)
+			if res != null then return res
+		end
+		return null
+	end
+
+	# Retrieve all the attributes nodes localy definied
+	# FIXME think more about this method and how the separations separate/global and ast/model should be done.
+	fun collect_attr_propdef(mclassdef: MClassDef): Array[AAttrPropdef]
+	do
+		var res = new Array[AAttrPropdef]
+		var n = mclassdef2nclassdef.get_or_null(mclassdef)
+		if n == null then return res
+		for npropdef in n.n_propdefs do
+			if npropdef isa AAttrPropdef then
+				# Run the phases on it
+				toolcontext.run_phases_on_npropdef(npropdef)
+				res.add(npropdef)
+			end
+		end
+		return res
+	end
 
 	# Build the properties of `nclassdef`.
 	# REQUIRE: all superclasses are built.
@@ -47,13 +86,15 @@ redef class ModelBuilder
 		# Force building recursively
 		if nclassdef.build_properties_is_done then return
 		nclassdef.build_properties_is_done = true
-		var mclassdef = nclassdef.mclassdef.as(not null)
+		var mclassdef = nclassdef.mclassdef
+		if mclassdef == null then return # skip error
 		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
 
+		mclassdef.build_self_type(self, nclassdef)
 		for nclassdef2 in nclassdef.all_defs do
 			for npropdef in nclassdef2.n_propdefs do
 				npropdef.build_property(self, mclassdef)
@@ -62,6 +103,24 @@ redef class ModelBuilder
 				npropdef.build_signature(self)
 			end
 			for npropdef in nclassdef2.n_propdefs do
+				if not npropdef isa ATypePropdef then continue
+				# Check circularity
+				var mpropdef = npropdef.mpropdef
+				if mpropdef == null then continue
+				if mpropdef.bound == null then continue
+				if not check_virtual_types_circularity(npropdef, mpropdef.mproperty, mclassdef.bound_mtype, mclassdef.mmodule) then
+					# Invalidate the bound
+					mpropdef.bound = mclassdef.mmodule.model.null_type
+				end
+			end
+			for npropdef in nclassdef2.n_propdefs do
+				# Check ATypePropdef first since they may be required for the other properties
+				if not npropdef isa ATypePropdef then continue
+				npropdef.check_signature(self)
+			end
+
+			for npropdef in nclassdef2.n_propdefs do
+				if npropdef isa ATypePropdef then continue
 				npropdef.check_signature(self)
 			end
 		end
@@ -141,18 +200,20 @@ redef class ModelBuilder
 					mparameters.add(mparameter)
 				end
 				initializers.add(npropdef.mpropdef.mproperty)
+				npropdef.mpropdef.mproperty.is_autoinit = true
 			end
 			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
+				if npropdef.noinit then continue # Skip noinit attribute
+				var atautoinit = npropdef.get_single_annotation("autoinit", self)
+				if atautoinit != null then
+					# For autoinit attributes, call the reader to force
+					# the lazy initialization of the attribute.
+					initializers.add(npropdef.mreadpropdef.mproperty)
+					npropdef.mreadpropdef.mproperty.is_autoinit = true
+					continue
 				end
-				if npropdef.n_expr != null then continue
+				if npropdef.has_value then continue
 				var paramname = npropdef.mpropdef.mproperty.name.substring_from(1)
 				var ret_type = npropdef.mpropdef.static_mtype
 				if ret_type == null then return
@@ -162,9 +223,11 @@ redef class ModelBuilder
 				if msetter == null then
 					# No setter, it is a old-style attribute, so just add it
 					initializers.add(npropdef.mpropdef.mproperty)
+					npropdef.mpropdef.mproperty.is_autoinit = true
 				else
 					# Add the setter to the list
 					initializers.add(msetter.mproperty)
+					msetter.mproperty.is_autoinit = true
 				end
 			end
 		end
@@ -174,42 +237,104 @@ redef class ModelBuilder
 		# Look for most-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
+			toolcontext.error(nclassdef.location, "Error: {mclassdef} does not specialize {the_root_init_mmethod.intro_mclassdef}. Possible duplication of the root class `Object`?")
+			return
+		end
+
+		# Look at the autoinit class-annotation
+		var autoinit = nclassdef.get_single_annotation("autoinit", self)
+		var noautoinit = nclassdef.get_single_annotation("noautoinit", self)
+		if autoinit != null then
+			# Just throws the collected initializers
+			mparameters.clear
+			initializers.clear
+
+			if noautoinit != null then
+				error(autoinit, "Error: `autoinit` and `noautoinit` are incompatible.")
+			end
+
+			if autoinit.n_args.is_empty then
+				error(autoinit, "Syntax error: `autoinit` expects method identifiers, use `noautoinit` to clear all autoinits.")
+			end
+
+			# Get and check each argument
+			for narg in autoinit.n_args do
+				var id = narg.as_id
+				if id == null then
+					error(narg, "Syntax error: `autoinit` expects method identifiers.")
+					return
+				end
+
+				# Search the property.
+				# To avoid bad surprises, try to get the setter first.
+				var p = try_get_mproperty_by_name(narg, mclassdef, id + "=")
+				if p == null then
+					p = try_get_mproperty_by_name(narg, mclassdef, id)
+				end
+				if p == null then
+					error(narg, "Error: unknown method `{id}`")
+					return
+				end
+				if not p.is_autoinit then
+					error(narg, "Error: `{p}` is not an autoinit method")
+					return
+				end
+
+				# Register the initializer and the parameters
+				initializers.add(p)
+				var pd = p.intro
+				if pd isa MMethodDef then
+					# Get the signature resolved for the current receiver
+					var sig = pd.msignature.resolve_for(mclassdef.mclass.mclass_type, mclassdef.bound_mtype, mclassdef.mmodule, false)
+					mparameters.add_all sig.mparameters
+				else
+					# TODO attributes?
+					abort
+				end
+			end
+		else if noautoinit != null then
+			if initializers.is_empty then
+				warning(noautoinit, "useless-noautoinit", "Warning: the list of autoinit is already empty.")
+			end
+			# Just clear initializers
+			mparameters.clear
+			initializers.clear
+		else
+			# 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(", ")})")
+							# TODO: invalidate the initializer to avoid more errors
+							return
+						end
+						i += 1
 					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)
-			mclassdef.mclass.root_init = longest
-			return
-		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)
+				mclassdef.mclass.root_init = longest
+				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
+			# 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
 		end
 
 		# If we already have a basic init definition, then setup its initializers
@@ -245,7 +370,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 original module of the type
-		mtype = mtype.as_notnullable
+		mtype = mtype.undecorate
 		if mtype isa MClassType then
 			vis_type = mtype.mclass.visibility
 			mmodule_type = mtype.mclass.intro.mmodule
@@ -254,6 +379,8 @@ redef class ModelBuilder
 			mmodule_type = mtype.mproperty.intro_mclassdef.mmodule
 		else if mtype isa MParameterType then
 			# nothing, always visible
+		else if mtype isa MNullType then
+			# nothing to do.
 		else
 			node.debug "Unexpected type {mtype}"
 			abort
@@ -282,6 +409,72 @@ redef class ModelBuilder
 			for t in mtype.arguments do check_visibility(node, t, mpropdef)
 		end
 	end
+
+	# Detect circularity errors for virtual types.
+	fun check_virtual_types_circularity(node: ANode, mproperty: MVirtualTypeProp, recv: MType, mmodule: MModule): Bool
+	do
+		# Check circularity
+		# Slow case: progress on each resolution until we visit all without getting a loop
+
+		# The graph used to detect loops
+		var mtype = mproperty.mvirtualtype
+		var poset = new POSet[MType]
+
+		# The work-list of types to resolve
+		var todo = new List[MType]
+		todo.add mtype
+
+		while not todo.is_empty do
+			# The visited type
+			var t = todo.pop
+
+			if not t.need_anchor then continue
+
+			# Get the types derived of `t` (subtypes and bounds)
+			var nexts
+			if t isa MNullableType then
+				nexts = [t.mtype]
+			else if t isa MGenericType then
+				nexts = t.arguments
+			else if t isa MVirtualType then
+				var vt = t.mproperty
+				# Because `vt` is possibly unchecked, we have to do the bound-lookup manually
+				var defs = vt.lookup_definitions(mmodule, recv)
+				# TODO something to manage correctly bound conflicts
+				assert not defs.is_empty
+				nexts = new Array[MType]
+				for d in defs do
+					var next = defs.first.bound
+					if next == null then return false
+					nexts.add next
+				end
+			else if t isa MClassType then
+				# Basic type, nothing to to
+				continue
+			else if t isa MParameterType then
+				# Parameter types cannot depend on virtual types, so nothing to do
+				continue
+			else
+				abort
+			end
+
+			# For each one
+			for next in nexts do
+				if poset.has_edge(next, t) then
+					if mtype == next then
+						error(node, "Error: circularity of virtual type definition: {next} <-> {t}")
+					else
+						error(node, "Error: circularity of virtual type definition: {mtype} -> {next} <-> {t}")
+					end
+					return false
+				else
+					poset.add_edge(t, next)
+					todo.add next
+				end
+			end
+		end
+		return true
+	end
 end
 
 redef class MPropDef
@@ -291,7 +484,8 @@ redef class MPropDef
 end
 
 redef class AClassdef
-	var build_properties_is_done = false
+	# Marker used in `ModelBuilder::build_properties`
+	private var build_properties_is_done = false
 
 	# The free init (implicitely constructed by the class if required)
 	var mfree_init: nullable MMethodDef = null
@@ -310,27 +504,49 @@ redef class MClassDef
 	# What is the `APropdef` associated to a `MProperty`?
 	# Used to check multiple definition of a property.
 	var mprop2npropdef: Map[MProperty, APropdef] = new HashMap[MProperty, APropdef]
-end
 
-redef class Prod
-	# Join the text of all tokens
-	# Used to get the 'real name' of method definitions.
-	fun collect_text: String
+	# Build the virtual type `SELF` only for introduction `MClassDef`
+	fun build_self_type(modelbuilder: ModelBuilder, nclassdef: AClassdef)
 	do
-		var v = new TextCollectorVisitor
-		v.enter_visit(self)
-		assert v.text != ""
-		return v.text
-	end
-end
+		if not is_intro then return
 
-private class TextCollectorVisitor
-	super Visitor
-	var text: String = ""
-	redef fun visit(n)
-	do
-		if n isa Token then text += n.text
-		n.visit_all(self)
+		var name = "SELF"
+		var mprop = modelbuilder.try_get_mproperty_by_name(nclassdef, self, name)
+
+		# If SELF type is declared nowherer?
+		if mprop == null then return
+
+		# SELF is not a virtual type? it is weird but we ignore it
+		if not mprop isa MVirtualTypeProp then return
+
+		# Is this the intro of SELF in the library?
+		var intro = mprop.intro
+		var intro_mclassdef = intro.mclassdef
+		if intro_mclassdef == self then
+			var nintro = modelbuilder.mpropdef2npropdef[intro]
+
+			# SELF must be declared in Object, otherwise this will create conflicts
+			if intro_mclassdef.mclass.name != "Object" then
+				modelbuilder.error(nintro, "Error: the virtual type SELF must be declared in Object.")
+			end
+
+			# SELF must be public
+			if mprop.visibility != public_visibility then
+				modelbuilder.error(nintro, "Error: the virtual type SELF must be public.")
+			end
+
+			# SELF must not be fixed
+			if intro.is_fixed then
+				modelbuilder.error(nintro, "Error: the virtual type SELF cannot be fixed.")
+			end
+
+			return
+		end
+
+		# This class introduction inherits a SELF
+		# We insert an artificial property to update it
+		var mpropdef = new MVirtualTypeDef(self, mprop, self.location)
+		mpropdef.bound = mclass.mclass_type
 	end
 end
 
@@ -341,9 +557,9 @@ redef class APropdef
 	# The associated propdef once build by a `ModelBuilder`
 	var mpropdef: nullable MPROPDEF is writable
 
-	private fun build_property(modelbuilder: ModelBuilder, mclassdef: MClassDef) is abstract
-	private fun build_signature(modelbuilder: ModelBuilder) is abstract
-	private fun check_signature(modelbuilder: ModelBuilder) is abstract
+	private fun build_property(modelbuilder: ModelBuilder, mclassdef: MClassDef) do end
+	private fun build_signature(modelbuilder: ModelBuilder) do end
+	private fun check_signature(modelbuilder: ModelBuilder) do end
 	private fun new_property_visibility(modelbuilder: ModelBuilder, mclassdef: MClassDef, nvisibility: nullable AVisibility): MVisibility
 	do
 		var mvisibility = public_visibility
@@ -415,11 +631,24 @@ redef class APropdef
 			return false
 
 		end
+		if mprop isa MMethod and mprop.is_root_init then return true
 		if kwredef == null then
 			if need_redef then
 				modelbuilder.error(self, "Redef error: {mclassdef.mclass}::{mprop.name} is an inherited property. To redefine it, add the redef keyword.")
 				return false
 			end
+
+			# Check for full-name conflicts in the project.
+			# A public property should have a unique qualified name `project::class::prop`.
+			if mprop.intro_mclassdef.mmodule.mgroup != null and mprop.visibility >= protected_visibility then
+				var others = modelbuilder.model.get_mproperties_by_name(mprop.name)
+				if others != null then for other in others do
+					if other != mprop and other.intro_mclassdef.mmodule.mgroup != null and other.intro_mclassdef.mmodule.mgroup.mproject == mprop.intro_mclassdef.mmodule.mgroup.mproject and other.intro_mclassdef.mclass.name == mprop.intro_mclassdef.mclass.name and other.visibility >= protected_visibility then
+						modelbuilder.advice(self, "full-name-conflict", "Warning: A property named `{other.full_name}` is already defined in module `{other.intro_mclassdef.mmodule}` for the class `{other.intro_mclassdef.mclass.name}`.")
+						break
+					end
+				end
+			end
 		else
 			if not need_redef then
 				modelbuilder.error(self, "Error: No property {mclassdef.mclass}::{mprop.name} is inherited. Remove the redef keyword to define a new property.")
@@ -456,7 +685,7 @@ redef class ASignature
 			param_names.add(np.n_id.text)
 			var ntype = np.n_type
 			if ntype != null then
-				var mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
+				var mtype = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, ntype, true)
 				if mtype == null then return false # Skip error
 				for i in [0..param_names.length-param_types.length[ do
 					param_types.add(mtype)
@@ -473,7 +702,7 @@ redef class ASignature
 		end
 		var ntype = self.n_type
 		if ntype != null then
-			self.ret_type = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
+			self.ret_type = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, ntype, true)
 			if self.ret_type == null then return false # Skip error
 		end
 
@@ -481,24 +710,24 @@ redef class ASignature
 		return true
 	end
 
-	# Build a visited signature
-	fun build_signature(modelbuilder: ModelBuilder): nullable MSignature
+	private fun check_signature(modelbuilder: ModelBuilder, mclassdef: MClassDef): Bool
 	do
-		if param_names.length != param_types.length then
-			# Some parameters are typed, other parameters are not typed.
-			modelbuilder.error(self.n_params[param_types.length], "Error: Untyped parameter `{param_names[param_types.length]}'.")
-			return null
+		var res = true
+		for np in self.n_params do
+			var ntype = np.n_type
+			if ntype != null then
+				if modelbuilder.resolve_mtype(mclassdef.mmodule, mclassdef, ntype) == null then
+					res = false
+				end
+			end
 		end
-
-		var mparameters = new Array[MParameter]
-		for i in [0..param_names.length[ do
-			var mparameter = new MParameter(param_names[i], param_types[i], i == vararg_rank)
-			self.n_params[i].mparameter = mparameter
-			mparameters.add(mparameter)
+		var ntype = self.n_type
+		if ntype != null then
+			if modelbuilder.resolve_mtype(mclassdef.mmodule, mclassdef, ntype) == null then
+				res = false
+			end
 		end
-
-		var msignature = new MSignature(mparameters, ret_type)
-		return msignature
+		return res
 	end
 end
 
@@ -512,16 +741,12 @@ redef class AMethPropdef
 
 
 	# Can self be used as a root init?
-	private fun look_like_a_root_init(modelbuilder: ModelBuilder): Bool
+	private fun look_like_a_root_init(modelbuilder: ModelBuilder, mclassdef: MClassDef): 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
@@ -531,6 +756,16 @@ redef class AMethPropdef
 			var old = amoddecl.get_single_annotation("old_style_init", modelbuilder)
 			if old != null then return false
 		end
+		# No parameters
+		if self.n_signature.n_params.length > 0 then
+			modelbuilder.advice(self, "old-init", "Warning: init with signature in {mclassdef}")
+			return false
+		end
+		# Cannot be private or something
+		if not self.n_visibility isa APublicVisibility then
+			modelbuilder.advice(self, "old-init", "Warning: non-public init in {mclassdef}")
+			return false
+		end
 
 		return true
 	end
@@ -551,7 +786,7 @@ redef class AMethPropdef
 				name = "init"
 				name_node = n_kwinit
 			else if n_kwnew != null then
-				name = "init"
+				name = "new"
 				name_node = n_kwnew
 			else
 				abort
@@ -569,9 +804,10 @@ redef class AMethPropdef
 			end
 		end
 
+		var look_like_a_root_init = look_like_a_root_init(modelbuilder, mclassdef)
 		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
+		if mprop == null and look_like_a_root_init then
 			mprop = modelbuilder.the_root_init_mmethod
 			var nb = n_block
 			if nb isa ABlockExpr and nb.n_expr.is_empty and n_doc == null then
@@ -581,18 +817,30 @@ redef class AMethPropdef
 		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
+			if look_like_a_root_init 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 mprop.is_new then mclassdef.mclass.has_new_factory = true
 			if parent isa ATopClassdef then mprop.is_toplevel = true
-			if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mprop) then return
+			self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mprop)
 		else
-			if not mprop.is_root_init and not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, not self isa AMainMethPropdef, mprop) then return
+			if 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
+
+		# Check name conflicts in the local class for constructors.
+		if is_init then
+			for p, n in mclassdef.mprop2npropdef do
+				if p != mprop and p isa MMethod and p.name == name then
+					check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, p)
+					break
+				end
+			end
+		end
+
 		mclassdef.mprop2npropdef[mprop] = self
 
 		var mpropdef = new MMethodDef(mclassdef, mprop, self.location)
@@ -602,9 +850,9 @@ redef class AMethPropdef
 		self.mpropdef = mpropdef
 		modelbuilder.mpropdef2npropdef[mpropdef] = self
 		if mpropdef.is_intro then
-			modelbuilder.toolcontext.info("{mpropdef} introduces new method {mprop.full_name}", 3)
+			modelbuilder.toolcontext.info("{mpropdef} introduces new method {mprop.full_name}", 4)
 		else
-			modelbuilder.toolcontext.info("{mpropdef} redefines method {mprop.full_name}", 3)
+			modelbuilder.toolcontext.info("{mpropdef} redefines method {mprop.full_name}", 4)
 		end
 	end
 
@@ -646,6 +894,9 @@ redef class AMethPropdef
 			msignature = mpropdef.mproperty.intro.msignature
 			if msignature == null then return # Skip error
 
+			# The local signature is adapted to use the local formal types, if any.
+			msignature = msignature.resolve_for(mclassdef.mclass.mclass_type, mclassdef.bound_mtype, mmodule, false)
+
 			# Check inherited signature arity
 			if param_names.length != msignature.arity then
 				var node: ANode
@@ -653,7 +904,7 @@ redef class AMethPropdef
 				modelbuilder.error(node, "Redef error: {mpropdef} redefines {mpropdef.mproperty.intro} with {param_names.length} parameter(s), {msignature.arity} expected. Signature is {mpropdef}{msignature}")
 				return
 			end
-		else if mpropdef.mproperty.is_init then
+		else if mpropdef.mproperty.is_init and not mpropdef.mproperty.is_new then
 			# FIXME UGLY: inherit signature from a super-constructor
 			for msupertype in mclassdef.supertypes do
 				msupertype = msupertype.anchor_to(mmodule, mclassdef.bound_mtype)
@@ -693,11 +944,18 @@ redef class AMethPropdef
 			mparameters.add(mparameter)
 		end
 
+		# In `new`-factories, the return type is by default the classtype.
+		if ret_type == null and mpropdef.mproperty.is_new then ret_type = mclassdef.mclass.mclass_type
+
 		msignature = new MSignature(mparameters, ret_type)
 		mpropdef.msignature = msignature
 		mpropdef.is_abstract = self.get_single_annotation("abstract", modelbuilder) != null
 		mpropdef.is_intern = self.get_single_annotation("intern", modelbuilder) != null
 		mpropdef.is_extern = self.n_extern_code_block != null or self.get_single_annotation("extern", modelbuilder) != null
+
+		# 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.")
 	end
 
 	redef fun check_signature(modelbuilder)
@@ -710,6 +968,14 @@ redef class AMethPropdef
 		var mysignature = self.mpropdef.msignature
 		if mysignature == null then return # Error thus skiped
 
+		# Check
+		if nsig != null then
+			if not nsig.check_signature(modelbuilder, mclassdef) then
+				self.mpropdef.msignature = null # invalidate
+				return # Forward error
+			end
+		end
+
 		# Lookup for signature in the precursor
 		# FIXME all precursors should be considered
 		if not mpropdef.is_intro then
@@ -720,6 +986,7 @@ redef class AMethPropdef
 			var ret_type = mysignature.return_mtype
 			if ret_type != null and precursor_ret_type == null then
 				modelbuilder.error(nsig.n_type.as(not null), "Redef Error: {mpropdef.mproperty} is a procedure, not a function.")
+				self.mpropdef.msignature = null
 				return
 			end
 
@@ -728,18 +995,23 @@ 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, 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}.")
+					var node = nsig.n_params[i]
+					if not modelbuilder.check_sametype(node, mmodule, mclassdef.bound_mtype, myt, prt) then
+						modelbuilder.error(node, "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt} as in {mpropdef.mproperty.intro}.")
+						self.mpropdef.msignature = null
 					end
 				end
 			end
 			if precursor_ret_type != null then
+				var node: nullable ANode = null
+				if nsig != null then node = nsig.n_type
+				if node == null then node = self
 				if ret_type == null then
 					# Inherit the return type
 					ret_type = precursor_ret_type
-				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}.")
+				else if not modelbuilder.check_subtype(node, mmodule, mclassdef.bound_mtype, ret_type, precursor_ret_type) then
+					modelbuilder.error(node, "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type} as in {mpropdef.mproperty.intro}.")
+					self.mpropdef.msignature = null
 				end
 			end
 		end
@@ -765,6 +1037,10 @@ redef class AAttrPropdef
 	# Is the node tagged lazy?
 	var is_lazy = false
 
+	# Has the node a default value?
+	# Could be through `n_expr` or `n_block`
+	var has_value = false
+
 	# The guard associated to a lazy attribute.
 	# Because some engines does not have a working `isset`,
 	# this additional attribute is used to guard the lazy initialization.
@@ -779,32 +1055,31 @@ redef class AAttrPropdef
 	redef fun build_property(modelbuilder, mclassdef)
 	do
 		var mclass = mclassdef.mclass
+		var nid2 = n_id2
+		var name = nid2.text
+
+		var atabstract = self.get_single_annotation("abstract", modelbuilder)
+		if atabstract == null then
+			if mclass.kind == interface_kind then
+				modelbuilder.error(self, "Error: Attempt to define attribute {name} in the interface {mclass}.")
+			else if mclass.kind == enum_kind then
+				modelbuilder.error(self, "Error: Attempt to define attribute {name} in the enum class {mclass}.")
+			else if mclass.kind == extern_kind then
+				modelbuilder.error(self, "Error: Attempt to define attribute {name} in the extern class {mclass}.")
+			end
 
-		var name: String
-		name = self.n_id2.text
-
-		if mclass.kind == interface_kind or mclassdef.mclass.kind == enum_kind then
-			modelbuilder.error(self, "Error: Attempt to define attribute {name} in the interface {mclass}.")
-		else if mclass.kind == enum_kind then
-			modelbuilder.error(self, "Error: Attempt to define attribute {name} in the enum class {mclass}.")
-		else if mclass.kind == extern_kind then
-			modelbuilder.error(self, "Error: Attempt to define attribute {name} in the extern class {mclass}.")
+			var mprop = new MAttribute(mclassdef, "_" + name, private_visibility)
+			var mpropdef = new MAttributeDef(mclassdef, mprop, self.location)
+			self.mpropdef = mpropdef
+			modelbuilder.mpropdef2npropdef[mpropdef] = self
 		end
 
-		# New attribute style
-		var nid2 = self.n_id2
-		var mprop = new MAttribute(mclassdef, "_" + name, private_visibility)
-		var mpropdef = new MAttributeDef(mclassdef, mprop, self.location)
-		self.mpropdef = mpropdef
-		modelbuilder.mpropdef2npropdef[mpropdef] = self
-
 		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, mclassdef, self.n_visibility)
 			mreadprop = new MMethod(mclassdef, readname, mvisibility)
 			if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mreadprop) then return
-			mreadprop.deprecation = mprop.deprecation
 		else
 			if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, true, mreadprop) then return
 			check_redef_property_visibility(modelbuilder, self.n_visibility, mreadprop)
@@ -815,12 +1090,45 @@ redef class AAttrPropdef
 		self.mreadpropdef = mreadpropdef
 		modelbuilder.mpropdef2npropdef[mreadpropdef] = self
 		set_doc(mreadpropdef, modelbuilder)
-		mpropdef.mdoc = mreadpropdef.mdoc
+		if mpropdef != null then mpropdef.mdoc = mreadpropdef.mdoc
+		if atabstract != null then mreadpropdef.is_abstract = true
+
+		has_value = n_expr != null or n_block != null
+
+		if atabstract != null and has_value then
+			modelbuilder.error(atabstract, "Error: `abstract` attributes cannot have an initial value")
+			return
+		end
+
+		var atnoinit = self.get_single_annotation("noinit", modelbuilder)
+		if atnoinit == null then atnoinit = self.get_single_annotation("noautoinit", modelbuilder)
+		if atnoinit != null then
+			noinit = true
+			if has_value then
+				modelbuilder.error(atnoinit, "Error: `noautoinit` attributes cannot have an initial value")
+				return
+			end
+			if atabstract != null then
+				modelbuilder.error(atnoinit, "Error: `noautoinit` attributes cannot be abstract")
+				return
+			end
+		end
 
 		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")
+		var atautoinit = self.get_single_annotation("autoinit", modelbuilder)
+		if atlazy != null or atautoinit != null then
+			if atlazy != null and atautoinit != null then
+				modelbuilder.error(atlazy, "Error: lazy incompatible with autoinit")
+				return
+			end
+			if not has_value then
+				if atlazy != null then
+					modelbuilder.error(atlazy, "Error: a lazy attribute needs a value")
+				else if atautoinit != null then
+					modelbuilder.error(atautoinit, "Error: a autoinit attribute needs a value")
+				end
+				has_value = true
+				return
 			end
 			is_lazy = true
 			var mlazyprop = new MAttribute(mclassdef, "lazy _" + name, none_visibility)
@@ -830,7 +1138,7 @@ redef class AAttrPropdef
 
 		var atreadonly = self.get_single_annotation("readonly", modelbuilder)
 		if atreadonly != null then
-			if n_expr == null then
+			if not has_value then
 				modelbuilder.error(atreadonly, "Error: a readonly attribute needs a value")
 			end
 			# No setter, so just leave
@@ -856,7 +1164,7 @@ redef class AAttrPropdef
 			end
 			mwriteprop = new MMethod(mclassdef, writename, mvisibility)
 			if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, false, mwriteprop) then return
-			mwriteprop.deprecation = mprop.deprecation
+			mwriteprop.deprecation = mreadprop.deprecation
 		else
 			if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef or else n_kwredef, true, mwriteprop) then return
 			if atwritable != null then
@@ -868,37 +1176,44 @@ redef class AAttrPropdef
 		var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
 		self.mwritepropdef = mwritepropdef
 		modelbuilder.mpropdef2npropdef[mwritepropdef] = self
-		mwritepropdef.mdoc = mpropdef.mdoc
+		mwritepropdef.mdoc = mreadpropdef.mdoc
+		if atabstract != null then mwritepropdef.is_abstract = true
 	end
 
 	redef fun build_signature(modelbuilder)
 	do
+		var mreadpropdef = self.mreadpropdef
 		var mpropdef = self.mpropdef
-		if mpropdef == null then return # Error thus skipped
-		var mclassdef = mpropdef.mclassdef
+		if mreadpropdef == null then return # Error thus skipped
+		var mclassdef = mreadpropdef.mclassdef
 		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)
+			mtype = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, ntype, true)
 			if mtype == null then return
 		end
 
+		var inherited_type: nullable MType = null
 		# Inherit the type from the getter (usually an abstract getter)
-		if mtype == null and mreadpropdef != null and not mreadpropdef.is_intro then
+		if not mreadpropdef.is_intro then
 			var msignature = mreadpropdef.mproperty.intro.msignature
 			if msignature == null then return # Error, thus skipped
-			mtype = msignature.return_mtype
+			inherited_type = msignature.return_mtype
+			if inherited_type != null then
+				# The inherited type is adapted to use the local formal types, if any.
+				inherited_type = inherited_type.resolve_for(mclassdef.mclass.mclass_type, mclassdef.bound_mtype, mmodule, false)
+				if mtype == null then mtype = inherited_type
+			end
 		end
 
 		var nexpr = self.n_expr
 		if mtype == null then
 			if nexpr != null then
 				if nexpr isa ANewExpr then
-					mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type)
+					mtype = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, nexpr.n_type, true)
 				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
@@ -918,14 +1233,14 @@ redef class AAttrPropdef
 					var cla = modelbuilder.try_get_mclass_by_name(nexpr, mmodule, "String")
 					if cla != null then mtype = cla.mclass_type
 				else
-					modelbuilder.error(self, "Error: Untyped attribute {mpropdef}. Implicit typing allowed only for literals and new.")
+					modelbuilder.error(self, "Error: Untyped attribute {mreadpropdef}. Implicit typing allowed only for literals and new.")
 				end
 
 				if mtype == null then return
 			end
-		else if ntype != null then
+		else if ntype != null and inherited_type == mtype then
 			if nexpr isa ANewExpr then
-				var xmtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type)
+				var xmtype = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, nexpr.n_type, true)
 				if xmtype == mtype then
 					modelbuilder.advice(ntype, "useless-type", "Warning: useless type definition")
 				end
@@ -933,13 +1248,15 @@ redef class AAttrPropdef
 		end
 
 		if mtype == null then
-			modelbuilder.error(self, "Error: Untyped attribute {mpropdef}")
+			modelbuilder.error(self, "Error: Untyped attribute {mreadpropdef}")
 			return
 		end
 
-		mpropdef.static_mtype = mtype
+		if mpropdef != null then
+			mpropdef.static_mtype = mtype
+		end
 
-		if mreadpropdef != null then
+		do
 			var msignature = new MSignature(new Array[MParameter], mtype)
 			mreadpropdef.msignature = msignature
 		end
@@ -967,6 +1284,18 @@ redef class AAttrPropdef
 		var mtype = self.mpropdef.static_mtype
 		if mtype == null then return # Error thus skipped
 
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
+
+		# Check types
+		if ntype != null then
+			if modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) == null then return
+		end
+		var nexpr = n_expr
+		if nexpr isa ANewExpr then
+			if modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type) == null then return
+		end
+
 		# Lookup for signature in the precursor
 		# FIXME all precursors should be considered
 		if not mpropdef.is_intro then
@@ -1030,21 +1359,20 @@ 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) or
-							not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then
-						var node: ANode
-						if nsig != null then node = nsig else node = self
+					var node: ANode
+					if nsig != null then node = nsig else node = self
+					if not modelbuilder.check_sametype(node, mmodule, mclassdef.bound_mtype, myt, prt) then
 						modelbuilder.error(node, "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt}.")
 					end
 				end
 			end
 			if precursor_ret_type != null then
+				var node: ANode
+				if nsig != null then node = nsig else node = self
 				if ret_type == null then
 					# Inherit the return type
 					ret_type = precursor_ret_type
-				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
+				else if not modelbuilder.check_subtype(node, mmodule, mclassdef.bound_mtype, ret_type, precursor_ret_type) then
 					modelbuilder.error(node, "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type}.")
 				end
 			end
@@ -1077,6 +1405,11 @@ redef class ATypePropdef
 		var mpropdef = new MVirtualTypeDef(mclassdef, mprop, self.location)
 		self.mpropdef = mpropdef
 		modelbuilder.mpropdef2npropdef[mpropdef] = self
+		if mpropdef.is_intro then
+			modelbuilder.toolcontext.info("{mpropdef} introduces new type {mprop.full_name}", 4)
+		else
+			modelbuilder.toolcontext.info("{mpropdef} redefines type {mprop.full_name}", 4)
+		end
 		set_doc(mpropdef, modelbuilder)
 
 		var atfixed = get_single_annotation("fixed", modelbuilder)
@@ -1094,7 +1427,7 @@ redef class ATypePropdef
 		var mtype: nullable MType = null
 
 		var ntype = self.n_type
-		mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
+		mtype = modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, ntype, true)
 		if mtype == null then return
 
 		mpropdef.bound = mtype
@@ -1106,7 +1439,7 @@ redef class ATypePropdef
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skipped
 
-		var bound = self.mpropdef.bound
+		var bound = mpropdef.bound
 		if bound == null then return # Error thus skipped
 
 		modelbuilder.check_visibility(n_type, bound, mpropdef)
@@ -1115,27 +1448,16 @@ redef class ATypePropdef
 		var mmodule = mclassdef.mmodule
 		var anchor = mclassdef.bound_mtype
 
-		# 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)
-				var next = bound.lookup_bound(mmodule, anchor)
-				if not next isa MVirtualType then break
-				bound = next
-			end
+		var ntype = self.n_type
+		if modelbuilder.resolve_mtype(mmodule, mclassdef, ntype) == null then
+			mpropdef.bound = null
+			return
 		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)
+			var supbound = p.bound
+			if supbound == null then break # broken super bound, skip error
 			if p.is_fixed then
 				modelbuilder.error(self, "Redef Error: Virtual type {mpropdef.mproperty} is fixed in super-class {p.mclassdef.mclass}")
 				break
@@ -1145,7 +1467,7 @@ redef class ATypePropdef
 				modelbuilder.warning(n_type, "refine-type", "Redef Error: a virtual type cannot be refined.")
 				break
 			end
-			if not bound.is_subtype(mmodule, anchor, supbound) then
+			if not modelbuilder.check_subtype(n_type, mmodule, anchor, bound, supbound) then
 				modelbuilder.error(n_type, "Redef Error: Wrong bound type. Found {bound}, expected a subtype of {supbound}, as in {p}.")
 				break
 			end