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

diff --git a/src/modelize/modelize_property.nit b/src/modelize/modelize_property.nit
index cb56d38..faaf149 100644
--- a/src/modelize/modelize_property.nit
+++ b/src/modelize/modelize_property.nit
@@ -40,6 +40,21 @@ redef class ModelBuilder
 	# FIXME: why not refine the `MPropDef` class with a nullable attribute?
 	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 node.
+	fun mpropdef2node(mpropdef: MPropDef): nullable ANode
+	do
+		var res: nullable ANode = mpropdef2npropdef.get_or_null(mpropdef)
+		if res != null then return res
+		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
+
 	# Build the properties of `nclassdef`.
 	# REQUIRE: all superclasses are built.
 	private fun build_properties(nclassdef: AClassdef)
@@ -54,6 +69,7 @@ redef class ModelBuilder
 			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)
@@ -174,7 +190,8 @@ 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`?")
+			toolcontext.error(nclassdef.location, "Error: {mclassdef} does not specialize {the_root_init_mmethod.intro_mclassdef}. Possible duplication of the root class `Object`?")
+			return
 		end
 
 		# Search the longest-one and checks for conflict
@@ -310,6 +327,50 @@ 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]
+
+	# Build the virtual type `SELF` only for introduction `MClassDef`
+	fun build_self_type(modelbuilder: ModelBuilder, nclassdef: AClassdef)
+	do
+		if not is_intro then return
+
+		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
 
 redef class APropdef
@@ -573,7 +634,7 @@ redef class AMethPropdef
 			mprop.is_init = is_init
 			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
+			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
 			check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
@@ -900,11 +961,13 @@ redef class AAttrPropdef
 			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 mreadpropdef != null and 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 mtype == null then mtype = inherited_type
 		end
 
 		var nexpr = self.n_expr
@@ -936,7 +999,7 @@ redef class AAttrPropdef
 
 				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)
 				if xmtype == mtype then
@@ -1148,7 +1211,8 @@ redef class ATypePropdef
 		# 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