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

diff --git a/src/modelize/modelize_class.nit b/src/modelize/modelize_class.nit
index 3503bd0..fa1fddb 100644
--- a/src/modelize/modelize_class.nit
+++ b/src/modelize/modelize_class.nit
@@ -99,11 +99,11 @@ redef class ModelBuilder
 				return
 			end
 
-			# Check for conflicting class full-names in the project
+			# Check for conflicting class full-names in the package
 			if mmodule.mgroup != null and mvisibility >= protected_visibility then
 				var mclasses = model.get_mclasses_by_name(name)
 				if mclasses != null then for other in mclasses do
-					if other.intro_mmodule.mgroup != null and other.intro_mmodule.mgroup.mproject == mmodule.mgroup.mproject then
+					if other.intro_mmodule.mgroup != null and other.intro_mmodule.mgroup.mpackage == mmodule.mgroup.mpackage then
 						# Skip classes that are buggy
 						if other.try_intro == null then continue
 						warning(nclassdef, "full-name-conflict", "Error: a class named `{other.full_name}` is already defined in module `{other.intro_mmodule}` at {other.intro.location}.")
@@ -116,12 +116,15 @@ redef class ModelBuilder
 			#print "new class {mclass}"
 		else if nclassdef isa AStdClassdef and nmodule.mclass2nclassdef.has_key(mclass) then
 			error(nclassdef, "Error: a class `{name}` is already defined at line {nmodule.mclass2nclassdef[mclass].location.line_start}.")
+			mclass.is_broken = true
 			return
 		else if nclassdef isa AStdClassdef and nclassdef.n_kwredef == null then
 			error(nclassdef, "Redef Error: `{name}` is an imported class. Add the `redef` keyword to refine it.")
+			mclass.is_broken = true
 			return
 		else if arity != 0 and mclass.arity != arity then
 			error(nclassdef, "Redef Error: expected {mclass.arity} formal parameter(s) for {mclass.signature_to_s}; got {arity}.")
+			mclass.is_broken = true
 			return
 		else if nkind != null and mkind != concrete_kind and mclass.kind != mkind then
 			error(nkind, "Redef Error: refinement changed the kind from `{mclass.kind}` to `{mkind}`.")
@@ -298,7 +301,6 @@ redef class ModelBuilder
 	# REQUIRE: classes of imported modules are already build. (let `phase` do the job)
 	private fun build_classes(nmodule: AModule)
 	do
-		var errcount = toolcontext.error_count
 		# Force building recursively
 		if nmodule.build_classes_is_done then return
 		nmodule.build_classes_is_done = true
@@ -309,8 +311,6 @@ redef class ModelBuilder
 			if nimp != null then build_classes(nimp)
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Create all classes
 		# process AStdClassdef before so that non-AStdClassdef classes can be attached to existing ones, if any
 		for nclassdef in nmodule.n_classdefs do
@@ -322,8 +322,6 @@ redef class ModelBuilder
 			self.build_a_mclass(nmodule, nclassdef)
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Create all classdefs
 		for nclassdef in nmodule.n_classdefs do
 			if not nclassdef isa AStdClassdef then continue
@@ -334,29 +332,21 @@ redef class ModelBuilder
 			self.build_a_mclassdef(nmodule, nclassdef)
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Create inheritance on all classdefs
 		for nclassdef in nmodule.n_classdefs do
 			self.collect_a_mclassdef_inheritance(nmodule, nclassdef)
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Create the mclassdef hierarchy
 		for mclassdef in mmodule.mclassdefs do
 			mclassdef.add_in_hierarchy
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Check inheritance
 		for nclassdef in nmodule.n_classdefs do
 			self.check_supertypes(nmodule, nclassdef)
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Check unchecked ntypes
 		for nclassdef in nmodule.n_classdefs do
 			if nclassdef isa AStdClassdef then
@@ -380,8 +370,6 @@ redef class ModelBuilder
 			end
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# Check clash of ancestors
 		for nclassdef in nmodule.n_classdefs do
 			var mclassdef = nclassdef.mclassdef
@@ -402,13 +390,11 @@ redef class ModelBuilder
 			end
 		end
 
-		if errcount != toolcontext.error_count then return
-
 		# TODO: Check that the super-class is not intrusive
 
 		# Check that the superclasses are not already known (by transitivity)
 		for nclassdef in nmodule.n_classdefs do
-			if not nclassdef isa AStdClassdef then continue
+			if not nclassdef isa AStdClassdef or nclassdef.is_broken then continue
 			var mclassdef = nclassdef.mclassdef
 			if mclassdef == null then continue
 
@@ -448,6 +434,14 @@ redef class ModelBuilder
 
 	# Registration of the nclassdef associated to each mclassdef
 	private var mclassdef2nclassdef = new HashMap[MClassDef, AClassdef]
+
+	# Retrieve the associated AST node of a mclassdef.
+	#
+	# This method is used to associate model entity with syntactic entities.
+	# If the class definition is not associated with a node, returns `null`.
+	fun mclassdef2node(mclassdef: MClassDef): nullable AClassdef do
+		return mclassdef2nclassdef.get_or_null(mclassdef)
+	end
 end
 
 redef class AModule