From cff5976a0d0c1dfe95d4690efb2f6310b3cc92db Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 2 Aug 2009 08:15:36 -0500
Subject: [PATCH] Move compiler.cfg.ssa.destruction.interference to
 compiler.cfg.ssa.interference

---
 basis/compiler/cfg/ssa/destruction/destruction.factor       | 2 +-
 .../ssa/destruction/process-blocks/process-blocks.factor    | 4 ++--
 .../interference/interference-tests.factor                  | 6 +++---
 .../ssa/{destruction => }/interference/interference.factor  | 4 ++--
 .../live-ranges/live-ranges.factor                          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename basis/compiler/cfg/ssa/{destruction => }/interference/interference-tests.factor (88%)
 rename basis/compiler/cfg/ssa/{destruction => }/interference/interference.factor (93%)
 rename basis/compiler/cfg/ssa/{destruction => interference}/live-ranges/live-ranges.factor (97%)

diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor
index dd79927699..d264ad1160 100644
--- a/basis/compiler/cfg/ssa/destruction/destruction.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction.factor
@@ -13,7 +13,7 @@ compiler.cfg.ssa.destruction.state
 compiler.cfg.ssa.destruction.forest
 compiler.cfg.ssa.destruction.copies
 compiler.cfg.ssa.destruction.renaming
-compiler.cfg.ssa.destruction.live-ranges
+compiler.cfg.ssa.interference.live-ranges
 compiler.cfg.ssa.destruction.process-blocks ;
 IN: compiler.cfg.ssa.destruction
 
diff --git a/basis/compiler/cfg/ssa/destruction/process-blocks/process-blocks.factor b/basis/compiler/cfg/ssa/destruction/process-blocks/process-blocks.factor
index 8eff20a11e..1bfcbe3b9a 100644
--- a/basis/compiler/cfg/ssa/destruction/process-blocks/process-blocks.factor
+++ b/basis/compiler/cfg/ssa/destruction/process-blocks/process-blocks.factor
@@ -6,9 +6,9 @@ compiler.cfg.def-use
 compiler.cfg.instructions
 compiler.cfg.liveness.ssa
 compiler.cfg.dominance
+compiler.cfg.ssa.interference
 compiler.cfg.ssa.destruction.state
-compiler.cfg.ssa.destruction.forest
-compiler.cfg.ssa.destruction.interference ;
+compiler.cfg.ssa.destruction.forest ;
 IN: compiler.cfg.ssa.destruction.process-blocks
 
 ! phi-union maps a vreg to the predecessor block
diff --git a/basis/compiler/cfg/ssa/destruction/interference/interference-tests.factor b/basis/compiler/cfg/ssa/interference/interference-tests.factor
similarity index 88%
rename from basis/compiler/cfg/ssa/destruction/interference/interference-tests.factor
rename to basis/compiler/cfg/ssa/interference/interference-tests.factor
index c76e2f0dba..a973106d23 100644
--- a/basis/compiler/cfg/ssa/destruction/interference/interference-tests.factor
+++ b/basis/compiler/cfg/ssa/interference/interference-tests.factor
@@ -2,10 +2,10 @@ USING: accessors compiler.cfg compiler.cfg.debugger
 compiler.cfg.def-use compiler.cfg.dominance
 compiler.cfg.instructions compiler.cfg.liveness.ssa
 compiler.cfg.registers compiler.cfg.predecessors
-compiler.cfg.ssa.destruction.interference
-compiler.cfg.ssa.destruction.live-ranges cpu.architecture
+compiler.cfg.ssa.interference
+compiler.cfg.ssa.interference.live-ranges cpu.architecture
 kernel namespaces tools.test ;
-IN: compiler.cfg.ssa.destruction.interference.tests
+IN: compiler.cfg.ssa.interference.tests
 
 : test-interference ( -- )
     cfg new 0 get >>entry
diff --git a/basis/compiler/cfg/ssa/destruction/interference/interference.factor b/basis/compiler/cfg/ssa/interference/interference.factor
similarity index 93%
rename from basis/compiler/cfg/ssa/destruction/interference/interference.factor
rename to basis/compiler/cfg/ssa/interference/interference.factor
index 92fce60205..c5f066e55b 100644
--- a/basis/compiler/cfg/ssa/destruction/interference/interference.factor
+++ b/basis/compiler/cfg/ssa/interference/interference.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators combinators.short-circuit
 kernel math namespaces sequences locals compiler.cfg.def-use
-compiler.cfg.dominance compiler.cfg.ssa.destruction.live-ranges ;
-IN: compiler.cfg.ssa.destruction.interference
+compiler.cfg.dominance compiler.cfg.ssa.interference.live-ranges ;
+IN: compiler.cfg.ssa.interference
 
 <PRIVATE
 
diff --git a/basis/compiler/cfg/ssa/destruction/live-ranges/live-ranges.factor b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor
similarity index 97%
rename from basis/compiler/cfg/ssa/destruction/live-ranges/live-ranges.factor
rename to basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor
index 01aebd7e1c..151af8bea4 100644
--- a/basis/compiler/cfg/ssa/destruction/live-ranges/live-ranges.factor
+++ b/basis/compiler/cfg/ssa/interference/live-ranges/live-ranges.factor
@@ -3,7 +3,7 @@
 USING: accessors assocs fry kernel namespaces sequences math
 arrays compiler.cfg.def-use compiler.cfg.instructions
 compiler.cfg.liveness.ssa compiler.cfg.rpo ;
-IN: compiler.cfg.ssa.destruction.live-ranges
+IN: compiler.cfg.ssa.interference.live-ranges
 
 ! Live ranges for interference testing