From e6637a1118e17e18de21308edee42a778cdb3f41 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 8 Sep 2008 19:02:24 -0500
Subject: [PATCH] Cleanup

---
 .../tree/branch-fusion/branch-fusion.factor   |  5 -----
 .../tree/loop/inversion/inversion.factor      |  5 -----
 .../compiler/tree/optimizer/optimizer.factor  | 19 +++++++++----------
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 basis/compiler/tree/branch-fusion/branch-fusion.factor
 delete mode 100644 basis/compiler/tree/loop/inversion/inversion.factor

diff --git a/basis/compiler/tree/branch-fusion/branch-fusion.factor b/basis/compiler/tree/branch-fusion/branch-fusion.factor
deleted file mode 100644
index b1078c85fb..0000000000
--- a/basis/compiler/tree/branch-fusion/branch-fusion.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-! Copyright (C) 2008 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-IN: compiler.tree.branch-fusion
-
-: fuse-branches ( nodes -- nodes' ) ;
diff --git a/basis/compiler/tree/loop/inversion/inversion.factor b/basis/compiler/tree/loop/inversion/inversion.factor
deleted file mode 100644
index 719fc4ad70..0000000000
--- a/basis/compiler/tree/loop/inversion/inversion.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-! Copyright (C) 2008 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-IN: compiler.tree.loop.inversion
-
-: invert-loops ( nodes -- nodes' ) ;
diff --git a/basis/compiler/tree/optimizer/optimizer.factor b/basis/compiler/tree/optimizer/optimizer.factor
index 593c13b277..aafc7f137b 100644
--- a/basis/compiler/tree/optimizer/optimizer.factor
+++ b/basis/compiler/tree/optimizer/optimizer.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler.tree.normalization
+USING: kernel namespaces
+compiler.tree.normalization
 compiler.tree.propagation
 compiler.tree.cleanup
 compiler.tree.escape-analysis
@@ -9,26 +10,24 @@ compiler.tree.def-use
 compiler.tree.dead-code
 compiler.tree.strength-reduction
 compiler.tree.loop.detection
-compiler.tree.loop.inversion
-compiler.tree.branch-fusion
 compiler.tree.finalization
 compiler.tree.checker ;
 IN: compiler.tree.optimizer
 
+SYMBOL: check-optimizer?
+
 : optimize-tree ( nodes -- nodes' )
     normalize
     propagate
     cleanup
     detect-loops
-    ! invert-loops
-    ! fuse-branches
     escape-analysis
     unbox-tuples
     compute-def-use
     remove-dead-code
-    finalize
     ! strength-reduce
-    ! USE: kernel
-    ! compute-def-use
-    ! dup check-nodes
-    ;
+    check-optimizer? get [
+        compute-def-use
+        dup check-nodes
+    ] when
+    finalize ;