From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Tue, 5 Mar 2013 00:08:58 +0000 (-0500)
Subject: layout_builders: merged CLTypeLayoutBuilder and CLClassLayoutBuilder into CLTypingLay... 
X-Git-Tag: v0.6~77^2~15
X-Git-Url: http://nitlanguage.org

layout_builders: merged CLTypeLayoutBuilder and CLClassLayoutBuilder into CLTypingLayoutBuilder

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

diff --git a/src/layout_builders.nit b/src/layout_builders.nit
index c01c3fb..3ead351 100644
--- a/src/layout_builders.nit
+++ b/src/layout_builders.nit
@@ -78,33 +78,15 @@ class BMTypeLayoutBuilder
 	end
 end
 
-# Layout builder for MType using Coloring (CL)
-class CLTypeLayoutBuilder
-	super TypingLayoutBuilder[MType]
+# Typing Layout builder using Coloring (CL)
+class CLTypingLayoutBuilder[E: Object]
+	super TypingLayoutBuilder[E]
 
-	private var colorer: MTypeColorer
+	private var colorer: TypingColorer[E]
 
-	init(mmodule: MModule) do
-		self.colorer = new MTypeColorer(mmodule)
-	end
+	init(colorer: TypingColorer[E]) do self.colorer = colorer
 
-	# Compute mtypes ids and position using BM
-	redef fun build_layout(mtypes) do
-		var result = new Layout[MType]
-		result.ids = self.compute_ids(mtypes)
-		result.pos = self.colorer.colorize(mtypes)
-		return result
-	end
-
-	# Give each MType a unic id using a descending linearization of the `mtypes` set
-	private fun compute_ids(elements: Set[MType]): Map[MType, Int] do
-		var ids = new HashMap[MType, Int]
-		var lin = self.colorer.reverse_linearize(elements)
-		for element in lin do
-			ids[element] = ids.length
-		end
-		return ids
-	end
+	redef fun build_layout(elements) do return colorer.build_layout(elements)
 end
 
 # Layout builder for MType using Perfect Hashing (PH)
@@ -181,35 +163,6 @@ class BMClassLayoutBuilder
 	end
 end
 
-# Layout builder for MClass using Coloring (CL)
-class CLClassLayoutBuilder
-	super TypingLayoutBuilder[MClass]
-
-	private var colorer: MClassColorer
-
-	init(mmodule: MModule) do
-		self.colorer = new MClassColorer(mmodule)
-	end
-
-	# Compute mclasses ids and position using BM
-	redef fun build_layout(mclasses) do
-		var result = new Layout[MClass]
-		result.ids = self.compute_ids(mclasses)
-		result.pos = self.colorer.colorize(mclasses)
-		return result
-	end
-
-	# Give each MClass a unic id using a descending linearization
-	private fun compute_ids(elements: Set[MClass]): Map[MClass, Int] do
-		var ids = new HashMap[MClass, Int]
-		var lin = self.colorer.reverse_linearize(elements)
-		for element in lin do
-			ids[element] = ids.length
-		end
-		return ids
-	end
-end
-
 # Layout builder for MClass using Perfect Hashing (PH)
 class PHClassLayoutBuilder
 	super TypingLayoutBuilder[MClass]
@@ -387,7 +340,24 @@ abstract class TypingColorer[E: Object]
 
 	init do end
 
-	fun colorize(elements: Set[E]): Map[E, Int] do
+	# Compute the layout with coloring
+	fun build_layout(elements: Set[E]): Layout[E] do
+		var result = new Layout[E]
+		result.ids = compute_ids(elements)
+		result.pos = colorize(elements)
+		return result
+	end
+
+	private fun compute_ids(elements: Set[E]): Map[E, Int] do
+		var ids = new HashMap[E, Int]
+		var lin = reverse_linearize(elements)
+		for element in lin do
+			ids[element] = ids.length
+		end
+		return ids
+	end
+
+	private fun colorize(elements: Set[E]): Map[E, Int] do
 		tag_elements(elements)
 		build_conflicts_graph(elements)
 		colorize_elements(core)
@@ -508,7 +478,7 @@ abstract class TypingColorer[E: Object]
 end
 
 # MType coloring
-private class MTypeColorer
+class MTypeColorer
 	super TypingColorer[MType]
 
 	var mmodule: MModule
@@ -523,7 +493,7 @@ private class MTypeColorer
 end
 
 # MClass coloring
-private class MClassColorer
+class MClassColorer
 	super TypingColorer[MClass]
 
 	private var mmodule: MModule
diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index 55b3219..90f6ae4 100644
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -337,7 +337,7 @@ class SeparateCompiler
 		else if modelbuilder.toolcontext.opt_phand_typing.value then
 			layout_builder = new PHTypeLayoutBuilder(self.mainmodule, new PHAndOperator)
 		else
-			layout_builder = new CLTypeLayoutBuilder(self.mainmodule)
+			layout_builder = new CLTypingLayoutBuilder[MType](new MTypeColorer(self.mainmodule))
 		end
 
 		# colorize types
diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index 17217c9..6ad3ec8 100644
--- a/src/separate_erasure_compiler.nit
+++ b/src/separate_erasure_compiler.nit
@@ -83,7 +83,7 @@ class SeparateErasureCompiler
 		else if modelbuilder.toolcontext.opt_bm_typing.value then
 			layout_builder = new BMClassLayoutBuilder(mainmodule)
 		else
-			layout_builder = new CLClassLayoutBuilder(mainmodule)
+			layout_builder = new CLTypingLayoutBuilder[MClass](new MClassColorer(mainmodule))
 		end
 		self.class_layout = layout_builder.build_layout(mclasses)
 		self.class_tables = self.build_class_typing_tables(mclasses)