Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : supercompiler

http://hackage.haskell.org/trac/ghc/changeset/6b8c90246bcee13f03bdb20352b25d425412b1e7

>---------------------------------------------------------------

commit 6b8c90246bcee13f03bdb20352b25d425412b1e7
Author: Max Bolingbroke <batterseapo...@hotmail.com>
Date:   Fri Oct 19 16:23:21 2012 +0100

    Slight improvement to power of reduce termination test by using gc, more 
debug output

>---------------------------------------------------------------

 .../supercompile/Supercompile/Drive/Process.hs     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/supercompile/Supercompile/Drive/Process.hs 
b/compiler/supercompile/Supercompile/Drive/Process.hs
index 0048c49..e8bcf28 100644
--- a/compiler/supercompile/Supercompile/Drive/Process.hs
+++ b/compiler/supercompile/Supercompile/Drive/Process.hs
@@ -891,9 +891,9 @@ reduce' orig_state = go False (mkLinearHistory rEDUCE_WQO) 
orig_state
           Just (deeds, heap, k, e)
            | Just deeds' <- if bOUND_STEPS then claimStep deeds else Just deeds
            , let state' = (deeds', heap, k, e)
-           -> case terminate hist state of
+           -> case terminate hist (gc state) of
             Continue hist' -> go True hist' state'
-            Stop old_state -> pprTrace "reduce-stop" {- (pPrintFullState 
quietStatePrettiness old_state $$ pPrintFullState quietStatePrettiness state) 
-} empty
+            Stop old_state -> pprTrace "reduce-stop" {--} (pPrintFullState 
quietStatePrettiness old_state $$ pPrintFullState quietStatePrettiness state) 
{--} -- empty
                               -- let smmrse s@(_, _, _, qa) = pPrintFullState 
s $$ case annee qa of Question _ -> text "Question"; Answer _ -> text "Answer" 
in
                               -- pprPreview2 "reduce-stop" (smmrse old_state) 
(smmrse state) $
                               (can_step, mempty { stat_reduce_stops = 1 }, if 
rEDUCE_ROLLBACK then old_state else state') -- TODO: generalise?



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to