layout_builders: renamed TypingLayout in Layout (for further abstraction)

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

diff --git a/src/layout_builders.nit b/src/layout_builders.nit
index 5882045..b5ae145 100644 (file)
--- a/src/layout_builders.nit
+++ b/src/layout_builders.nit
@@ -19,15 +19,15 @@ import abstract_compiler
 
 # Layouts
 
-class TypingLayout[E: Object]
-       # Unic ids or each element
+class Layout[E: Object]
+       # Ids or each element
        var ids: Map[E, Int] = new HashMap[E, Int]
        # Fixed positions of each element in all tables
        var pos: Map[E, Int] = new HashMap[E, Int]
 end
 
 class PHTypingLayout[E: Object]
-       super TypingLayout[E]
+       super Layout[E]
        # Masks used by hash function
        var masks: Map[E, Int] = new HashMap[E, Int]
        # Positions of each element for each tables
@@ -59,7 +59,7 @@ end
 
 abstract class TypingLayoutBuilder[E: Object]
 
-       type LAYOUT: TypingLayout[E]
+       type LAYOUT: Layout[E]
 
        private var mmodule: MModule
        init(mmodule: MModule) do self.mmodule = mmodule
@@ -88,7 +88,7 @@ class BMTypeLayoutBuilder
 
        # Compute mtypes ids and position using BM
        redef fun build_layout(mtypes) do
-               var result = new TypingLayout[MType]
+               var result = new Layout[MType]
                result.ids = self.compute_ids(mtypes)
                result.pos = result.ids
                return result
@@ -110,7 +110,7 @@ class CLTypeLayoutBuilder
 
        # Compute mtypes ids and position using BM
        redef fun build_layout(mtypes) do
-               var result = new TypingLayout[MType]
+               var result = new Layout[MType]
                result.ids = self.compute_ids(mtypes)
                result.pos = self.colorer.colorize(mtypes)
                return result
@@ -173,7 +173,7 @@ class BMClassLayoutBuilder
 
        # Compute mclasses ids and position using BM
        redef fun build_layout(mclasses) do
-               var result = new TypingLayout[MClass]
+               var result = new Layout[MClass]
                result.ids = self.compute_ids(mclasses)
                result.pos = result.ids
                return result
@@ -195,7 +195,7 @@ class CLClassLayoutBuilder
 
        # Compute mclasses ids and position using BM
        redef fun build_layout(mclasses) do
-               var result = new TypingLayout[MClass]
+               var result = new Layout[MClass]
                result.ids = self.compute_ids(mclasses)
                result.pos = self.colorer.colorize(mclasses)
                return result

diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index 546bc0c..5520cfd 100644 (file)
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -105,7 +105,7 @@ class SeparateCompiler
        private var partial_types: Set[MType] = new HashSet[MType]
        private var live_unresolved_types: Map[MClassDef, Set[MType]] = new HashMap[MClassDef, HashSet[MType]]
 
-       private var type_layout: nullable TypingLayout[MType]
+       private var type_layout: nullable Layout[MType]
        private var resolution_layout: nullable ResolutionLayout
        protected var method_layout: nullable PropertyLayout[MMethod]
        protected var attr_layout: nullable PropertyLayout[MAttribute]

diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index d16fb06..7e62a1d 100644 (file)
--- a/src/separate_erasure_compiler.nit
+++ b/src/separate_erasure_compiler.nit
@@ -67,7 +67,7 @@ end
 class SeparateErasureCompiler
        super SeparateCompiler
 
-       private var class_layout: nullable TypingLayout[MClass]
+       private var class_layout: nullable Layout[MClass]
        protected var vt_layout: nullable PropertyLayout[MVirtualTypeProp]
 
        init(mainmodule: MModule, mmbuilder: ModelBuilder, runtime_type_analysis: RapidTypeAnalysis) do