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

diff --git a/src/modelize_class.nit b/src/modelize_class.nit
index 688ee7a..219cbb6 100644
--- a/src/modelize_class.nit
+++ b/src/modelize_class.nit
@@ -76,6 +76,10 @@ redef class ModelBuilder
 
 		var mclass = try_get_mclass_by_name(nclassdef, mmodule, name)
 		if mclass == null then
+			if nclassdef isa AStdClassdef and nclassdef.n_kwredef != null then
+				error(nclassdef, "Redef error: No imported class {name} to refine.")
+				return
+			end
 			mclass = new MClass(mmodule, name, arity, mkind, mvisibility)
 			#print "new class {mclass}"
 		else if nclassdef isa AStdClassdef and nmodule.mclass2nclassdef.has_key(mclass) then
@@ -116,7 +120,7 @@ redef class ModelBuilder
 					error(nfd, "Error: A formal parameter type `{ptname}' already exists")
 					return
 				end
-				for c in ptname do if c >= 'a' and c<= 'z' then
+				for c in ptname.chars do if c >= 'a' and c<= 'z' then
 					warning(nfd, "Warning: lowercase in the formal parameter type {ptname}")
 					break
 				end
@@ -129,7 +133,7 @@ redef class ModelBuilder
 				var nfd = nclassdef.n_formaldefs[i]
 				var nfdt = nfd.n_type
 				if nfdt != null then
-					var bound = resolve_mtype_unchecked(nclassdef, nfdt, false)
+					var bound = resolve_mtype_unchecked(mmodule, null, nfdt, false)
 					if bound == null then return # Forward error
 					if bound.need_anchor then
 						# No F-bounds!
@@ -157,6 +161,11 @@ redef class ModelBuilder
 		nclassdef.mclassdef = mclassdef
 		self.mclassdef2nclassdef[mclassdef] = nclassdef
 
+		if nclassdef isa AStdClassdef then
+			var ndoc = nclassdef.n_doc
+			if ndoc != null then mclassdef.mdoc = ndoc.to_mdoc
+		end
+
 		if mclassdef.is_intro then
 			self.toolcontext.info("{mclassdef} introduces new {mclass.kind} {mclass.full_name}", 3)
 		else
@@ -173,30 +182,39 @@ redef class ModelBuilder
 		var mclass = nclassdef.mclass.as(not null)
 		var mclassdef = nclassdef.mclassdef.as(not null)
 
+		# Do we need to specify Object as a super class?
 		var specobject = true
+
+		# Do we need to specify Pointer as a super class? (is only valid
+		# if `nclassdef` is an extern class)
+		var specpointer = true
+
 		var supertypes = new Array[MClassType]
 		if nclassdef isa AStdClassdef then
 			for nsc in nclassdef.n_superclasses do
 				specobject = false
 				var ntype = nsc.n_type
-				var mtype = resolve_mtype_unchecked(nclassdef, ntype, false)
+				var mtype = resolve_mtype_unchecked(mmodule, mclassdef, ntype, false)
 				if mtype == null then continue # Skip because of error
 				if not mtype isa MClassType then
 					error(ntype, "Error: supertypes cannot be a formal type")
 					return
 				end
+				if not mclass.kind.can_specialize(mtype.mclass.kind) then
+					error(ntype, "Error: {mclass.kind} {mclass} cannot specialize {mtype.mclass.kind} {mtype.mclass}")
+				end
 				supertypes.add mtype
 				#print "new super : {mclass} < {mtype}"
+				if mtype.mclass.kind == extern_kind then specpointer = false
 			end
 		end
-		if specobject and mclassdef.is_intro then
-			if mclass.kind == extern_kind then
-				if mclass.name == "Pointer" then
-					supertypes.add objectclass.mclass_type
-				else
-					supertypes.add pointerclass.mclass_type
-				end
-			else if mclass.name != "Object" and objectclass != null then
+
+		if mclassdef.is_intro and objectclass != null then
+			if mclass.kind == extern_kind and mclass.name != "Pointer" then
+				# it is an extern class, but not a Pointer
+				if specpointer then supertypes.add pointerclass.mclass_type
+			else if specobject and mclass.name != "Object" then
+				# it is a standard class without super class (but is not Object)
 				supertypes.add objectclass.mclass_type
 			end
 		end
@@ -275,11 +293,12 @@ redef class ModelBuilder
 		# Check unchecked ntypes
 		for nclassdef in nmodule.n_classdefs do
 			if nclassdef isa AStdClassdef then
