src: reduce warnings and spelling errors

[nit.git] / src / model / mmodule.nit

diff --git a/src/model/mmodule.nit b/src/model/mmodule.nit
index 490883b..923923a 100644 (file)
--- a/src/model/mmodule.nit
+++ b/src/model/mmodule.nit
@@ -25,19 +25,19 @@ private import more_collections
 # A model knows modules, classes and properties and can retrieve them.
 redef class Model
        # All known modules
-       var mmodules: Array[MModule] = new Array[MModule]
+       var mmodules = new Array[MModule]
 
        # placebo for old module nesting hierarchy.
        # where mainmodule < mainmodule::nestedmodule
        #
        # TODO REMOVE, rely on mgroup instead
-       var mmodule_nesting_hierarchy: POSet[MModule] = new POSet[MModule]
+       var mmodule_nesting_hierarchy = new POSet[MModule]
 
        # Full module importation hierarchy including private or nested links.
-       var mmodule_importation_hierarchy: POSet[MModule] = new POSet[MModule]
+       var mmodule_importation_hierarchy = new POSet[MModule]
 
        # Collections of modules grouped by their short names
-       private var mmodules_by_name: MultiHashMap[String, MModule] = new MultiHashMap[String, MModule]
+       private var mmodules_by_name = new MultiHashMap[String, MModule]
 
        # Return all module named `name`
        # If such a module does not exist, null is returned (instead of an empty array)
@@ -57,13 +57,12 @@ redef class MGroup
        # The loaded modules of this group
        var mmodules = new Array[MModule]
 
-       # Placebo stuff to find the owner (module with same name)
-       # null is returned if there is no owner, or if it is not loaded yet
-       fun fuzzy_owner: nullable MModule
-       do
-               for m in mmodules do if m.name == name then return m
-               return null
-       end
+       # The default module of a group (if any, and if loaded)
+       #
+       # The default module of a group is the one that has the same name.
+       # Return `null` if the group has no default module or if the default
+       # module is not loaded.
+       var default_mmodule: nullable MModule = null
 end
 
 # A Nit module is usually associated with a Nit source file.
@@ -73,12 +72,6 @@ class MModule
        # The model considered
        redef var model: Model
 
-       # placebo for old module nesting hierarchy
-       # return null if self is not nested (ie. is a top-level module)
-       #
-       # TODO REMOVE, rely on mgroup instead
-       var direct_owner: nullable MModule
-
        # The group of module in the project if any
        var mgroup: nullable MGroup
 
@@ -124,20 +117,22 @@ class MModule
                self.mgroup = mgroup
                if mgroup != null then
                        mgroup.mmodules.add(self)
+                       if mgroup.name == name then
+                               assert mgroup.default_mmodule == null
+                               mgroup.default_mmodule = self
+                       end
                        # placebo for old module nesting hierarchy
-                       var direct_owner = mgroup.fuzzy_owner
+                       var direct_owner = mgroup.default_mmodule
                        if direct_owner == self then
                                # The module is the new owner of its own group, thus adopt the other modules
                                for m in mgroup.mmodules do
                                        if m == self then continue
-                                       m.direct_owner = self
                                        model.mmodule_nesting_hierarchy.add_edge(self, m)
                                end
-                               # The potential owner is the the fuzzy_owner of the parent group
-                               if mgroup.parent != null then direct_owner = mgroup.parent.fuzzy_owner
+                               # The potential owner is the default_mmodule of the parent group
+                               if mgroup.parent != null then direct_owner = mgroup.parent.default_mmodule
                        end
                        if direct_owner != self and direct_owner != null then
-                               self.direct_owner = direct_owner
                                model.mmodule_nesting_hierarchy.add_edge(direct_owner, self)
                        end
                end
@@ -155,9 +150,9 @@ class MModule
                end
        end
 
-       private var intrude_mmodules: HashSet[MModule] = new HashSet[MModule]
-       private var public_mmodules: HashSet[MModule] = new HashSet[MModule]
-       private var private_mmodules: HashSet[MModule] = new HashSet[MModule]
+       private var intrude_mmodules = new HashSet[MModule]
+       private var public_mmodules = new HashSet[MModule]
+       private var private_mmodules = new HashSet[MModule]
 
        # Return the visibility level of an imported module `m`
        fun visibility_for(m: MModule): MVisibility
@@ -209,9 +204,9 @@ class MModule
                end
        end
 
-       # Is the mmodule created for internal purpose?
-       # Fictive module are instantied internally but they should not be
-       # exposed to the final user
+       # Is `self` created for internal purpose?
+       # Fictive modules are instantiated internally but they should not be
+       # exposed to the final user.
        var is_fictive: Bool = false is writable
 
        redef fun parent_concern do return mgroup