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

diff --git a/src/modelize_property.nit b/src/modelize_property.nit
index af15716..eed8e9d 100644
--- a/src/modelize_property.nit
+++ b/src/modelize_property.nit
@@ -28,6 +28,7 @@ private class ModelizePropertyPhase
 	redef fun process_nmodule(nmodule)
 	do
 		for nclassdef in nmodule.n_classdefs do
+			if nclassdef.all_defs == null then continue # skip non principal classdef
 			toolcontext.modelbuilder.build_properties(nclassdef)
 		end
 	end
@@ -48,17 +49,20 @@ redef class ModelBuilder
 		var mclassdef = nclassdef.mclassdef.as(not null)
 		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
 
-		for npropdef in nclassdef.n_propdefs do
-			npropdef.build_property(self, nclassdef)
-		end
-		for npropdef in nclassdef.n_propdefs do
-			npropdef.build_signature(self, nclassdef)
-		end
-		for npropdef in nclassdef.n_propdefs do
-			npropdef.check_signature(self, nclassdef)
+		for nclassdef2 in nclassdef.all_defs do
+			for npropdef in nclassdef2.n_propdefs do
+				npropdef.build_property(self, mclassdef)
+			end
+			for npropdef in nclassdef2.n_propdefs do
+				npropdef.build_signature(self)
+			end
+			for npropdef in nclassdef2.n_propdefs do
+				npropdef.check_signature(self)
+			end
 		end
 		process_default_constructors(nclassdef)
 	end
@@ -83,14 +87,14 @@ redef class ModelBuilder
 
 		if not nclassdef isa AStdClassdef then return
 
-		var mmodule = nclassdef.mclassdef.mmodule
+		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
 			var c = st.mclass
 			if not c.kind.need_init then continue
-			st = st.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype)
+			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)
@@ -105,41 +109,49 @@ redef class ModelBuilder
 				inhc = inhc2
 			end
 		end
+
+		# Collect undefined attributes
+		var mparameters = new Array[MParameter]
+		var anode: nullable ANode = null
+		for npropdef in nclassdef.n_propdefs do
+			if npropdef isa AAttrPropdef and npropdef.n_expr == null then
+				if npropdef.mpropdef == null then return # Skip broken attribute
+				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)
+				if anode == null then anode = npropdef
+			end
+		end
+		if anode == null then anode = nclassdef
+
 		if combine.is_empty and inhc != null then
+			if not mparameters.is_empty then
+				self.error(anode,"Error: {mclassdef} cannot inherit constructors from {inhc} because there is attributes without initial values: {mparameters.join(", ")}")
+				return
+			end
+
 			# TODO: actively inherit the consturctor
 			self.toolcontext.info("{mclassdef} inherits all constructors from {inhc}", 3)
 			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
-			nclassdef.super_inits = combine
-			var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility)
-			var mpropdef = new MMethodDef(mclassdef, mprop, nclassdef.location)
-			var mparameters = new Array[MParameter]
-			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
-
-		# Collect undefined attributes
-		var mparameters = new Array[MParameter]
-		for npropdef in nclassdef.n_propdefs do
-			if npropdef isa AAttrPropdef and npropdef.n_expr == null then
-				if npropdef.mpropdef == null then return # Skip broken attribute
-				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)
+			if mparameters.is_empty and combine.length == 1 then
+				# No need to create a local init, the inherited one is enough
+				inhc = combine.first.intro_mclassdef.mclass
+				mclassdef.mclass.inherit_init_from = inhc
+				self.toolcontext.info("{mclassdef} inherits all constructors from {inhc}", 3)
+				return
 			end
+			nclassdef.super_inits = combine
 		end
 
 		var mprop = new MMethod(mclassdef, "init", mclassdef.mclass.visibility)
@@ -150,6 +162,50 @@ redef class ModelBuilder
 		nclassdef.mfree_init = mpropdef
 		self.toolcontext.info("{mclassdef} gets a free constructor for attributes {mpropdef}{msignature}", 3)
 	end