+				var mclassdef = nclassdef.mclassdef
 				# check bound of formal parameter
 				for nfd in  nclassdef.n_formaldefs do
 					var nfdt = nfd.n_type
 					if nfdt != null and nfdt.mtype != null then
-						var bound = resolve_mtype(nclassdef, nfdt)
+						var bound = resolve_mtype(mmodule, mclassdef, nfdt)
 						if bound == null then return # Forward error
 					end
 				end
@@ -287,7 +306,7 @@ redef class ModelBuilder
 				for nsc in nclassdef.n_superclasses do
 					var ntype = nsc.n_type
 					if ntype.mtype != null then
-						var mtype = resolve_mtype(nclassdef, ntype)
+						var mtype = resolve_mtype(mmodule, mclassdef, ntype)
 						if mtype == null then return # Forward error
 					end
 				end
@@ -360,15 +379,12 @@ redef class ModelBuilder
 	var mclassdef2nclassdef: HashMap[MClassDef, AClassdef] = new HashMap[MClassDef, AClassdef]
 
 	# Return the static type associated to the node `ntype`.
-	# `nclassdef` is the context where the call is made (used to understand formal types)
-	# The mmodule used as context is `nclassdef.mmodule`
+	# `mmodule` and `mclassdef` is the context where the call is made (used to understand formal types)
 	# In case of problem, an error is displayed on `ntype` and null is returned.
 	# FIXME: the name "resolve_mtype" is awful
-	fun resolve_mtype_unchecked(nclassdef: AClassdef, ntype: AType, with_virtual: Bool): nullable MType
+	fun resolve_mtype_unchecked(mmodule: MModule, mclassdef: nullable MClassDef, ntype: AType, with_virtual: Bool): nullable MType
 	do
 		var name = ntype.n_id.text
-		var mclassdef = nclassdef.mclassdef
-		var mmodule = nclassdef.parent.as(AModule).mmodule.as(not null)
 		var res: MType
 
 		# Check virtual type
@@ -423,7 +439,7 @@ redef class ModelBuilder
 			else
 				var mtypes = new Array[MType]
 				for nt in ntype.n_types do
-					var mt = resolve_mtype_unchecked(nclassdef, nt, with_virtual)
+					var mt = resolve_mtype_unchecked(mmodule, mclassdef, nt, with_virtual)
 					if mt == null then return null # Forward error
 					mtypes.add(mt)
 				end
@@ -440,27 +456,26 @@ redef class ModelBuilder
 	end
 
 	# Return the static type associated to the node `ntype`.
-	# `nclassdef` is the context where the call is made (used to understand formal types)
-	# The mmodule used as context is `nclassdef.mmodule`
+	# `mmodule` and `mclassdef` is the context where the call is made (used to understand formal types)
 	# In case of problem, an error is displayed on `ntype` and null is returned.
 	# FIXME: the name "resolve_mtype" is awful
-	fun resolve_mtype(nclassdef: AClassdef, ntype: AType): nullable MType
+	fun resolve_mtype(mmodule: MModule, mclassdef: nullable MClassDef, ntype: AType): nullable MType
 	do
 		var mtype = ntype.mtype
-		if mtype == null then mtype = resolve_mtype_unchecked(nclassdef, ntype, true)
+		if mtype == null then mtype = resolve_mtype_unchecked(mmodule, mclassdef, ntype, true)
 		if mtype == null then return null # Forward error
 
 		if ntype.checked_mtype then return mtype
 		if mtype isa MGenericType then
-			var mmodule = nclassdef.parent.as(AModule).mmodule.as(not null)
-			var mclassdef = nclassdef.mclassdef
 			var mclass = mtype.mclass
 			for i in [0..mclass.arity[ do
 				var bound = mclass.intro.bound_mtype.arguments[i]
 				var nt = ntype.n_types[i]
-				var mt = resolve_mtype(nclassdef, nt)
+				var mt = resolve_mtype(mmodule, mclassdef, nt)
 				if mt == null then return null # forward error
-				if not mt.is_subtype(mmodule, mclassdef.bound_mtype, bound) then
+				var anchor
+				if mclassdef != null then anchor = mclassdef.bound_mtype else anchor = null
+				if not mt.is_subtype(mmodule, anchor, bound) then
 					error(nt, "Type error: expected {bound}, got {mt}")
 					return null
 				end