From: Jean Privat <jean@pryen.org>
Date: Wed, 8 Apr 2015 10:18:00 +0000 (+0700)
Subject: modelize classes: process AStdClassdef before
X-Git-Tag: v0.7.4~31^2~10
X-Git-Url: http://nitlanguage.org

modelize classes: process AStdClassdef before

So that non-AStdClassdef classes can be attached to existing ones if any

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/modelize/modelize_class.nit b/src/modelize/modelize_class.nit
index 5618c11..3c54891 100644
--- a/src/modelize/modelize_class.nit
+++ b/src/modelize/modelize_class.nit
@@ -311,7 +311,13 @@ redef class ModelBuilder
 		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
+			if not nclassdef isa AStdClassdef then continue
+			self.build_a_mclass(nmodule, nclassdef)
+		end
+		for nclassdef in nmodule.n_classdefs do
+			if nclassdef isa AStdClassdef then continue
 			self.build_a_mclass(nmodule, nclassdef)
 		end
 
@@ -319,6 +325,11 @@ redef class ModelBuilder
 
 		# Create all classdefs
 		for nclassdef in nmodule.n_classdefs do
+			if not nclassdef isa AStdClassdef then continue
+			self.build_a_mclassdef(nmodule, nclassdef)
+		end
+		for nclassdef in nmodule.n_classdefs do
+			if nclassdef isa AStdClassdef then continue
 			self.build_a_mclassdef(nmodule, nclassdef)
 		end