ni: replaced Comparable sorters with specific sorters introduced in model_utils

[nit.git] / src / model_utils.nit

diff --git a/src/model_utils.nit b/src/model_utils.nit
index 2591da1..7bb9d2f 100644 (file)
--- a/src/model_utils.nit
+++ b/src/model_utils.nit
@@ -17,8 +17,7 @@
 # Model exploration and traversing facilities
 module model_utils
 
-import toolcontext
-import exprbuilder
+import modelbuilder
 
 redef class MModule
        # Get the list of mclasses refined in 'self'.
@@ -39,19 +38,20 @@ redef class MModule
                end
                return mclasses
        end
-
-       # Get all mclasses in 'self' with their state
-       fun mclasses: HashMap[MClass, Int] do
-               var mclasses = new HashMap[MClass, Int]
-               for c in intro_mclasses do mclasses[c] = c_is_intro
-               for r in redef_mclasses do mclasses[r] = c_is_refined
-               for i in imported_mclasses do mclasses[i] = c_is_imported
-               return mclasses
-       end
 end
 
 redef class MClass
 
+       # Get the public owner of 'self'.
+       fun public_owner: MModule do
+               var public_owner = self.intro_mmodule.public_owner
+               if public_owner == null then
+                       return self.intro_mmodule
+               else
+                       return public_owner
+               end
+       end
+
        # Get direct parents of 'self'.
        fun parents: Set[MClass] do
                var ret = new HashSet[MClass]
@@ -213,31 +213,6 @@ redef class MClass
                return res
        end
 
-       fun mmodules: Set[MModule] do
-               var mdls = new HashSet[MModule]
-               for mclassdef in mclassdefs do mdls.add(mclassdef.mmodule)
-               return mdls
-       end
-
-       # Get the list of MModule concern in 'self'
-       fun concerns: HashMap[MModule, nullable List[MModule]] do
-               var hm = new HashMap[MModule, nullable List[MModule]]
-               for mmodule in mmodules do
-                       var owner = mmodule.public_owner
-                       if owner == null then
-                               hm[mmodule] = null
-                       else
-                               if hm.has_key(owner) then
-                                       hm[owner].add(mmodule)
-                               else
-                                       hm[owner] = new List[MModule]
-                                       hm[owner].add(mmodule)
-                               end
-                       end
-               end
-               return hm
-       end
-
        fun is_class: Bool do
                return self.kind == concrete_kind or self.kind == abstract_kind
        end
@@ -255,7 +230,32 @@ redef class MClass
        end
 end
 
-# MClass State
-fun c_is_intro: Int do return 1
-fun c_is_refined: Int do return 2
-fun c_is_imported: Int do return 3
+# Sorters
+
+# Sort mmodules by their name
+class MModuleNameSorter
+       super AbstractSorter[MModule]
+       redef fun compare(a, b) do return a.name <=> b.name
+       init do end
+end
+
+# Sort mclasses by their name
+class MClassNameSorter
+       super AbstractSorter[MClass]
+       redef fun compare(a, b) do return a.name <=> b.name
+       init do end
+end
+
+# Sort mproperties by their name
+class MPropertyNameSorter
+       super AbstractSorter[MProperty]
+       redef fun compare(a, b) do return a.name <=> b.name
+       init do end
+end
+
+# Sort mpropdefs by their name
+class MPropDefNameSorter
+       super AbstractSorter[MPropDef]
+       redef fun compare(a, b) do return a.mproperty.name <=> b.mproperty.name
+       init do end
+end