+
+	# Check the visibility of `mtype` as an element of the signature of `mpropdef`.
+	fun check_visibility(node: ANode, mtype: MType, mpropdef: MPropDef)
+	do
+		var mmodule = mpropdef.mclassdef.mmodule
+		var mproperty = mpropdef.mproperty
+
+		# Extract visibility information of the main part of `mtype`
+		# 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
+		if mtype isa MClassType then
+			vis_type = mtype.mclass.visibility
+			mmodule_type = mtype.mclass.intro.mmodule
+		else if mtype isa MVirtualType then
+			vis_type = mtype.mproperty.visibility
+			mmodule_type = mtype.mproperty.intro_mclassdef.mmodule
+		else if mtype isa MParameterType then
+			# nothing, always visible
+		else
+			node.debug "Unexpected type {mtype}"
+			abort
+		end
+
+		if vis_type != null then
+			assert mmodule_type != null
+			var vis_module_type = mmodule.visibility_for(mmodule_type) # the visibility of the original module
+			if mproperty.visibility > vis_type then
+				error(node, "Error: The {mproperty.visibility} property `{mproperty}` cannot contain the {vis_type} type `{mtype}`")
+				return
+			else if mproperty.visibility > vis_module_type then
+				error(node, "Error: The {mproperty.visibility} property `{mproperty}` cannot contain the type `{mtype}` from the {vis_module_type} module `{mmodule_type}`")
+				return
+			end
+		end
+
+		# 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)
+		else if mtype isa MGenericType then
+			for t in mtype.arguments do check_visibility(node, t, mpropdef)
+		end
+	end
 end
 
 redef class MClass
@@ -158,6 +214,12 @@ redef class MClass
 	var inherit_init_from: nullable MClass = null
 end
 
+redef class MPropDef
+	# Does the MPropDef contains a call to super or a call of a super-constructor?
+	# Subsequent phases of the frontend (esp. typing) set it if required
+	var has_supercall: Bool writable = false
+end
+
 redef class AClassdef
 	var build_properties_is_done: Bool = false
 	# The list of super-constructor to call at the start of the free constructor
@@ -166,7 +228,9 @@ redef class AClassdef
 
 	# The free init (implicitely constructed by the class if required)
 	var mfree_init: nullable MMethodDef = null
+end
 
+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]
@@ -201,10 +265,10 @@ redef class APropdef
 	# The associated propdef once build by a `ModelBuilder`
 	var mpropdef: nullable MPROPDEF writable
 
-	private fun build_property(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
-	private fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
-	private fun check_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
-	private fun new_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility): MVisibility
+	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 new_property_visibility(modelbuilder: ModelBuilder, mclassdef: MClassDef, nvisibility: nullable AVisibility): MVisibility
 	do
 		var mvisibility = public_visibility
 		if nvisibility != null then
@@ -214,7 +278,7 @@ redef class APropdef
 				mvisibility = public_visibility
 			end
 		end
-		if nclassdef.mclassdef.mclass.visibility == private_visibility then
+		if mclassdef.mclass.visibility == private_visibility then
 			if mvisibility == protected_visibility then
 				assert nvisibility != null
 				modelbuilder.error(nvisibility, "Error: The only legal visibility for properties in a private class is private.")
@@ -228,7 +292,17 @@ redef class APropdef
 		return mvisibility
 	end
 
-	private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility, mprop: MProperty)
+	private fun set_doc(mpropdef: MPropDef)
+	do
+		var ndoc = self.n_doc
+		if ndoc != null then
+			var mdoc = ndoc.to_mdoc
+			mpropdef.mdoc = mdoc
+			mdoc.original_mentity = mpropdef
+		end
+	end
+
+	private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nvisibility: nullable AVisibility, mprop: MProperty)
 	do
 		if nvisibility == null then return
 		var mvisibility = nvisibility.mvisibility
