From: Jean Privat <jean@pryen.org>
Date: Thu, 11 Jun 2009 19:02:49 +0000 (-0400)
Subject: metamodel: Check global_class existence instead of getting null
X-Git-Tag: v0.3~274
X-Git-Url: http://nitlanguage.org

metamodel: Check global_class existence instead of getting null

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

diff --git a/src/metamodel/inheritance.nit b/src/metamodel/inheritance.nit
index 9988426..870f266 100644
--- a/src/metamodel/inheritance.nit
+++ b/src/metamodel/inheritance.nit
@@ -47,7 +47,7 @@ redef class MMModule
 	meth import_local_classes
 	do
 		for g in _global_classes do
-			if self[g] != null then continue
+			if _local_class_by_global.has_key(g) then continue
 			var impl = new MMImplicitLocalClass(self, g) 
 		end
 	end
diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index db15e8b..1f71787 100644
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -526,13 +526,10 @@ redef class PClassdef
 			local_class = new MMSrcLocalClass(name, self, arity)
 			mod.add_local_class(local_class)
 			local_classes[name] = local_class
-			var g = mod.global_class_named(name)
-			if g == null then
-				# Intro
+			if not mod.has_global_class_named(name) then
 				local_class.new_global
-				g = local_class.global
 			else
-				local_class.set_global(g)
+				local_class.set_global(mod.global_class_named(name))
 			end
 
 		end