rta: improve code for methods of classes

[nit.git] / src / metrics / nullables_metrics.nit

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index 76e9b43..6992ff8 100644 (file)
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -37,18 +37,19 @@ private class NullablesMetricsPhase
 
                print toolcontext.format_h1("\n# Nullable metrics")
 
+               var model = toolcontext.modelbuilder.model
+               var model_view = model.private_view
+
                var metrics = new MetricSet
-               var min_vis = private_visibility
-               metrics.register(new CNBA(mainmodule, min_vis))
-               metrics.register(new CNBNA(mainmodule, min_vis))
+               metrics.register(new CNBA(mainmodule, model_view))
+               metrics.register(new CNBNA(mainmodule, model_view))
 
-               var model = toolcontext.modelbuilder.model
                var mclasses = new HashSet[MClass]
-               for mproject in model.mprojects do
+               for mpackage in model.mpackages do
 
-                       print toolcontext.format_h2("\n ## project {mproject}")
+                       print toolcontext.format_h2("\n ## package {mpackage}")
 
-                       for mgroup in mproject.mgroups do
+                       for mgroup in mpackage.mgroups do
                                if mgroup.mmodules.is_empty then continue
                                metrics.clear
 
@@ -84,16 +85,16 @@ class CNBNA
        redef fun desc do return "number of accessible nullable attributes (inherited + local)"
 
        var mainmodule: MModule
-       var min_visibility: MVisibility
+       var model_view: ModelView
 
-       init(mainmodule: MModule, min_visibility: MVisibility) do
+       init(mainmodule: MModule, model_view: ModelView) do
                self.mainmodule = mainmodule
-               self.min_visibility = min_visibility
+               self.model_view = model_view
        end
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       var all = mclass.collect_accessible_mattributes(min_visibility)
+                       var all = mclass.collect_accessible_mattributes(model_view)
                        for mattr in all do
                                if mattr.is_nullable then values.inc(mclass)
                        end
@@ -140,8 +141,8 @@ private class NullableSends
                        end
                        t = t.anchor_to(self.nclassdef.mclassdef.mmodule, self.nclassdef.mclassdef.bound_mtype)
                        if t isa MNullableType then
-                               var name = n.callsite.mproperty.name
-                               if name == "==" or name == "!=" or name == "is_same_instance" then
+                               var p = n.callsite.mproperty
+                               if p.is_null_safe then
                                        self.nullable_eq_sends += 1
                                else
                                        self.nullable_sends += 1