Merge branch 'killclosures' into killnitc

[nit.git] / src / naive_interpreter.nit

diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index 0c6c5ed..d2ccbce 100644 (file)
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -170,7 +170,7 @@ private class NaiveInterpreter
                var implicit_cast_to = n.implicit_cast_to
                if implicit_cast_to != null then
                        var mtype = self.unanchor_type(implicit_cast_to)
-                       if not self.is_subtype(i.mtype, mtype) then n.fatal(self, "Cast failed")
+                       if not self.is_subtype(i.mtype, mtype) then n.fatal(self, "Cast failed. Expected `{implicit_cast_to}`, got `{i.mtype}`")
                end
 
                #n.debug("OUT Execute expr: value is {i}")
@@ -376,9 +376,9 @@ private class NaiveInterpreter
                        # get the parameter type
                        var mtype = msignature.mparameters[i].mtype
                        var anchor = args.first.mtype.as(MClassType)
-                       mtype = mtype.anchor_to(self.mainmodule, anchor)
-                       if not args[i+1].mtype.is_subtype(self.mainmodule, anchor, mtype) then
-                               node.fatal(self, "Cast failed")
+                       var amtype = mtype.anchor_to(self.mainmodule, anchor)
+                       if not args[i+1].mtype.is_subtype(self.mainmodule, anchor, amtype) then
+                               node.fatal(self, "Cast failed. Expected `{mtype}`, got `{args[i+1].mtype}`")
                        end
                end
        end
@@ -986,7 +986,7 @@ end
 redef class ADeferredMethPropdef
        redef fun call(v, mpropdef, args)
        do
-               fatal(v, "Deferred method called")
+               fatal(v, "Abstract method `{mpropdef.mproperty.name}` called on `{args.first.mtype}`")
                abort
        end
 end
@@ -1467,10 +1467,10 @@ redef class AAsCastExpr
        do
                var i = v.expr(self.n_expr)
                if i == null then return null
-               var mtype = v.unanchor_type(self.mtype.as(not null))
-               if not v.is_subtype(i.mtype, mtype) then
-                       #fatal(v, "Cast failed expected {mtype}, got {i}")
-                       fatal(v, "Cast failed")
+               var mtype = self.mtype.as(not null)
+               var amtype = v.unanchor_type(mtype)
+               if not v.is_subtype(i.mtype, amtype) then
+                       fatal(v, "Cast failed. Expected `{amtype}`, got `{i.mtype}`")
                end
                return i
        end