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

diff --git a/src/modelize/modelize_class.nit b/src/modelize/modelize_class.nit
index b7fd877..79cab6e 100644
--- a/src/modelize/modelize_class.nit
+++ b/src/modelize/modelize_class.nit
@@ -168,6 +168,10 @@ redef class ModelBuilder
 						warning(nfdt, "useless-bound", "Warning: Useless formal parameter type since `{bound}` cannnot have subclasses.")
 					end
 				else if mclass.mclassdefs.is_empty then
+					if objectclass == null then
+						error(nfd, "Error: Formal parameter type `{pname}' unbounded but no Object class exist.")
+						return
+					end
 					# No bound, then implicitely bound by nullable Object
 					var bound = objectclass.mclass_type.as_nullable
 					bounds.add(bound)
@@ -258,7 +262,6 @@ redef class ModelBuilder
 	private fun check_supertypes(nmodule: AModule, nclassdef: AClassdef)
 	do
 		var mmodule = nmodule.mmodule.as(not null)
-		var objectclass = try_get_mclass_by_name(nmodule, mmodule, "Object")
 		var mclass = nclassdef.mclass.as(not null)
 		var mclassdef = nclassdef.mclassdef.as(not null)
 
@@ -410,7 +413,7 @@ redef class ModelBuilder
 
 	# Register the nclassdef associated to each mclassdef
 	# FIXME: why not refine the `MClassDef` class with a nullable attribute?
-	var mclassdef2nclassdef: HashMap[MClassDef, AClassdef] = new HashMap[MClassDef, AClassdef]
+	var mclassdef2nclassdef = new HashMap[MClassDef, AClassdef]
 
 	# Return the static type associated to the node `ntype`.
 	# `mmodule` and `mclassdef` is the context where the call is made (used to understand formal types)
@@ -436,19 +439,19 @@ redef class ModelBuilder
 		end
 
 		# Check parameter type
-		if mclassdef != null and mclassdef.parameter_names.has(name) then
-			if not ntype.n_types.is_empty then
-				error(ntype, "Type error: formal type {name} cannot have formal parameters.")
-			end
-			for i in [0..mclassdef.parameter_names.length[ do
-				if mclassdef.parameter_names[i] == name then
-					res = mclassdef.mclass.mclass_type.arguments[i]
-					if ntype.n_kwnullable != null then res = res.as_nullable
-					ntype.mtype = res
-					return res
+		if mclassdef != null then
+			for p in mclassdef.mclass.mparameters do
+				if p.name != name then continue
+
+				if not ntype.n_types.is_empty then
+					error(ntype, "Type error: formal type {name} cannot have formal parameters.")
 				end
+
+				res = p
+				if ntype.n_kwnullable != null then res = res.as_nullable
+				ntype.mtype = res
+				return res
 			end
-			abort
 		end
 
 		# Check class