@@ -237,20 +311,29 @@ redef class APropdef
 		end
 	end
 
-	private fun check_redef_keyword(modelbuilder: ModelBuilder, nclassdef: AClassdef, kwredef: nullable Token, need_redef: Bool, mprop: MProperty): Bool
+	private fun check_redef_keyword(modelbuilder: ModelBuilder, mclassdef: MClassDef, kwredef: nullable Token, need_redef: Bool, mprop: MProperty): Bool
 	do
-		if nclassdef.mprop2npropdef.has_key(mprop) then
-			modelbuilder.error(self, "Error: A property {mprop} is already defined in class {nclassdef.mclassdef.mclass}.")
+		if mclassdef.mprop2npropdef.has_key(mprop) then
+			modelbuilder.error(self, "Error: A property {mprop} is already defined in class {mclassdef.mclass} at line {mclassdef.mprop2npropdef[mprop].location.line_start}.")
+			return false
+		end
+		if mprop isa MMethod and mprop.is_toplevel != (parent isa ATopClassdef) then
+			if mprop.is_toplevel then
+				modelbuilder.error(self, "Error: {mprop} is a top level method.")
+			else
+				modelbuilder.error(self, "Error: {mprop} is not a top level method.")
+			end
 			return false
+
 		end
 		if kwredef == null then
 			if need_redef then
-				modelbuilder.error(self, "Redef error: {nclassdef.mclassdef.mclass}::{mprop.name} is an inherited property. To redefine it, add the redef keyword.")
+				modelbuilder.error(self, "Redef error: {mclassdef.mclass}::{mprop.name} is an inherited property. To redefine it, add the redef keyword.")
 				return false
 			end
 		else
 			if not need_redef then
-				modelbuilder.error(self, "Error: No property {nclassdef.mclassdef.mclass}::{mprop.name} is inherited. Remove the redef keyword to define a new property.")
+				modelbuilder.error(self, "Error: No property {mclassdef.mclass}::{mprop.name} is inherited. Remove the redef keyword to define a new property.")
 				return false
 			end
 		end
@@ -275,15 +358,16 @@ redef class ASignature
 	var ret_type: nullable MType = null
 
 	# Visit and fill information about a signature
-	private fun visit_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef): Bool
+	private fun visit_signature(modelbuilder: ModelBuilder, mclassdef: MClassDef): Bool
 	do
+		var mmodule = mclassdef.mmodule
 		var param_names = self.param_names
 		var param_types = self.param_types
 		for np in self.n_params do
 			param_names.add(np.n_id.text)
 			var ntype = np.n_type
 			if ntype != null then
-				var mtype = modelbuilder.resolve_mtype(nclassdef, ntype)
+				var mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
 				if mtype == null then return false # Skip error
 				for i in [0..param_names.length-param_types.length[ do
 					param_types.add(mtype)
@@ -300,20 +384,16 @@ redef class ASignature
 		end
 		var ntype = self.n_type
 		if ntype != null then
-			self.ret_type = modelbuilder.resolve_mtype(nclassdef, ntype)
+			self.ret_type = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
 			if self.ret_type == null then return false # Skip errir
 		end
 
-		for nclosure in self.n_closure_decls do
-			if not nclosure.n_signature.visit_signature(modelbuilder, nclassdef) then return false
-		end
-
 		self.is_visited = true
 		return true
 	end
 
 	# Build a visited signature
-	fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef): nullable MSignature
+	fun build_signature(modelbuilder: ModelBuilder): nullable MSignature
 	do
 		if param_names.length != param_types.length then
 			# Some parameters are typed, other parameters are not typed.
@@ -324,6 +404,7 @@ redef class ASignature
 		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)
 		end
 
@@ -332,28 +413,32 @@ redef class ASignature
 	end
 end
 
+redef class AParam
+	# The associated mparameter if any
+	var mparameter: nullable MParameter = null
+end
+
 redef class AMethPropdef
 	redef type MPROPDEF: MMethodDef
 
