Merge: Functional api

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

diff --git a/src/metrics/static_types_metrics.nit b/src/metrics/static_types_metrics.nit
index aa4f1ef..45c429b 100644 (file)
--- a/src/metrics/static_types_metrics.nit
+++ b/src/metrics/static_types_metrics.nit
@@ -51,9 +51,12 @@ private class ATypeCounterVisitor
 
        redef fun visit(n)
        do
-               if n isa AType then
+               if n isa AAnnotation then return
+
+               if n isa AType then do
                        var mclassdef = self.nclassdef.mclassdef
-                       var mtype = modelbuilder.resolve_mtype(mclassdef.mmodule, mclassdef, n)
+                       if mclassdef == null then break
+                       var mtype = modelbuilder.resolve_mtype(mclassdef, n)
                        if mtype != null then
                                self.typecount.inc(mtype)
                        end