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

diff --git a/src/model/model.nit b/src/model/model.nit
index f69f4c4..a0f8c43 100644
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -216,6 +216,9 @@ redef class MModule
 
 	private var object_type_cache: nullable MClassType
 
+	# The type `Pointer`, super class to all extern classes
+	var pointer_type: MClassType = self.get_primitive_class("Pointer").mclass_type is lazy
+
 	# The primitive type `Bool`
 	fun bool_type: MClassType
 	do
@@ -236,6 +239,13 @@ redef class MModule
 		return get_primitive_class("Sys").mclass_type
 	end
 
+	fun finalizable_type: nullable MClassType
+	do
+		var clas = self.model.get_mclasses_by_name("Finalizable")
+		if clas == null then return null
+		return get_primitive_class("Finalizable").mclass_type
+	end
+
 	# Force to get the primitive class named `name` or abort
 	fun get_primitive_class(name: String): MClass
 	do
@@ -1302,7 +1312,13 @@ class MParameterType
 		#print "{class_name}: {self}/{mtype}/{anchor}?"
 
 		if mtype isa MGenericType and mtype.mclass == self.mclass then
-			return mtype.arguments[self.rank]
+			var res = mtype.arguments[self.rank]
+			if anchor != null and res.need_anchor then
+				# Maybe the result can be resolved more if are bound to a final class
+				var r2 = res.anchor_to(mmodule, anchor)
+				if r2 isa MClassType and r2.mclass.kind == enum_kind then return r2
+			end
+			return res
 		end
 
 		# self is a parameter type of mtype (or of a super-class of mtype)
@@ -1647,7 +1663,7 @@ abstract class MProperty
 	fun lookup_definitions(mmodule: MModule, mtype: MType): Array[MPROPDEF]
 	do
 		assert not mtype.need_anchor
-		if mtype isa MNullableType then mtype = mtype.mtype
+		mtype = mtype.as_notnullable
 
 		var cache = self.lookup_definitions_cache[mmodule, mtype]
 		if cache != null then return cache
@@ -1686,7 +1702,7 @@ abstract class MProperty
 	fun lookup_super_definitions(mmodule: MModule, mtype: MType): Array[MPROPDEF]
 	do
 		assert not mtype.need_anchor
-		if mtype isa MNullableType then mtype = mtype.mtype
+		mtype = mtype.as_notnullable
 
 		# First, select all candidates
 		var candidates = new Array[MPROPDEF]
@@ -1763,7 +1779,7 @@ abstract class MProperty
 	fun lookup_all_definitions(mmodule: MModule, mtype: MType): Array[MPROPDEF]
 	do
 		assert not mtype.need_anchor
-		if mtype isa MNullableType then mtype = mtype.mtype
+		mtype = mtype.as_notnullable
 
 		var cache = self.lookup_all_definitions_cache[mmodule, mtype]
 		if cache != null then return cache
@@ -1814,6 +1830,9 @@ class MMethod
 	# therefore, you should use `is_init_for` the verify if the property is a legal constructor for a given class
 	var is_init: Bool writable = false
 
+	# The constructor is a (the) root init with empty signature but a set of initializers
+	var is_root_init: Bool writable = false
+
 	# The the property a 'new' contructor?
 	var is_new: Bool writable = false
 
@@ -1932,6 +1951,19 @@ class MMethodDef
 	# The signature attached to the property definition
 	var msignature: nullable MSignature writable = null
 
+	# The signature attached to the `new` call on a root-init
+	# This is a concatenation of the signatures of the initializers
+	#
+	# REQUIRE `mproperty.is_root_init == (new_msignature != null)`
+	var new_msignature: nullable MSignature writable = null
+
+	# List of initialisers to call in root-inits
+	#
+	# They could be setters or attributes
+	#
+	# REQUIRE `mproperty.is_root_init == (new_msignature != null)`
+	var initializers = new Array[MProperty]
+
 	# Is the method definition abstract?
 	var is_abstract: Bool writable = false