nitg-s removed useless type_layout_builder attribute

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index 957f873..a14b462 100644 (file)
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -104,7 +104,6 @@ class SeparateCompiler
        private var undead_types: Set[MType] = new HashSet[MType]
        private var partial_types: Set[MType] = new HashSet[MType]
 
-       private var type_layout_builder: TypingLayoutBuilder[MType]
        private var type_layout: nullable TypingLayout[MType]
        private var type_tables: nullable Map[MType, Array[nullable MType]] = null
 
@@ -122,27 +121,11 @@ class SeparateCompiler
        init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
                super
                self.header = new_visitor
-               self.init_layout_builders
                self.runtime_type_analysis = runtime_type_analysis
                self.do_property_coloring
                self.compile_box_kinds
        end
 
-       protected fun init_layout_builders do
-               # Typing Layout
-               if modelbuilder.toolcontext.opt_bm_typing.value then
-                       self.type_layout_builder = new BMTypeLayoutBuilder(self.mainmodule)
-               else if modelbuilder.toolcontext.opt_phmod_typing.value then
-                       self.type_layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHModOperator)
-                       self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
-               else if modelbuilder.toolcontext.opt_phand_typing.value then
-                       self.type_layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHAndOperator)
-                       self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
-               else
-                       self.type_layout_builder = new CLTypeLayoutBuilder(self.mainmodule)
-               end
-       end
-
        redef fun compile_header_structs do
                self.header.add_decl("typedef void(*nitmethod_t)(void); /* general C type representing a Nit method. */")
                self.compile_header_attribute_structs
@@ -157,6 +140,12 @@ class SeparateCompiler
                        self.header.add_decl("struct types \{ struct type *types[1]; \}; /* a list types (used for vts, fts and unanchored lists). */")
                end
 
+               if modelbuilder.toolcontext.opt_phmod_typing.value then
+                       self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
+               else if modelbuilder.toolcontext.opt_phand_typing.value then
+                       self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
+               end
+
                self.header.add_decl("typedef struct \{ struct type *type; struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
        end
 
@@ -347,8 +336,20 @@ class SeparateCompiler
                end
                mtypes.add_all(self.partial_types)
 
+               # Typing Layout
+               var layout_builder: TypingLayoutBuilder[MType]
+               if modelbuilder.toolcontext.opt_bm_typing.value then
+                       layout_builder = new BMTypeLayoutBuilder(self.mainmodule)
+               else if modelbuilder.toolcontext.opt_phmod_typing.value then
+                       layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHModOperator)
+               else if modelbuilder.toolcontext.opt_phand_typing.value then
+                       layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHAndOperator)
+               else
+                       layout_builder = new CLTypeLayoutBuilder(self.mainmodule)
+               end
+
                # colorize types
-               self.type_layout = self.type_layout_builder.build_layout(mtypes)
+               self.type_layout = layout_builder.build_layout(mtypes)
                self.type_tables = self.build_type_tables(mtypes)
 
                # VT and FT are stored with other unresolved types in the big unanchored_tables

diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index a4ed4c3..8f299bf 100644 (file)
--- a/src/separate_erasure_compiler.nit
+++ b/src/separate_erasure_compiler.nit
@@ -81,10 +81,8 @@ class SeparateErasureCompiler
                var layout_builder: TypingLayoutBuilder[MClass]
                if modelbuilder.toolcontext.opt_phmod_typing.value then
                        layout_builder = new PHClassLayoutBuilder(mainmodule, new PHModOperator)
-                       self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
                else if modelbuilder.toolcontext.opt_phand_typing.value then
                        layout_builder = new PHClassLayoutBuilder(mainmodule, new PHAndOperator)
-                       self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
                else if modelbuilder.toolcontext.opt_bm_typing.value then
                        layout_builder = new BMClassLayoutBuilder(mainmodule)
                else
@@ -186,6 +184,12 @@ class SeparateErasureCompiler
                        self.header.add_decl("struct vts_table \{ struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
                end
 
+               if modelbuilder.toolcontext.opt_phmod_typing.value then
+                       self.header.add_decl("#define HASH(mask, id) ((mask)%(id))")
+               else if modelbuilder.toolcontext.opt_phand_typing.value then
+                       self.header.add_decl("#define HASH(mask, id) ((mask)&(id))")
+               end
+
                self.header.add_decl("typedef struct val \{ struct class *class; nitattribute_t attrs[1]; \} val; /* general C type representing a Nit instance. */")
        end