nitc: fix error in constructor inheritance

[nit.git] / src / syntax / typing.nit

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index c3ef59c..863d41e 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -441,7 +441,13 @@ redef class AVardeclExpr
                        end
                else if ne != null then
                        if not v.check_expr(ne) then return
-                       va.stype = ne.stype
+                       var st = ne.stype
+                       if st isa MMTypeNone then
+                               va.stype = v.type_object.as_nullable
+                               v.flow_ctx = v.flow_ctx.sub_with(self, va, st)
+                       else
+                               va.stype = st
+                       end
                else
                        va.stype = v.type_object.as_nullable
                end
@@ -1556,7 +1562,7 @@ redef class AAbsSendExpr
                var lc = type_recv.local_class
                var prop: nullable MMMethod = null
                if lc.has_global_property_by_name(name) then prop = lc.select_method(name)
-               if prop == null and v.local_property.global.is_init then
+               if prop == null then
                        var props = lc.super_methods_named(name)
                        if props.length > 1 then
                                v.error(self, "Error: Ambigous method name '{name}' for {props.join(", ")}. Use explicit designation.")
@@ -1658,6 +1664,10 @@ redef class ANewExpr
                        v.error(self, "Error: {prop} is not a constructor.")
                        return
                end
+               if not prop.global.is_init_for(t.local_class) then
+                       v.error(self, "Error: {prop} is not a constructor in {t.local_class}.")
+                       return
+               end
                _stype = t
                _is_typed = true
        end
@@ -2049,7 +2059,7 @@ abstract class ATypeCheckExpr
                if etype == ttype then
                        v.warning(self, "Warning: Expression is already a {ttype}.")
                else if etype < ttype then
-                       if not ttype isa MMTypeFormal then
+                       if not ttype.has_formal and not etype.has_formal then
                                # the old metamodel is not that great with formal types
                                v.warning(self, "Warning: Expression is already a {ttype} since it is a {etype}.")
                        end