model: make MClass::intro public

It is better than write `mclassdefs.first`.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/model/model.nit b/src/model/model.nit
index dbd16c7..635d34a 100644 (file)
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -295,7 +295,7 @@ class MClass
        # Warning: the introduction is the first `MClassDef' object associated
        # to self.  If self is just created without having any associated
        # definition, this method will abort
-       private fun intro: MClassDef
+       fun intro: MClassDef
        do
                assert has_a_first_definition: not mclassdefs.is_empty
                return mclassdefs.first

diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index 1295816..ca6ed92 100644 (file)
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -517,7 +517,7 @@ class ModelBuilder
                                        bounds.add(objectclass.mclass_type.as_nullable)
                                else
                                        # Inherit the bound
-                                       bounds.add(mclass.mclassdefs.first.bound_mtype.arguments[i])
+                                       bounds.add(mclass.intro.bound_mtype.arguments[i])
                                end
                        end
                end

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 67bd3f6..cec5e78 100644 (file)
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -573,7 +573,7 @@ redef class AForExpr
                var colltype = self.coltype.as(not null)
                var itmeth = v.get_method(colltype, "iterator")
                v.add_send(recvtype, itmeth)
-               var iteratortype = itmeth.intro.msignature.return_mtype.as(MClassType).mclass.mclassdefs.first.bound_mtype
+               var iteratortype = itmeth.intro.msignature.return_mtype.as(MClassType).mclass.intro.bound_mtype
                var objtype = v.get_class("Object").mclass_type
                v.add_send(objtype, v.get_method(iteratortype, "is_ok"))
                if self.variables.length == 1 then

diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index dd3ef1a..b7cdcf3 100644 (file)
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -260,7 +260,7 @@ class SeparateCompiler
        # In a true separate compiler (a with dynamic loading) you cannot do this unfortnally
        fun compile_class_to_c(mclass: MClass)
        do
-               var mtype = mclass.mclassdefs.first.bound_mtype
+               var mtype = mclass.intro.bound_mtype
                var c_name = mclass.mclass_type.c_name
 
                var vft = self.method_tables[mclass]

diff --git a/src/stats/model_stats.nit b/src/stats/model_stats.nit
index 37e248c..862bea6 100644 (file)
--- a/src/stats/model_stats.nit
+++ b/src/stats/model_stats.nit
@@ -116,7 +116,7 @@ do
                                        if p.mpropdefs.length == 1 then
                                                npas += 1
                                        else
-                                               var sels = p.lookup_definitions(main, c.mclassdefs.first.bound_mtype)
+                                               var sels = p.lookup_definitions(main, c.intro.bound_mtype)
                                                if sels.length > 1 then
                                                        print "conflict for {p.full_name} in class {c.full_name}: {sels.join(", ")}"
                                                else if sels.is_empty then

diff --git a/src/typing.nit b/src/typing.nit
index 179597c..9ff3b93 100644 (file)
--- a/src/typing.nit
+++ b/src/typing.nit
@@ -928,7 +928,7 @@ redef class ARangeExpr
        do
                var discrete_class = v.get_mclass(self, "Discrete")
                if discrete_class == null then return # Forward error
-               var discrete_type = discrete_class.mclassdefs.first.bound_mtype
+               var discrete_type = discrete_class.intro.bound_mtype
                var t1 = v.visit_expr_subtype(self.n_expr, discrete_type)
                var t2 = v.visit_expr_subtype(self.n_expr2, discrete_type)
                if t1 == null or t2 == null then return