ni_nitdoc: cleaned visibility in model redef

[nit.git] / src / separate_erasure_compiler.nit

diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index 4590348..1442af0 100644 (file)
--- a/src/separate_erasure_compiler.nit
+++ b/src/separate_erasure_compiler.nit
@@ -68,7 +68,7 @@ class SeparateErasureCompiler
        super SeparateCompiler
 
        private var class_layout: nullable Layout[MClass]
-       protected var vt_layout: nullable PropertyLayout[MVirtualTypeProp]
+       protected var vt_layout: nullable Layout[MVirtualTypeProp]
 
        init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
                super
@@ -77,26 +77,26 @@ class SeparateErasureCompiler
 
                var layout_builder: TypingLayoutBuilder[MClass]
                if modelbuilder.toolcontext.opt_phmod_typing.value then
-                       layout_builder = new PHTypingLayoutBuilder[MClass](new MClassHasher(new PHModOperator, mainmodule))
+                       layout_builder = new MClassHasher(new PHModOperator, mainmodule)
                else if modelbuilder.toolcontext.opt_phand_typing.value then
-                       layout_builder = new PHTypingLayoutBuilder[MClass](new MClassHasher(new PHAndOperator, mainmodule))
+                       layout_builder = new MClassHasher(new PHAndOperator, mainmodule)
                else if modelbuilder.toolcontext.opt_bm_typing.value then
-                       layout_builder = new BMTypingLayoutBuilder[MClass](new MClassBMizer(mainmodule))
+                       layout_builder = new MClassBMizer(mainmodule)
                else
-                       layout_builder = new CLTypingLayoutBuilder[MClass](new MClassColorer(mainmodule))
+                       layout_builder = new MClassColorer(mainmodule)
                end
                self.class_layout = layout_builder.build_layout(mclasses)
                self.class_tables = self.build_class_typing_tables(mclasses)
 
                # vt coloration
-               var vt_coloring = new CLPropertyLayoutBuilder[MVirtualTypeProp](new MVirtualTypePropColorer(mainmodule))
+               var vt_coloring = new MVirtualTypePropColorer(mainmodule)
                var vt_layout = vt_coloring.build_layout(mclasses)
                self.vt_tables = build_vt_tables(mclasses, vt_layout)
                self.compile_color_consts(vt_layout.pos)
                self.vt_layout = vt_layout
        end
 
-       fun build_vt_tables(mclasses: Set[MClass], layout: PropertyLayout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
+       fun build_vt_tables(mclasses: Set[MClass], layout: Layout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
                var tables = new HashMap[MClass, Array[nullable MPropDef]]
                for mclass in mclasses do
                        var table = new Array[nullable MPropDef]
@@ -175,7 +175,7 @@ class SeparateErasureCompiler
                self.header.add_decl("struct type_table \{ int size; int table[1]; \}; /* colorized type table. */")
                self.header.add_decl("struct vts_entry \{ short int is_nullable; struct class *class; \}; /* link (nullable or not) between the vts and is bound. */")
 
-               if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+               if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
                        self.header.add_decl("struct vts_table \{ int mask; struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
                else
                        self.header.add_decl("struct vts_table \{ struct vts_entry vts[1]; \}; /* vts list of a C type representation. */")
@@ -330,7 +330,7 @@ class SeparateErasureCompiler
 
                self.header.add_decl("extern const struct vts_table_{mclass.c_name} vts_table_{mclass.c_name};")
                self.header.add_decl("struct vts_table_{mclass.c_name} \{")
-               if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+               if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
                        self.header.add_decl("int mask;")
                end
                self.header.add_decl("struct vts_entry vts[{self.vt_tables[mclass].length}];")
@@ -338,7 +338,7 @@ class SeparateErasureCompiler
 
                var v = new_visitor
                v.add_decl("const struct vts_table_{mclass.c_name} vts_table_{mclass.c_name} = \{")
-               if self.vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+               if self.vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
                        #TODO redo this when PHPropertyLayoutBuilder will be implemented
                        #v.add_decl("{vt_masks[mclass]},")
                end
@@ -513,7 +513,7 @@ class SeparateErasureCompilerVisitor
                        end
                        var entry = self.get_name("entry")
                        self.add("struct vts_entry {entry};")
-                       if self.compiler.as(SeparateErasureCompiler).vt_layout isa PHPropertyLayoutBuilder[MVirtualTypeProp] then
+                       if self.compiler.as(SeparateErasureCompiler).vt_layout isa PHLayout[MClass, MVirtualTypeProp] then
                                self.add("{entry} = {recv_ptr}vts_table->vts[HASH({recv_ptr}vts_table->mask, {mtype.mproperty.const_color})];")
                        else
                                self.add("{entry} = {recv_ptr}vts_table->vts[{mtype.mproperty.const_color}];")