From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Mon, 10 Dec 2012 21:06:07 +0000 (-0500)
Subject: nitmetrics: fix is_user_defined for modules.
X-Git-Tag: v0.6~81^2~9
X-Git-Url: http://nitlanguage.org

nitmetrics: fix is_user_defined for modules.

This solution is a workaround based on a static module list, this is quitte uggly and need to be fixed with better module hierarchy exploration

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

diff --git a/src/metrics/inheritance_metrics.nit b/src/metrics/inheritance_metrics.nit
index f9b0b15..45ba136 100644
--- a/src/metrics/inheritance_metrics.nit
+++ b/src/metrics/inheritance_metrics.nit
@@ -22,6 +22,35 @@ private import metrics_base
 
 redef class Model
 
+	# List of modules in std lib
+	# FIXME this is quite ugly, find a dynamic way...
+	fun std_modules: Set[String] do
+		if self.std_modules_cache == null then
+			self.std_modules_cache = new HashSet[String]
+			self.std_modules_cache.add("collection")
+			self.std_modules_cache.add("abstract_collection")
+			self.std_modules_cache.add("array")
+			self.std_modules_cache.add("hash_collection")
+			self.std_modules_cache.add("list")
+			self.std_modules_cache.add("range")
+			self.std_modules_cache.add("sorter")
+			self.std_modules_cache.add("environ")
+			self.std_modules_cache.add("exec")
+			self.std_modules_cache.add("file")
+			self.std_modules_cache.add("gc")
+			self.std_modules_cache.add("hash")
+			self.std_modules_cache.add("kernel")
+			self.std_modules_cache.add("math")
+			self.std_modules_cache.add("standard")
+			self.std_modules_cache.add("stream")
+			self.std_modules_cache.add("string")
+			self.std_modules_cache.add("string_search")
+			self.std_modules_cache.add("time")
+		end
+		return self.std_modules_cache.as(not null)
+	end
+	private var std_modules_cache: nullable Set[String]
+
 	# Extract the subset of classes from a set of mclass
 	fun extract_classes(mclasses: Collection[MClass]): Set[MClass] do
 		var lst = new HashSet[MClass]
@@ -79,12 +108,6 @@ redef class Model
 	end
 end
 
-redef class MModule
-	private fun is_user_defined: Bool do
-		return self.public_owner == null or self.public_owner.name != "standard"
-	end
-end
-
 redef class MClass
 	# Inheritance
 	private var nop: Int = 0		# (NOP) Number of parents (direct superclasses)
@@ -169,8 +192,7 @@ redef class MClass
 	end
 
 	private fun is_user_defined: Bool do
-		var mod = self.intro_mmodule.public_owner
-		return mod == null or mod.name != "standard"
+		return self.intro_mmodule.is_user_defined
 	end
 
 	# Get parents of the class (direct super classes only)
@@ -531,6 +553,12 @@ redef class MClass
 
 end
 
+redef class MModule
+	private fun is_user_defined: Bool do
+		return not self.model.std_modules.has(self.name)
+	end
+end
+
 # Print inheritance usage metrics
 fun compute_inheritance_metrics(toolcontext: ToolContext, model: Model)
 do