X-Git-Url: http://nitlanguage.org

diff --git a/src/metrics/detect_covariance.nit b/src/metrics/detect_covariance.nit
index 1ab719b..643679a 100644
--- a/src/metrics/detect_covariance.nit
+++ b/src/metrics/detect_covariance.nit
@@ -204,7 +204,7 @@ private class DetectCovariancePhase
 
 		## ONLY covariance remains here
 
-		cpt_modules.inc(mmodule.mgroup.mproject.name)
+		cpt_modules.inc(mmodule.mgroup.mpackage.name)
 		cpt_classes.inc(sub.mclass)
 
 		# Track if `cpt_explanations` is already decided (used to fallback on unknown)
@@ -318,7 +318,7 @@ redef class TypeVisitor
 
 	fun dcp: DetectCovariancePhase do return modelbuilder.toolcontext.detect_covariance_phase
 
-	redef fun visit_expr_cast(node, nexpr, ntype)
+	redef fun check_expr_cast(node, nexpr, ntype)
 	do
 		var sub = super
 
@@ -350,7 +350,6 @@ redef class TypeVisitor
 		if dcp.is_disabled then return res
 
 		var anchor = self.anchor
-		assert anchor != null
 		var supx = sup
 		var subx = sub
 		var p = node.parent.as(not null)
@@ -394,10 +393,15 @@ redef class TypeVisitor
 
 		if node isa AArrayExpr then
 			dcp.cpt_explanations.inc("lit-array")
-		else if p isa ACallExpr and (p.n_id.text == "sort" or p.n_id.text == "linearize_mpropdefs") then
-			dcp.cpt_explanations.inc("generic methods (sort-method)")
-		else if p isa ACallExpr and p.n_id.text == "visit_list" then
-			dcp.cpt_explanations.inc("use-site covariance (visit_list-method)")
+		else if p isa ACallExpr then
+			var name = p.n_qid.n_id.text
+			if name == "sort" or name == "linearize_mpropdefs" then
+				dcp.cpt_explanations.inc("generic methods (sort-method)")
+			else if name == "visit_list" then
+				dcp.cpt_explanations.inc("use-site covariance (visit_list-method)")
+			else
+				dcp.cpt_explanations.inc("other covariance")
+			end
 		else
 			dcp.cpt_explanations.inc("other covariance")
 		end