model: use the robust `intro_mmodule` instead of `intro.mmodule`.

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

diff --git a/src/compiler/java_compiler.nit b/src/compiler/java_compiler.nit
index f40ce45..84b5a47 100644 (file)
--- a/src/compiler/java_compiler.nit
+++ b/src/compiler/java_compiler.nit
@@ -1330,7 +1330,7 @@ end
 redef class MClass
 
        # Runtime name
 redef class MClass
 
        # Runtime name

-       private fun rt_name: String do return "RTClass_{intro.mmodule.jname}_{jname}"
+       private fun rt_name: String do return "RTClass_{intro_mmodule.jname}_{jname}"

 
        # Generate a Java RTClass for a Nit MClass
        fun compile_to_java(v: JavaCompilerVisitor) do
 
        # Generate a Java RTClass for a Nit MClass
        fun compile_to_java(v: JavaCompilerVisitor) do

diff --git a/src/doc/doc_phases/doc_structure.nit b/src/doc/doc_phases/doc_structure.nit
index f2686e6..d84a739 100644 (file)
--- a/src/doc/doc_phases/doc_structure.nit
+++ b/src/doc/doc_phases/doc_structure.nit
@@ -147,7 +147,7 @@ redef class MModulePage
        private fun mclasses_for_mmodule(mmodule: MModule): Set[MClass] do
                var mclasses = new HashSet[MClass]
                for mclass in self.mclasses do
        private fun mclasses_for_mmodule(mmodule: MModule): Set[MClass] do
                var mclasses = new HashSet[MClass]
                for mclass in self.mclasses do

-                       if mclass.intro.mmodule == mmodule then
+                       if mclass.intro_mmodule == mmodule then

                                mclasses.add mclass
                        end
                end
                                mclasses.add mclass
                        end
                end

diff --git a/src/ffi/extern_classes.nit b/src/ffi/extern_classes.nit
index c0e826b..40459df 100644 (file)
--- a/src/ffi/extern_classes.nit
+++ b/src/ffi/extern_classes.nit
@@ -110,7 +110,7 @@ redef class MClass
                        var ftype_b: nullable ForeignType = null # FIXME hack to circumvent bug where ftype is typed null
 
                        # look in super classes
                        var ftype_b: nullable ForeignType = null # FIXME hack to circumvent bug where ftype is typed null
 
                        # look in super classes

-                       for s in in_hierarchy(intro.mmodule).direct_greaters do
+                       for s in in_hierarchy(intro_mmodule).direct_greaters do

                                var super_ftype = s.compute_ftype(v)
                                if super_ftype != null then
                                        if ftype_b == null then
                                var super_ftype = s.compute_ftype(v)
                                if super_ftype != null then
                                        if ftype_b == null then

diff --git a/src/highlight.nit b/src/highlight.nit
index 00ed2bf..b2f856e 100644 (file)
--- a/src/highlight.nit
+++ b/src/highlight.nit
@@ -373,7 +373,7 @@ redef class MClassDef
                        res.new_field("class").text(mclass.name)
                else
                        res.new_field("redef class").text(mclass.name)
                        res.new_field("class").text(mclass.name)
                else
                        res.new_field("redef class").text(mclass.name)

-                       res.new_field("intro").add mclass.intro.linkto_text("in {mclass.intro.mmodule.to_s}")
+                       res.new_field("intro").add mclass.intro.linkto_text("in {mclass.intro_mmodule.to_s}")

                end
                var mdoc = self.mdoc
                if mdoc == null then mdoc = mclass.intro.mdoc
                end
                var mdoc = self.mdoc
                if mdoc == null then mdoc = mclass.intro.mdoc

diff --git a/src/modelize/modelize_property.nit b/src/modelize/modelize_property.nit
index e3f5ea1..aadfb5c 100644 (file)
--- a/src/modelize/modelize_property.nit
+++ b/src/modelize/modelize_property.nit
@@ -374,7 +374,7 @@ redef class ModelBuilder
                mtype = mtype.undecorate
                if mtype isa MClassType then
                        vis_type = mtype.mclass.visibility
                mtype = mtype.undecorate
                if mtype isa MClassType then
                        vis_type = mtype.mclass.visibility

-                       mmodule_type = mtype.mclass.intro.mmodule
+                       mmodule_type = mtype.mclass.intro_mmodule

                else if mtype isa MVirtualType then
                        vis_type = mtype.mproperty.visibility
                        mmodule_type = mtype.mproperty.intro_mclassdef.mmodule
                else if mtype isa MVirtualType then
                        vis_type = mtype.mproperty.visibility
                        mmodule_type = mtype.mproperty.intro_mclassdef.mmodule