src: client of `mmodule2nmodule` now use `mmodule2node`

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

diff --git a/src/annotation.nit b/src/annotation.nit
index 19653a3..882b645 100644 (file)
--- a/src/annotation.nit
+++ b/src/annotation.nit
@@ -87,8 +87,8 @@ redef class ModelBuilder
        do
                var annotations = new Array[AAnnotation]
                for mmod in mmodule.in_importation.greaters do
-                       if not mmodule2nmodule.keys.has(mmod) then continue
-                       var amod = mmodule2nmodule[mmod]
+                       var amod = mmodule2node(mmod)
+                       if amod == null then continue
                        var module_decl = amod.n_moduledecl
                        if module_decl == null then continue
                        var aas = module_decl.get_annotations(name)
@@ -101,8 +101,8 @@ redef class ModelBuilder
        # Obviously, if there is no ast associated to `mmodule`, then nothing is returned.
        fun get_mmodule_annotation(name: String, mmodule: MModule): nullable AAnnotation
        do
-               if not mmodule2nmodule.keys.has(mmodule) then return null
-               var amod = mmodule2nmodule[mmodule]
+               var amod = mmodule2node(mmodule)
+               if amod == null then return null
                var module_decl = amod.n_moduledecl
                if module_decl == null then return null
                var res = module_decl.get_single_annotation(name, self)

diff --git a/src/compiler/compiler_ffi.nit b/src/compiler/compiler_ffi.nit
index b6cb920..ca22005 100644 (file)
--- a/src/compiler/compiler_ffi.nit
+++ b/src/compiler/compiler_ffi.nit
@@ -27,8 +27,7 @@ redef class MModule
 
        private fun nmodule(v: AbstractCompilerVisitor): nullable AModule
        do
-               var m2n = v.compiler.modelbuilder.mmodule2nmodule
-               return m2n.get_or_null(self)
+               return v.compiler.modelbuilder.mmodule2node(self)
        end
 
        redef fun finalize_ffi(compiler: AbstractCompiler)
@@ -100,7 +99,7 @@ redef class AMethPropdef
        do
                var mmodule = mpropdef.mclassdef.mmodule
                var mainmodule = v.compiler.mainmodule
-               var amodule = v.compiler.modelbuilder.mmodule2nmodule[mmodule]
+               var amodule = v.compiler.modelbuilder.mmodule2node(mmodule)
                var mclass_type = mpropdef.mclassdef.bound_mtype
 
                # Declare as extern

diff --git a/src/ffi/header_dependency.nit b/src/ffi/header_dependency.nit
index 485ba1f..10c1db3 100644 (file)
--- a/src/ffi/header_dependency.nit
+++ b/src/ffi/header_dependency.nit
@@ -58,8 +58,8 @@ redef class MModule
                        end
 
                        # does the super module itself has extern dependancies?
-                       var amodule = v.toolcontext.modelbuilder.mmodule2nmodule[m]
-                       if amodule.has_public_c_header then header_dependencies.add(m)
+                       var amodule = v.toolcontext.modelbuilder.mmodule2node(m)
+                       if amodule != null and amodule.has_public_c_header then header_dependencies.add(m)
                end
 
                header_dependencies_cache = header_dependencies

diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index b38bdac..30f5885 100644 (file)
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -86,7 +86,7 @@ redef class ModelBuilder
                model.mmodule_importation_hierarchy.sort(mmodules)
                var nmodules = new Array[AModule]
                for mm in mmodules do
-                       nmodules.add(mmodule2nmodule[mm])
+                       nmodules.add(mmodule2node(mm).as(not null))
                end
                toolcontext.run_phases(nmodules)
 

diff --git a/src/modelize/modelize_class.nit b/src/modelize/modelize_class.nit
index 5112e25..65840a8 100644 (file)
--- a/src/modelize/modelize_class.nit
+++ b/src/modelize/modelize_class.nit
@@ -283,9 +283,8 @@ redef class ModelBuilder
                nmodule.build_classes_is_done = true
                var mmodule = nmodule.mmodule.as(not null)
                for imp in mmodule.in_importation.direct_greaters do
-
-                       if not mmodule2nmodule.has_key(imp) then continue
-                       build_classes(mmodule2nmodule[imp])
+                       var nimp = mmodule2node(imp)
+                       if nimp != null then build_classes(nimp)
                end
 
                if errcount != toolcontext.error_count then return

diff --git a/src/nitlight.nit b/src/nitlight.nit
index cc35b10..a81f845 100644 (file)
--- a/src/nitlight.nit
+++ b/src/nitlight.nit
@@ -67,7 +67,8 @@ for mm in mmodules do
        if opt_last_line.value != 0 then v.last_line = opt_last_line.value
        if opt_ast.value then v.with_ast = true
        var page = null
-       var m = modelbuilder.mmodule2nmodule[mm]
+       var m = modelbuilder.mmodule2node(mm)
+       assert m != null
        if not opt_fragment.value then
                page = new HTMLTag("html")
                page.add_raw_html """<head>

diff --git a/src/nitpretty.nit b/src/nitpretty.nit
index 7ff0b16..af3fae0 100644 (file)
--- a/src/nitpretty.nit
+++ b/src/nitpretty.nit
@@ -82,12 +82,11 @@ if not dir.file_exists then dir.mkdir
 var v = new PrettyPrinterVisitor
 
 for mmodule in mmodules do
-       if not mbuilder.mmodule2nmodule.has_key(mmodule) then
+       var nmodule = mbuilder.mmodule2node(mmodule)
+       if nmodule == null then
                print " Error: no source file for module {mmodule}"
                return
        end
-
-       var nmodule = mbuilder.mmodule2nmodule[mmodule]
        var file = "{dir}/{mmodule.name}.nit"
        var tpl = v.pretty_nmodule(nmodule)
        tpl.write_to_file file

diff --git a/src/testing/testing_doc.nit b/src/testing/testing_doc.nit
index f0b8102..e975d85 100644 (file)
--- a/src/testing/testing_doc.nit
+++ b/src/testing/testing_doc.nit
@@ -318,9 +318,9 @@ redef class ModelBuilder
        do
                var ts = new HTMLTag("testsuite")
                toolcontext.info("nitunit: doc-unit {mmodule}", 2)
-               if not mmodule2nmodule.has_key(mmodule) then return ts
 
-               var nmodule = mmodule2nmodule[mmodule]
+               var nmodule = mmodule2node(mmodule)
+               if nmodule == null then return ts
 
                # usualy, only the original module must be imported in the unit test.
                var o = mmodule