From 8a1828c9f6482c32aa4e11a534e57e3fc9b74963 Mon Sep 17 00:00:00 2001
From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Mon, 4 Mar 2013 18:17:27 -0500
Subject: [PATCH] layout_builders: renamed PHTypingLayout in PHLayout (for
 further abstraction)

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
---
 src/layout_builders.nit           |   10 +++++-----
 src/separate_compiler.nit         |    4 ++--
 src/separate_erasure_compiler.nit |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/layout_builders.nit b/src/layout_builders.nit
index 12f7e39..0cda800 100644
--- a/src/layout_builders.nit
+++ b/src/layout_builders.nit
@@ -26,7 +26,7 @@ class Layout[E: Object]
 	var pos: Map[E, Int] = new HashMap[E, Int]
 end
 
-class PHTypingLayout[E: Object]
+class PHLayout[E: Object]
 	super Layout[E]
 	# Masks used by hash function
 	var masks: Map[E, Int] = new HashMap[E, Int]
@@ -115,7 +115,7 @@ end
 class PHTypeLayoutBuilder
 	super TypingLayoutBuilder[MType]
 
-	redef type LAYOUT: PHTypingLayout[MType]
+	redef type LAYOUT: PHLayout[MType]
 
 	private var hasher: PerfectHasher[MType, MType]
 
@@ -136,7 +136,7 @@ class PHTypeLayoutBuilder
 
 	# Compute mtypes ids and position using BM
 	redef fun build_layout(mtypes) do
-		var result = new PHTypingLayout[MType]
+		var result = new PHLayout[MType]
 		var conflicts = build_conflicts(mtypes)
 		result.ids = self.compute_ids(mtypes)
 		result.masks = self.hasher.compute_masks(conflicts, result.ids)
@@ -200,7 +200,7 @@ end
 class PHClassLayoutBuilder
 	super TypingLayoutBuilder[MClass]
 
-	redef type LAYOUT: PHTypingLayout[MClass]
+	redef type LAYOUT: PHLayout[MClass]
 
 	private var hasher: PerfectHasher[MClass, MClass]
 
@@ -221,7 +221,7 @@ class PHClassLayoutBuilder
 
 	# Compute mclasses ids and position using BM
 	redef fun build_layout(mclasses) do
-		var result = new PHTypingLayout[MClass]
+		var result = new PHLayout[MClass]
 		var conflicts = build_conflicts(mclasses)
 		result.ids = self.compute_ids(mclasses)
 		result.masks = self.hasher.compute_masks(conflicts, result.ids)
diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit
index 5681b97..3692de6 100644
--- a/src/separate_compiler.nit
+++ b/src/separate_compiler.nit
@@ -361,7 +361,7 @@ class SeparateCompiler
 			supers.add(mtype)
 			for sup in supers do
 				var color: Int
-				if layout isa PHTypingLayout[MType] then
+				if layout isa PHLayout[MType] then
 					color = layout.hashes[mtype][sup]
 				else
 					color = layout.pos[sup]
@@ -530,7 +530,7 @@ class SeparateCompiler
 		v.add_decl("{self.type_layout.ids[mtype]},")
 		v.add_decl("\"{mtype}\", /* class_name_string */")
 		var layout = self.type_layout
-		if layout isa PHTypingLayout[MType] then
+		if layout isa PHLayout[MType] then
 			v.add_decl("{layout.masks[mtype]},")
 		else
 			v.add_decl("{layout.pos[mtype]},")
diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit
index 7e62a1d..edd4c92 100644
--- a/src/separate_erasure_compiler.nit
+++ b/src/separate_erasure_compiler.nit
@@ -151,7 +151,7 @@ class SeparateErasureCompiler
 			supers.add(mclass)
 			for sup in supers do
 				var color: Int
-				if layout isa PHTypingLayout[MClass] then
+				if layout isa PHLayout[MClass] then
 					color = layout.hashes[mclass][sup]
 				else
 					color = layout.pos[sup]
@@ -219,7 +219,7 @@ class SeparateErasureCompiler
 		v.add_decl("\"{mclass.name}\", /* class_name_string */")
 		v.add_decl("{self.box_kind_of(mclass)}, /* box_kind */")
 		var layout = self.class_layout
-		if layout isa PHTypingLayout[MClass] then
+		if layout isa PHLayout[MClass] then
 			v.add_decl("{layout.masks[mclass]},")
 		else
 			v.add_decl("{layout.pos[mclass]},")
@@ -541,7 +541,7 @@ class SeparateErasureCompilerVisitor
 			self.add("{res} = {accept_null};")
 			self.add("\} else \{")
 		end
-		if self.compiler.as(SeparateErasureCompiler).class_layout isa PHTypingLayout[MClass] then
+		if self.compiler.as(SeparateErasureCompiler).class_layout isa PHLayout[MClass] then
 			self.add("{cltype} = HASH({class_ptr}color, {idtype});")
 		end
 		self.add("if({cltype} >= {class_ptr}type_table->size) \{")
-- 
1.7.9.5