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

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 476608c..da8d02e 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -383,16 +383,18 @@ class NaiveInterpreter
 		assert args.length == mpropdef.msignature.arity + 1 else debug("Invalid arity for {mpropdef}. {args.length} arguments given.")
 
 		# Look for the AST node that implements the property
-		var mproperty = mpropdef.mproperty
 		var val = mpropdef.constant_value
-		if self.modelbuilder.mpropdef2npropdef.has_key(mpropdef) then
-			var npropdef = self.modelbuilder.mpropdef2npropdef[mpropdef]
-			self.parameter_check(npropdef, mpropdef, args)
-			return npropdef.call(self, mpropdef, args)
-		else if mproperty.is_root_init then
-			var nclassdef = self.modelbuilder.mclassdef2nclassdef[mpropdef.mclassdef]
-			self.parameter_check(nclassdef, mpropdef, args)
-			return nclassdef.call(self, mpropdef, args)
+
+		var node = modelbuilder.mpropdef2node(mpropdef)
+		if node isa APropdef then
+			self.parameter_check(node, mpropdef, args)
+			return node.call(self, mpropdef, args)
+		else if node isa AClassdef then
+			self.parameter_check(node, mpropdef, args)
+			return node.call(self, mpropdef, args)
+		else if node != null then
+			fatal("Fatal Error: method {mpropdef} associated to unexpected AST node {node.location}")
+			abort
 		else if val != null then
 			return value_instance(val)
 		else