Fix bootstrap

diff --git a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
index c38f43da8ad5dc28097658ca544a7e3df88c284a..975adfa6cb19ab2ec6e130bbb90822755d812fb6 100644 (file)
--- a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
+++ b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
@@ -20,7 +20,7 @@ MIXIN: dataflow-analysis
 
 GENERIC# compute-in-set 2 ( bb out-sets dfa -- set )
 
-! M: kill-block compute-in-set 3drop f ;
+M: kill-block compute-in-set 3drop f ;
 
 M:: basic-block compute-in-set ( bb out-sets dfa -- set )
     bb dfa predecessors [ out-sets at ] map dfa join-sets ;
@@ -31,7 +31,7 @@ M:: basic-block compute-in-set ( bb out-sets dfa -- set )
 
 GENERIC# compute-out-set 2 ( bb out-sets dfa -- set )
 
-! M: kill-block compute-out-set 3drop f ;
+M: kill-block compute-out-set 3drop f ;
 
 M:: basic-block compute-out-set ( bb in-sets dfa -- set )
     bb in-sets at bb dfa transfer-set ;

diff --git a/basis/compiler/cfg/dcn/dcn-tests.factor b/basis/compiler/cfg/dcn/dcn-tests.factor
index 43a66a8012f67a51949351702d7f7ca583ccbda8..3dfaa665aa60496db51da540dbd0ac181535127f 100644 (file)
--- a/basis/compiler/cfg/dcn/dcn-tests.factor
+++ b/basis/compiler/cfg/dcn/dcn-tests.factor
@@ -13,7 +13,6 @@ compiler.cfg.dcn.height
 compiler.cfg.dcn.local
 compiler.cfg.dcn.local.private
 compiler.cfg.dcn.global
-compiler.cfg.dcn.global.private
 compiler.cfg.dcn.rewrite ;
 
 : test-local-dcn ( insns -- insns' )

diff --git a/basis/compiler/cfg/dcn/global/global.factor b/basis/compiler/cfg/dcn/global/global.factor
index 44f8af24cc92308ec658a022fd6285453de0b93c..21a795151a32cc850c0866bde990805706b884bb 100644 (file)
--- a/basis/compiler/cfg/dcn/global/global.factor
+++ b/basis/compiler/cfg/dcn/global/global.factor
@@ -4,8 +4,6 @@ USING: assocs kernel combinators compiler.cfg.dataflow-analysis
 compiler.cfg.dcn.local ;
 IN: compiler.cfg.dcn.global
 
-<PRIVATE
-
 ! Peek analysis. Peek-in is the set of all locations anticipated at
 ! the start of a basic block.
 BACKWARD-ANALYSIS: peek
@@ -30,8 +28,6 @@ BACKWARD-ANALYSIS: kill
 
 M: kill-analysis transfer-set drop replace assoc-union ;
 
-PRIVATE>
-
 ! Main word
 : compute-global-sets ( cfg -- )
     {