From bc719d3968d2e5a102292f8898802e2cbe9e1382 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 7 Mar 2013 16:14:50 -0500 Subject: [PATCH] layout: temporally rename method linearize_mclasses to avoid conflict Signed-off-by: Jean Privat --- src/abstract_compiler.nit | 2 +- src/layout_builders.nit | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index 9e16b5b..32bfc17 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -2326,7 +2326,7 @@ redef class MModule private var sub_mtypes_cache: Map[MType, Set[MType]] = new HashMap[MType, Set[MType]] # Return a linearization of a set of mclasses - fun linearize_mclasses(mclasses: Set[MClass]): Array[MClass] do + fun linearize_mclasses_2(mclasses: Set[MClass]): Array[MClass] do var lin = new Array[MClass].from(mclasses) var sorter = new ClassSorter(self) sorter.sort(lin) diff --git a/src/layout_builders.nit b/src/layout_builders.nit index 6770685..5ed8d6e 100644 --- a/src/layout_builders.nit +++ b/src/layout_builders.nit @@ -178,7 +178,7 @@ class MAttributeBMizer redef type MPROP: MAttribute init(mmodule: MModule) do super(mmodule) # Less holes in tables with linearization for attribute tables - redef fun linearize_mclasses(mclasses) do return self.mmodule.linearize_mclasses(mclasses) + redef fun linearize_mclasses(mclasses) do return self.mmodule.linearize_mclasses_2(mclasses) end # BMizing for MVirtualTypeProps @@ -368,7 +368,7 @@ class MClassColorer fun parent_elements(element: MClass): Set[MClass] do return self.mmodule.parent_mclasses(element) redef fun is_element_mi(element, elements) do return self.parent_elements(element).length > 1 redef fun sub_elements(element, elements) do do return self.mmodule.sub_mclasses(element) - redef fun linearize(elements) do return self.mmodule.linearize_mclasses(elements) + redef fun linearize(elements) do return self.mmodule.linearize_mclasses_2(elements) redef fun reverse_linearize(elements) do return self.mmodule.reverse_linearize_mclasses(elements) end -- 1.7.9.5