layout_builders: Introduced interface PropertyLayoutBuilder (for future refactoring)

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

diff --git a/src/layout_builders.nit b/src/layout_builders.nit
index 5b65a0f..0254210 100644 (file)
--- a/src/layout_builders.nit
+++ b/src/layout_builders.nit
@@ -46,12 +46,9 @@ interface TypingLayoutBuilder[E: Object]
        fun build_layout(elements: Set[E]): Layout[E] is abstract
 end
 
-abstract class PropertyLayoutBuilder[E: MProperty]
-
-       type LAYOUT: PropertyLayout[E]
-
-       # Compute properties ids and position
-       fun build_layout(mclasses: Set[MClass]): LAYOUT is abstract
+interface PropertyLayoutBuilder[E: MProperty]
+       # Build table layout for attributes, methods and virtual types
+       fun build_layout(elements: Set[MClass]): Layout[E] is abstract
 end
 
 # Layout builder for MProperty using Coloring (CL)
@@ -66,9 +63,7 @@ class CLPropertyLayoutBuilder[E: MProperty]
 
        # Compute mclasses ids and position using BM
        redef fun build_layout(mclasses) do
-               var result = new PropertyLayout[E]
-               result.pos = self.colorer.colorize(mclasses)
-               return result
+               return self.colorer.build_layout(mclasses)
        end
 end
 
@@ -336,6 +331,7 @@ end
 
 # MProperty coloring
 abstract class MPropertyColorer[E: MProperty]
+       super PropertyLayoutBuilder[E]
 
        private var mmodule: MModule
        private var class_colorer: MClassColorer
@@ -346,7 +342,14 @@ abstract class MPropertyColorer[E: MProperty]
                self.class_colorer = new MClassColorer(mmodule)
        end
 
-       fun colorize(mclasses: Set[MClass]): Map[E, Int] do
+       # Compute mclasses ids and position using BM
+       redef fun build_layout(mclasses: Set[MClass]): Layout[E] do
+               var result = new Layout[E]
+               result.pos = self.colorize(mclasses)
+               return result
+       end
+
+       private fun colorize(mclasses: Set[MClass]): Map[E, Int] do
                self.class_colorer.tag_elements(mclasses)
                self.class_colorer.build_conflicts_graph(mclasses)
                self.colorize_core(self.class_colorer.core)

diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index 475cf21..40bd7f1 100644 (file)
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -107,8 +107,8 @@ class SeparateCompiler
 
        private var type_layout: nullable Layout[MType]
        private var resolution_layout: nullable Layout[MType]
-       protected var method_layout: nullable PropertyLayout[MMethod]
-       protected var attr_layout: nullable PropertyLayout[MAttribute]
+       protected var method_layout: nullable Layout[MMethod]
+       protected var attr_layout: nullable Layout[MAttribute]
 
        init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do
                super(mainmodule, mmbuilder)
@@ -225,7 +225,7 @@ class SeparateCompiler
                self.attr_layout = attr_layout
        end
 
-       fun build_method_tables(mclasses: Set[MClass], layout: PropertyLayout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
+       fun build_method_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]
@@ -269,7 +269,7 @@ class SeparateCompiler
                return tables
        end
 
-       fun build_attr_tables(mclasses: Set[MClass], layout: PropertyLayout[MProperty]): Map[MClass, Array[nullable MPropDef]] do
+       fun build_attr_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]

diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index 585b5ef..f0350a9 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
@@ -96,7 +96,7 @@ class SeparateErasureCompiler
                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]