Merge: type works: handle implicitly fixed formal parameters

[nit.git] / src / typing.nit

diff --git a/src/typing.nit b/src/typing.nit
index 5db0ada..8dee027 100644 (file)
--- a/src/typing.nit
+++ b/src/typing.nit
@@ -191,7 +191,7 @@ private class TypeVisitor
 
                if sup == sub then
                        self.modelbuilder.warning(node, "Warning: Expression is already a {sup}.")
-               else if self.is_subtype(sub, sup) and not sup.need_anchor then
+               else if self.is_subtype(sub, sup) then
                        self.modelbuilder.warning(node, "Warning: Expression is already a {sup} since it is a {sub}.")
                end
                return sup
@@ -252,7 +252,7 @@ private class TypeVisitor
 
                assert mproperty isa MMethod
 
-               if is_toplevel_context and recv_is_self and not mproperty.is_toplevel and name != "sys" and name != "exit" and name != "args" then
+               if is_toplevel_context and recv_is_self and not mproperty.is_toplevel and name != "sys" and name != "exit" then
                        # FIXME named methods are here as a workaround
                        error(node, "Error: '{name}' is not a top-level method, thus need a receiver.")
                end
@@ -1081,7 +1081,7 @@ redef class ASuperstringExpr
                if mclass == null then return # Forward error
                self.mtype = mclass.mclass_type
                for nexpr in self.n_exprs do
-                       var t = v.visit_expr(nexpr)
+                       v.visit_expr_subtype(nexpr, v.mmodule.object_type)
                end
        end
 end
@@ -1194,6 +1194,8 @@ redef class AAsNotnullExpr
        redef fun accept_typing(v)
        do
                var mtype = v.visit_expr(self.n_expr)
+               if mtype == null then return # Forward error
+
                if mtype isa MNullType then
                        v.error(self, "Type error: as(not null) on null")
                        return
@@ -1202,8 +1204,18 @@ redef class AAsNotnullExpr
                        self.mtype = mtype.mtype
                        return
                end
-               # TODO: warn on useless as not null
                self.mtype = mtype
+
+               if mtype isa MClassType then
+                       v.modelbuilder.warning(self, "Warning: expression is already not null, since it is a `{mtype}`.")
+                       return
+               end
+               assert mtype.need_anchor
+               var u = v.anchor_to(mtype)
+               if not u isa MNullableType then
+                       v.modelbuilder.warning(self, "Warning: expression is already not null, since it is a `{mtype}: {u}`.")
+                       return
+               end
        end
 end