-	# The associated super init if any
-	var super_init: nullable MMethod
-	redef fun build_property(modelbuilder, nclassdef)
+	redef fun build_property(modelbuilder, mclassdef)
 	do
-		var is_init = self isa AInitPropdef
-		var mclassdef = nclassdef.mclassdef.as(not null)
+		var n_kwinit = n_kwinit
+		var n_kwnew = n_kwnew
+		var is_init = n_kwinit != null or n_kwnew != null
 		var name: String
 		var amethodid = self.n_methid
 		var name_node: ANode
 		if amethodid == null then
-			if self isa AMainMethPropdef then
+			if not is_init then
 				name = "main"
 				name_node = self
-			else if self isa AConcreteInitPropdef then
+			else if n_kwinit != null then
 				name = "init"
-				name_node = self.n_kwinit
-			else if self isa AExternInitPropdef then
+				name_node = n_kwinit
+			else if n_kwnew != null then
 				name = "init"
-				name_node = self.n_kwnew
+				name_node = n_kwnew
 			else
 				abort
 			end
@@ -373,25 +458,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 then
-			var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+			var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
 			mprop = new MMethod(mclassdef, name, mvisibility)
 			mprop.is_init = is_init
-			mprop.is_new = self isa AExternInitPropdef
-			if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mprop) then return
+			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 n_kwredef == null then
-				if self isa AMainMethPropdef then
-					# no warning
-				else
-					if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mprop) then return
-				end
-			end
-			check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
+			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
-		nclassdef.mprop2npropdef[mprop] = self
+		mclassdef.mprop2npropdef[mprop] = self
 
 		var mpropdef = new MMethodDef(mclassdef, mprop, self.location)
 
+		set_doc(mpropdef)
+
 		self.mpropdef = mpropdef
 		modelbuilder.mpropdef2npropdef[mpropdef] = self
 		if mpropdef.is_intro then
@@ -401,11 +483,12 @@ redef class AMethPropdef
 		end
 	end
 
-	redef fun build_signature(modelbuilder, nclassdef)
+	redef fun build_signature(modelbuilder)
 	do
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skiped
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var nsig = self.n_signature
 
 		# Retrieve info from the signature AST
@@ -414,7 +497,7 @@ redef class AMethPropdef
 		var vararg_rank = -1
 		var ret_type: nullable MType = null # Return type from the AST
 		if nsig != null then
-			if not nsig.visit_signature(modelbuilder, nclassdef) then return
+			if not nsig.visit_signature(modelbuilder, mclassdef) then return
 			param_names = nsig.param_names
 			param_types = nsig.param_types
 			vararg_rank = nsig.vararg_rank
@@ -437,8 +520,8 @@ redef class AMethPropdef
 			end
 		else if mpropdef.mproperty.is_init then
 			# FIXME UGLY: inherit signature from a super-constructor
-			for msupertype in nclassdef.mclassdef.supertypes do
-				msupertype = msupertype.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype)
+			for msupertype in mclassdef.supertypes do
+				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
 					if msignature == null then
@@ -471,29 +554,23 @@ redef class AMethPropdef
 		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)
+			if nsig != null then nsig.n_params[i].mparameter = mparameter
 			mparameters.add(mparameter)
 		end
 
 		msignature = new MSignature(mparameters, ret_type)
 		mpropdef.msignature = msignature
 		mpropdef.is_abstract = self isa ADeferredMethPropdef
-
-		if nsig != null then
-			for nclosure in nsig.n_closure_decls do
-				var clos_signature = nclosure.n_signature.build_signature(modelbuilder, nclassdef)
-				if clos_signature == null then return
-				var mparameter = new MParameter(nclosure.n_id.text, clos_signature, false)
-				msignature.mclosures.add(mparameter)
-			end
-		end
-
+		mpropdef.is_intern = self isa AInternMethPropdef
+		mpropdef.is_extern = self isa AExternPropdef
 	end
 
