niti, nitg & rta: use lookup_first_definition

[nit.git] / src / naive_interpreter.nit

diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index a1b524a..4818e57 100644 (file)
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -415,16 +415,7 @@ private class NaiveInterpreter
                        fatal("Reciever is null")
                        abort
                end
-               var propdefs = mproperty.lookup_definitions(self.mainmodule, mtype)
-               if propdefs.length > 1 then
-                       fatal("NOT YET IMPLEMETED ERROR: Property conflict: {propdefs.join(", ")}")
-                       abort
-               end
-               assert propdefs.length == 1 else
-                       fatal("Fatal Error: No property '{mproperty}' for '{recv}'")
-                       abort
-               end
-               var propdef = propdefs.first
+               var propdef = mproperty.lookup_first_definition(self.mainmodule, mtype)
                return self.call(propdef, args)
        end
 
@@ -1602,6 +1593,7 @@ redef class AAttrExpr
        do
                var recv = v.expr(self.n_expr)
                if recv == null then return null
+               if recv.mtype isa MNullType then fatal(v, "Reciever is null")
                var mproperty = self.mproperty.as(not null)
                return v.read_attribute(mproperty, recv)
        end
@@ -1612,6 +1604,7 @@ redef class AAttrAssignExpr
        do
                var recv = v.expr(self.n_expr)
                if recv == null then return
+               if recv.mtype isa MNullType then fatal(v, "Reciever is null")
                var i = v.expr(self.n_value)
                if i == null then return
                var mproperty = self.mproperty.as(not null)
@@ -1625,6 +1618,7 @@ redef class AAttrReassignExpr
        do
                var recv = v.expr(self.n_expr)
                if recv == null then return
+               if recv.mtype isa MNullType then fatal(v, "Reciever is null")
                var value = v.expr(self.n_value)
                if value == null then return
                var mproperty = self.mproperty.as(not null)
@@ -1641,6 +1635,7 @@ redef class AIssetAttrExpr
        do
                var recv = v.expr(self.n_expr)
                if recv == null then return null
+               if recv.mtype isa MNullType then fatal(v, "Reciever is null")
                var mproperty = self.mproperty.as(not null)
                assert recv isa MutableInstance
                return v.bool_instance(recv.attributes.has_key(mproperty))