model: fix some warnings

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/model/mmodule.nit b/src/model/mmodule.nit
index 1232352..4cdd340 100644 (file)
--- a/src/model/mmodule.nit
+++ b/src/model/mmodule.nit
@@ -75,7 +75,7 @@ class MModule
        super MConcern
 
        # The model considered
-       redef var model: Model
+       redef var model
 
        # The group of module in the package if any
        var mgroup: nullable MGroup
@@ -98,9 +98,9 @@ class MModule
        end
 
        # The short name of the module
-       redef var name: String
+       redef var name
 
-       redef var location: Location is writable
+       redef var location is writable
 
        # Alias for `name`
        redef fun to_s do return self.name
@@ -144,7 +144,7 @@ class MModule
 
        # Return the name of the global C identifier associated to `self`.
        # This name is used to prefix files and other C identifiers associated with `self`.
-       redef var c_name: String is lazy do
+       redef var c_name is lazy do
                var g = mgroup
                var res
                if g != null and g.mpackage.name != name then

diff --git a/src/model/model.nit b/src/model/model.nit
index a94f5e4..3733566 100644 (file)
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -603,7 +603,7 @@ class MClassDef
        # ENSURE: `bound_mtype.mclass == self.mclass`
        var bound_mtype: MClassType
 
-       redef var location: Location
+       redef var location
 
        redef fun visibility do return mclass.visibility
 

diff --git a/src/model/mpackage.nit b/src/model/mpackage.nit
index 8309b5a..bb6856b 100644 (file)
--- a/src/model/mpackage.nit
+++ b/src/model/mpackage.nit
@@ -25,14 +25,14 @@ class MPackage
        super MConcern
 
        # The name of the package
-       redef var name: String
+       redef var name
 
        redef fun full_name do return name
 
        redef var c_name = name.to_cmangle is lazy
 
        # The model of the package
-       redef var model: Model
+       redef var model
 
        redef var location
 
@@ -55,8 +55,11 @@ class MPackage
 
        redef fun mdoc_or_fallback
        do
+               var mdoc = self.mdoc
                if mdoc != null then return mdoc
-               return root.mdoc_or_fallback
+               var root = self.root
+               if root != null then return root.mdoc_or_fallback
+               return null
        end
 end
 
@@ -66,7 +69,7 @@ class MGroup
 
        # The name of the group
        # empty name for a default group in a single-module package
-       redef var name: String
+       redef var name
 
        redef var location