-	redef fun check_signature(modelbuilder, nclassdef)
+	redef fun check_signature(modelbuilder)
 	do
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skiped
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var nsig = self.n_signature
 		var mysignature = self.mpropdef.msignature
 		if mysignature == null then return # Error thus skiped
@@ -516,9 +593,9 @@ 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, nclassdef.mclassdef.bound_mtype, prt) and
-							not prt.is_subtype(mmodule, nclassdef.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}.")
+					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}.")
 					end
 				end
 			end
@@ -526,11 +603,21 @@ redef class AMethPropdef
 				if ret_type == null then
 					# Inherit the return type
 					ret_type = precursor_ret_type
-				else if not ret_type.is_subtype(mmodule, nclassdef.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}.")
+				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}.")
 				end
 			end
 		end
+
+		if mysignature.arity > 0 then
+			# Check parameters visibility
+			for i in [0..mysignature.arity[ do
+				var nt = nsig.n_params[i].n_type
+				if nt != null then modelbuilder.check_visibility(nt, nt.mtype.as(not null), mpropdef)
+			end
+			var nt = nsig.n_type
+			if nt != null then modelbuilder.check_visibility(nt, nt.mtype.as(not null), mpropdef)
+		end
 	end
 end
 
@@ -541,9 +628,8 @@ redef class AAttrPropdef
 	var mreadpropdef: nullable MMethodDef writable
 	# The associated setter (write accessor) if any
 	var mwritepropdef: nullable MMethodDef writable
-	redef fun build_property(modelbuilder, nclassdef)
+	redef fun build_property(modelbuilder, mclassdef)
 	do
-		var mclassdef = nclassdef.mclassdef.as(not null)
 		var mclass = mclassdef.mclass
 
 		var name: String
@@ -566,57 +652,25 @@ redef class AAttrPropdef
 			# Old attribute style
 			var mprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, name)
 			if mprop == null then
-				var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+				var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
 				mprop = new MAttribute(mclassdef, name, mvisibility)
-				if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return
+				if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, false, mprop) then return
 			else
 				assert mprop isa MAttribute
-				check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
-				if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return
+				check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
+				if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, true, mprop) then return
 			end
-			nclassdef.mprop2npropdef[mprop] = self
+			mclassdef.mprop2npropdef[mprop] = self
 
 			var mpropdef = new MAttributeDef(mclassdef, mprop, self.location)
 			self.mpropdef = mpropdef
 			modelbuilder.mpropdef2npropdef[mpropdef] = self
+			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, nclassdef, nreadable.n_visibility)
-					mreadprop = new MMethod(mclassdef, readname, mvisibility)
-					if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, false, mreadprop) then return
-				else
-					if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, true, mreadprop) then return
-					check_redef_property_visibility(modelbuilder, nclassdef, nreadable.n_visibility, mreadprop)
-				end
-				nclassdef.mprop2npropdef[mreadprop] = self
-
-				var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location)
-				self.mreadpropdef = mreadpropdef
-				modelbuilder.mpropdef2npropdef[mreadpropdef] = self
-			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, nclassdef, nwritable.n_visibility)
-					mwriteprop = new MMethod(mclassdef, writename, mvisibility)
-					if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, false, mwriteprop) then return
-				else
-					if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, true, mwriteprop) then return
-					check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop)
-				end
-				nclassdef.mprop2npropdef[mwriteprop] = self
-
-				var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
-				self.mwritepropdef = mwritepropdef
-				modelbuilder.mpropdef2npropdef[mwritepropdef] = self
-			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)
@@ -624,22 +678,24 @@ redef class AAttrPropdef
 			var mpropdef = new MAttributeDef(mclassdef, mprop, self.location)
 			self.mpropdef = mpropdef
 			modelbuilder.mpropdef2npropdef[mpropdef] = self
+			set_doc(mpropdef)
 
 			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, nclassdef, self.n_visibility)
