From 754bb7f023bfd85d78414cc7c6a3804167db0a7c Mon Sep 17 00:00:00 2001
From: Neil Brown <neil@twistedsquare.com>
Date: Sun, 14 Dec 2008 18:59:15 +0000
Subject: [PATCH] Briefly fixed CheckFramework (and Checks) to compile, but not
 yet switched them over to using the Polyplate traversal mechanisms

---
 checks/Check.hs          | 2 +-
 checks/CheckFramework.hs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/checks/Check.hs b/checks/Check.hs
index 79733e4..111a001 100644
--- a/checks/Check.hs
+++ b/checks/Check.hs
@@ -448,7 +448,7 @@ showCodeExSet (NormalSet s)
     = do ss <- mapM showCode (Set.toList s)
          return $ "{" ++ joinWith ", " ss ++ "}"
 
-checkInitVarPass :: Pass
+checkInitVarPass :: Pass A.AST
 checkInitVarPass = pass "checkInitVar" [] []
   (passOnlyOnAST "checkInitVar" $ runChecks checkInitVar)
 
diff --git a/checks/CheckFramework.hs b/checks/CheckFramework.hs
index 3c546e6..0dc251a 100644
--- a/checks/CheckFramework.hs
+++ b/checks/CheckFramework.hs
@@ -421,7 +421,7 @@ applyAccum (accEmpty, accOneF, accJoinF) typeKeysGiven = applyAccum'
         f' (x, route, acc) = do
           x' <- f (x, route, acc)
           case x' of
-            Left y -> f' (y, route, foldl (flip accOneF) accEmpty (fastListify (const True) y))
+            Left y -> f' (y, route, foldl (flip accOneF) accEmpty (listify {-TODO-} (const True) y))
             Right y -> return y
 
 applyTopDown :: TypeSet -> (forall a. Data a => TransFunc a) ->
@@ -465,7 +465,7 @@ runChecks :: CheckOptM () -> A.AST -> PassM A.AST
 runChecks (CheckOptM m) x = execStateT m (CheckOptData {ast = x, parItems = Nothing,
   nextVarsTouched = Map.empty, flowGraphRootsTerms = Nothing, lastValidMeta = emptyMeta}) >>* ast
 
-runChecksPass :: CheckOptM () -> Pass
+runChecksPass :: CheckOptM () -> Pass A.AST
 runChecksPass c = pass "<Check>" [] [] (mkM (runChecks c))
 
 --getParItems :: CheckOptM (ParItems ())