compiler: global compiler escape the module name

[nit.git] / src / compiler / separate_erasure_compiler.nit

diff --git a/src/compiler/separate_erasure_compiler.nit b/src/compiler/separate_erasure_compiler.nit
index 55844f6..233bf54 100644 (file)
--- a/src/compiler/separate_erasure_compiler.nit
+++ b/src/compiler/separate_erasure_compiler.nit
@@ -67,9 +67,11 @@ redef class ModelBuilder
                var compiler = new SeparateErasureCompiler(mainmodule, self, runtime_type_analysis)
                compiler.compile_header
 
+               var c_name = mainmodule.c_name
+
                # compile class structures
                self.toolcontext.info("Property coloring", 2)
-               compiler.new_file("{mainmodule.name}.tables")
+               compiler.new_file("{c_name}.tables")
                compiler.do_property_coloring
                for m in mainmodule.in_importation.greaters do
                        for mclass in m.intro_mclasses do
@@ -79,14 +81,14 @@ redef class ModelBuilder
                compiler.compile_color_consts(compiler.vt_colors)
 
                # The main function of the C
-               compiler.new_file("{mainmodule.name}.main")
+               compiler.new_file("{c_name}.main")
                compiler.compile_nitni_global_ref_functions
                compiler.compile_main_function
 
                # compile methods
                for m in mainmodule.in_importation.greaters do
-                       self.toolcontext.info("Generate C for module {m}", 2)
-                       compiler.new_file("{m.name}.sep")
+                       self.toolcontext.info("Generate C for module {m.full_name}", 2)
+                       compiler.new_file("{m.c_name}.sep")
                        compiler.compile_module_to_c(m)
                end
 
@@ -101,12 +103,11 @@ end
 class SeparateErasureCompiler
        super SeparateCompiler
 
-       private var class_ids: Map[MClass, Int]
-       private var class_colors: Map[MClass, Int]
-       protected var vt_colors: Map[MVirtualTypeProp, Int]
+       private var class_ids: Map[MClass, Int] is noinit
+       private var class_colors: Map[MClass, Int] is noinit
+       protected var vt_colors: Map[MVirtualTypeProp, Int] is noinit
 
-       init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: nullable RapidTypeAnalysis) do
-               super
+       init do
 
                # Class coloring
                var poset = mainmodule.flatten_mclass_hierarchy
@@ -438,8 +439,8 @@ class SeparateErasureCompiler
 
        # Stats
 
-       private var class_tables: Map[MClass, Array[nullable MClass]]
-       private var vt_tables: Map[MClass, Array[nullable MPropDef]]
+       private var class_tables: Map[MClass, Array[nullable MClass]] is noinit
+       private var vt_tables: Map[MClass, Array[nullable MPropDef]] is noinit
 
        redef fun display_sizes
        do