+				var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
 				mreadprop = new MMethod(mclassdef, readname, mvisibility)
-				if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mreadprop) then return
+				if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mreadprop) then return
 			else
-				if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mreadprop) then return
-				check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mreadprop)
+				if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, true, mreadprop) then return
+				check_redef_property_visibility(modelbuilder, self.n_visibility, mreadprop)
 			end
-			nclassdef.mprop2npropdef[mreadprop] = self
+			mclassdef.mprop2npropdef[mreadprop] = self
 
 			var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location)
 			self.mreadpropdef = mreadpropdef
 			modelbuilder.mpropdef2npropdef[mreadpropdef] = self
+			mreadpropdef.mdoc = mpropdef.mdoc
 
 			var writename = name + "="
 			var nwritable = self.n_writable
@@ -649,44 +705,46 @@ redef class AAttrPropdef
 			if mwriteprop == null then
 				var mvisibility
 				if nwritable != null then
-					mvisibility = new_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility)
+					mvisibility = new_property_visibility(modelbuilder, mclassdef, nwritable.n_visibility)
 				else
 					mvisibility = private_visibility
 				end
 				mwriteprop = new MMethod(mclassdef, writename, mvisibility)
-				if not self.check_redef_keyword(modelbuilder, nclassdef, nwkwredef, false, mwriteprop) then return
+				if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, false, mwriteprop) then return
 			else
-				if not self.check_redef_keyword(modelbuilder, nclassdef, nwkwredef, true, mwriteprop) then return
+				if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, true, mwriteprop) then return
 				if nwritable != null then
-					check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop)
+					check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop)
 				end
 			end
-			nclassdef.mprop2npropdef[mwriteprop] = self
+			mclassdef.mprop2npropdef[mwriteprop] = self
 
 			var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
 			self.mwritepropdef = mwritepropdef
 			modelbuilder.mpropdef2npropdef[mwritepropdef] = self
+			mwritepropdef.mdoc = mpropdef.mdoc
 		end
 	end
 
-	redef fun build_signature(modelbuilder, nclassdef)
+	redef fun build_signature(modelbuilder)
 	do
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skiped
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var mtype: nullable MType = null
 
 		var ntype = self.n_type
 		if ntype != null then
-			mtype = modelbuilder.resolve_mtype(nclassdef, ntype)
+			mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
 			if mtype == null then return
 		end
 
+		var nexpr = self.n_expr
 		if mtype == null then
-			var nexpr = self.n_expr
 			if nexpr != null then
 				if nexpr isa ANewExpr then
-					mtype = modelbuilder.resolve_mtype(nclassdef, nexpr.n_type)
+					mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, nexpr.n_type)
 				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
@@ -712,6 +770,14 @@ redef class AAttrPropdef
 			else
 				modelbuilder.error(self, "Error: Untyped attribute {mpropdef}")
 			end
+		else
+			assert ntype != null
+			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
+					modelbuilder.warning(ntype, "Warning: useless type definition")
+				end
+			end
 		end
 
 		if mtype == null then return
@@ -738,11 +804,12 @@ redef class AAttrPropdef
 		end
 	end
 
-	redef fun check_signature(modelbuilder, nclassdef)
+	redef fun check_signature(modelbuilder)
 	do
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skiped
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var ntype = self.n_type
 		var mtype = self.mpropdef.static_mtype
 		if mtype == null then return # Error thus skiped
@@ -761,14 +828,25 @@ redef class AAttrPropdef
 
 		# Check getter and setter
 		var meth = self.mreadpropdef
-		if meth != null then self.check_method_signature(modelbuilder, nclassdef, meth)
+		if meth != null then
+			self.check_method_signature(modelbuilder, meth)
+			var node: nullable ANode = ntype
+			if node == null then node = self
+			modelbuilder.check_visibility(node, mtype, meth)
+		end
 		meth = self.mwritepropdef
