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

diff --git a/src/model/model.nit b/src/model/model.nit
index ad1c325..629dadb 100644
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -32,6 +32,7 @@ module model
 import poset
 import location
 import mmodule
+import mdoc
 private import more_collections
 
 redef class Model
@@ -222,7 +223,12 @@ redef class MModule
 			print("Fatal Error: no primitive class {name}")
 			exit(1)
 		end
-		assert cla.length == 1 else print cla.join(", ")
+		if cla.length != 1 then
+			var msg = "Fatal Error: more than one primitive class {name}:"
+			for c in cla do msg += " {c.full_name}"
+			print msg
+			exit(1)
+		end
 		return cla.first
 	end
 
@@ -287,6 +293,8 @@ end
 # belong to a hierarchy since the property and the
 # hierarchy of a class depends of a module.
 class MClass
+	super MEntity
+
 	# The module that introduce the class
 	# While classes are not bound to a specific module,
 	# the introducing module is used for naming an visibility
@@ -412,6 +420,8 @@ end
 # class. Unlike `MClass`, a `MClassDef` is a local definition that belong to
 # a specific module
 class MClassDef
+	super MEntity
+
 	# The module where the definition is
 	var mmodule: MModule
 
@@ -542,6 +552,7 @@ end
 #  * foo(anchor, mmodule, othertype)
 #  * foo(othertype, mmodule, anchor)
 abstract class MType
+	super MEntity
 
 	# The model of the type
 	fun model: Model is abstract
@@ -1412,7 +1423,7 @@ class MSignature
 
 	redef fun to_s
 	do
-		var b = new Buffer
+		var b = new FlatBuffer
 		if not mparameters.is_empty then
 			b.append("(")
 			for i in [0..mparameters.length[ do
@@ -1461,6 +1472,15 @@ class MParameter
 	# Is the parameter a vararg?
 	var is_vararg: Bool
 
+	redef fun to_s
+	do
+		if is_vararg then
+			return "{name}: {mtype}..."
+		else
+			return "{name}: {mtype}"
+		end
+	end
+
 	fun resolve_for(mtype: MType, anchor: nullable MClassType, mmodule: MModule, cleanup_virtual: Bool): MParameter
 	do
 		if not self.mtype.need_anchor then return self
@@ -1482,6 +1502,8 @@ end
 # of any dynamic type).
 # For instance, a call site "x.foo" is associated to a `MProperty`.
 abstract class MProperty
+	super MEntity
+
 	# The associated MPropDef subclass.
 	# The two specialization hierarchy are symmetric.
 	type MPROPDEF: MPropDef
@@ -1745,6 +1767,7 @@ end
 # Unlike `MProperty`, a `MPropDef` is a local definition that belong to a
 # specific class definition (which belong to a specific module)
 abstract class MPropDef
+	super MEntity
 
 	# The associated `MProperty` subclass.
 	# the two specialization hierarchy are symmetric
@@ -1813,8 +1836,14 @@ class MMethodDef
 	# The signature attached to the property definition
 	var msignature: nullable MSignature writable = null
 
-	# The the method definition abstract?
+	# Is the method definition abstract?
 	var is_abstract: Bool writable = false
+
+	# Is the method definition intern?
+	var is_intern writable = false
+
+	# Is the method definition extern?
+	var is_extern writable = false
 end
 
 # A local definition of an attribute
@@ -1869,10 +1898,28 @@ class MClassKind
 		self.to_s = s
 		self.need_init = need_init
 	end
+
+	# Can a class of kind `self` specializes a class of kine `other`?
+	fun can_specialize(other: MClassKind): Bool
+	do
+		if other == interface_kind then return true # everybody can specialize interfaces
+		if self == interface_kind or self == enum_kind then
+			# no other case for interfaces
+			return false
+		else if self == extern_kind then
+			# only compatible with themselve
+			return self == other
+		else if other == enum_kind or other == extern_kind then
+			# abstract_kind and concrete_kind are incompatible
+			return false
+		end
+		# remain only abstract_kind and concrete_kind
+		return true
+	end
 end
 
 fun abstract_kind: MClassKind do return once new MClassKind("abstract class", true)
 fun concrete_kind: MClassKind do return once new MClassKind("class", true)
 fun interface_kind: MClassKind do return once new MClassKind("interface", false)
 fun enum_kind: MClassKind do return once new MClassKind("enum", false)
-fun extern_kind: MClassKind do return once new MClassKind("extern", false)
+fun extern_kind: MClassKind do return once new MClassKind("extern class", false)