Merge: model_collect: add services for module importation

Build a new hierarchy poset from MClass inheritance

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

Pull-Request: #2123
Reviewed-by: Jean Privat <jean@pryen.org>

diff --git a/src/model/model_collect.nit b/src/model/model_collect.nit
index 2590b0d..79970e5 100644 (file)
--- a/src/model/model_collect.nit
+++ b/src/model/model_collect.nit
@@ -112,8 +112,6 @@ redef class MModule
                var mmodules = new HashSet[MModule]
                mmodules.add self
                mmodules.add_all collect_ancestors(view)
-               mmodules.add_all collect_parents(view)
-               mmodules.add_all collect_children(view)
                mmodules.add_all collect_descendants(view)
                return view.mmodules_poset(mmodules)
        end
@@ -220,6 +218,15 @@ redef class MClass
                return res
        end
 
+       # Build a class hierarchy poset for `self` based on its ancestors and descendants.
+       fun hierarchy_poset(mainmodule: MModule, view: ModelView): POSet[MClass] do
+               var mclasses = new HashSet[MClass]
+               mclasses.add self
+               mclasses.add_all collect_ancestors(view)
+               mclasses.add_all collect_descendants(view)
+               return view.mclasses_poset(mainmodule, mclasses)
+       end
+
        # Collect all mproperties introduced in 'self' with `visibility >= min_visibility`.
        fun collect_intro_mproperties(view: ModelView): Set[MProperty] do
                var set = new HashSet[MProperty]