-		if meth != null then self.check_method_signature(modelbuilder, nclassdef, meth)
+		if meth != null then
+			self.check_method_signature(modelbuilder, meth)
+			var node: nullable ANode = ntype
+			if node == null then node = self
+			modelbuilder.check_visibility(node, mtype, meth)
+		end
 	end
 
-	private fun check_method_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef, mpropdef: MMethodDef)
+	private fun check_method_signature(modelbuilder: ModelBuilder, mpropdef: MMethodDef)
 	do
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var nsig = self.n_type
 		var mysignature = mpropdef.msignature
 		if mysignature == null then return # Error thus skiped
@@ -799,8 +877,8 @@ 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, nclassdef.mclassdef.bound_mtype, prt) and
-							not prt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, myt) then
+					if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) and
+							not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then
 						var node: ANode
 						if nsig != null then node = nsig else node = self
 						modelbuilder.error(node, "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt}.")
@@ -811,7 +889,7 @@ redef class AAttrPropdef
 				if ret_type == null then
 					# Inherit the return type
 					ret_type = precursor_ret_type
-				else if not ret_type.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, precursor_ret_type) then
+				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
 					modelbuilder.error(node, "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type}.")
@@ -824,50 +902,63 @@ end
 redef class ATypePropdef
 	redef type MPROPDEF: MVirtualTypeDef
 
-	redef fun build_property(modelbuilder, nclassdef)
+	redef fun build_property(modelbuilder, mclassdef)
 	do
-		var mclassdef = nclassdef.mclassdef.as(not null)
 		var name = self.n_id.text
 		var mprop = modelbuilder.try_get_mproperty_by_name(self.n_id, mclassdef, name)
 		if mprop == null then
-			var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+			var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
 			mprop = new MVirtualTypeProp(mclassdef, name, mvisibility)
-			if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return
+			for c in name.chars do if c >= 'a' and c<= 'z' then
+				modelbuilder.warning(n_id, "Warning: lowercase in the virtual type {name}")
+				break
+			end
+			if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, false, mprop) then return
 		else
-			if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return
+			if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, true, mprop) then return
 			assert mprop isa MVirtualTypeProp
-			check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
+			check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
 		end
-		nclassdef.mprop2npropdef[mprop] = self
+		mclassdef.mprop2npropdef[mprop] = self
 
 		var mpropdef = new MVirtualTypeDef(mclassdef, mprop, self.location)
 		self.mpropdef = mpropdef
+		modelbuilder.mpropdef2npropdef[mpropdef] = self
+		set_doc(mpropdef)
 	end
 
-	redef fun build_signature(modelbuilder, nclassdef)
+	redef fun build_signature(modelbuilder)
 	do
 		var mpropdef = self.mpropdef
 		if mpropdef == null then return # Error thus skiped
-		var mmodule = mpropdef.mclassdef.mmodule
+		var mclassdef = mpropdef.mclassdef
+		var mmodule = mclassdef.mmodule
 		var mtype: nullable MType = null
 
 		var ntype = self.n_type
-		mtype = modelbuilder.resolve_mtype(nclassdef, ntype)
+		mtype = modelbuilder.resolve_mtype(mmodule, mclassdef, ntype)
 		if mtype == null then return
 
 		mpropdef.bound = mtype
 		# print "{mpropdef}: {mtype}"
 	end
 
-	redef fun check_signature(modelbuilder, nclassdef)
+	redef fun check_signature(modelbuilder)
 	do
+		var mpropdef = self.mpropdef
+		if mpropdef == null then return # Error thus skiped
+
 		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
 
-		var mmodule = nclassdef.mclassdef.mmodule
-		var anchor = nclassdef.mclassdef.bound_mtype
+		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]
@@ -879,7 +970,7 @@ redef class ATypePropdef
 			end
 			seen.add(bound)
 			var next = bound.lookup_bound(mmodule, anchor)
-			if not next isa MVirtualType then return
+			if not next isa MVirtualType then break
 			bound = next
 		end
 	end