src: mass rename project->package

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

diff --git a/src/model/mmodule.nit b/src/model/mmodule.nit
index 659660b..7e2e9b3 100644 (file)
--- a/src/model/mmodule.nit
+++ b/src/model/mmodule.nit
@@ -18,7 +18,7 @@
 module mmodule
 
 import location
-import mproject
+import mpackage
 private import more_collections
 
 # The container class of a Nit object-oriented model.
@@ -73,15 +73,15 @@ class MModule
        # The model considered
        redef var model: Model
 
-       # The group of module in the project if any
+       # The group of module in the package if any
        var mgroup: nullable MGroup
 
-       # The project of the module if any
-       # Safe alias for `mgroup.mproject`
-       fun mproject: nullable MProject
+       # The package of the module if any
+       # Safe alias for `mgroup.mpackage`
+       fun mpackage: nullable MPackage
        do
                var g = mgroup
-               if g == null then return null else return g.mproject
+               if g == null then return null else return g.mpackage
        end
 
        # The short name of the module
@@ -98,24 +98,24 @@ class MModule
 
        # The canonical name of the module.
        #
-       # It is usually the `name` prefixed by the project's name.
-       # Example: `"project::name"`
+       # It is usually the `name` prefixed by the package's name.
+       # Example: `"package::name"`
        #
-       # If both names are the same (of if the module is project-less), then
+       # If both names are the same (of if the module is package-less), then
        # the short-name is used alone.
        redef var full_name is lazy do
                var mgroup = self.mgroup
-               if mgroup == null or mgroup.mproject.name == self.name then
+               if mgroup == null or mgroup.mpackage.name == self.name then
                        return self.name
                else
-                       return "{mgroup.mproject.name}::{self.name}"
+                       return "{mgroup.mpackage.name}::{self.name}"
                end
        end
 
        # The namespace used for entities according to their visibility `v`.
        #
-       # Public entities use only the project as a namespace.
-       # Private entities use the `full_name` (i.e. "project::module")
+       # Public entities use only the package as a namespace.
+       # Private entities use the `full_name` (i.e. "package::module")
        #
        # This method is used by entities to implement their `full_name`.
        fun namespace_for(v: MVisibility): String do
@@ -124,7 +124,7 @@ class MModule
                if mgroup == null then
                        return full_name
                else
-                       return mgroup.mproject.full_name
+                       return mgroup.mpackage.full_name
                end
        end
 
@@ -133,8 +133,8 @@ class MModule
        redef var c_name: String is lazy do
                var g = mgroup
                var res
-               if g != null and g.mproject.name != name then
-                       res = g.mproject.name.to_cmangle + "__" + name.to_cmangle
+               if g != null and g.mpackage.name != name then
+                       res = g.mpackage.name.to_cmangle + "__" + name.to_cmangle
                else
                        res = name.to_cmangle
                end
@@ -151,7 +151,7 @@ class MModule
                if mgroup == null then
                        return c_name
                else
-                       return mgroup.mproject.c_name
+                       return mgroup.mpackage.c_name
                end
        end