[Remove last remains of PPrint in FrontEnd
John Meacham <john@repetae.net>**20050502041600] hunk ./FrontEnd/PPrint.hs 1
------------------------------------------------------------------------------
--- PPrint:	Print functions
------------------------------------------------------------------------------
-
---module PPrint(module PPrint, module Text.PrettyPrint.HughesPJ) where
-module PPrint(PPrint(..), module Text.PrettyPrint.HughesPJ, pretty) where
-import Text.PrettyPrint.HughesPJ
-import Doc.DocLike
-import Doc.PPrint
-
-pretty  :: PPrint Doc a => a -> String
-pretty   = render . pprint
-
-{-
-
------------------------------------------------------------------------------
--- This module contains definitions that do not appear in the
--- typeset version of the paper.
-
------------------------------------------------------------------------------
--- Pretty printing; a replacement for Show:
-
-
-ppParen    :: Bool -> Doc -> Doc
-ppParen t x = if t then parens x else x
-
-class PPrint a where
-  pprint    :: a -> Doc
-
-  parPprint :: a -> Doc
-  parPprint  = parens . pprint
-
-  pplist    :: [a] -> Doc
-  pplist    xs = brackets (hcat (punctuate comma (map pprint xs)))
-
-  pptuple   :: [a] -> Doc
-  pptuple   xs = parens (hcat (punctuate comma (map pprint xs)))
-
-instance PPrint a => PPrint [a] where
-  pprint  = pplist
-
-instance PPrint Char where
-  pprint  = char
-  pplist  = text
-
-instance PPrint Integer where
-  pprint  = integer
-
-instance PPrint Int where
-  pprint  = int
-
-instance PPrint Float where
-  pprint  = float
-
-instance PPrint Double where
-  pprint  = double
-
-instance (PPrint a, PPrint b) => PPrint (a,b) where
-  pprint (x,y) = parens (sep [pprint x <> comma, pprint y])
-
-instance (PPrint a, PPrint b, PPrint c) => PPrint (a,b,c) where
-  pprint (x,y,z) = parens (sep [pprint x <> comma,
-                                pprint y <> comma,
-                                pprint z])
-
------------------------------------------------------------------------------
--}
rmfile ./FrontEnd/PPrint.hs
hunk ./E/FromHs.hs 31
-import qualified PPrint(render)
+import qualified Text.PrettyPrint.HughesPJ as PPrint
hunk ./E/FromHs.hs 250
-        | Func _ s _ _ <- p, "void" <- toExtType rt' = 
+        | Func _ s _ _ <- p, "void" <- toExtType rt' =
hunk ./E/FromHs.hs 253
-        | Func _ s _ _ <- p = 
+        | Func _ s _ _ <- p =
hunk ./FrontEnd/Class.hs 61
+import Text.PrettyPrint.HughesPJ as PPrint
hunk ./FrontEnd/Class.hs 72
-import PPrint    
hunk ./FrontEnd/Class.hs 792
+
+pretty  :: PPrint Doc a => a -> String
+pretty   = render . pprint
hunk ./FrontEnd/Diagnostic.hs 28
-import PPrint (PPrint, pretty)
hunk ./FrontEnd/FrontEnd.hs 16
+import qualified Doc.PPrint as PPrint
hunk ./FrontEnd/FrontEnd.hs 18
-import qualified PPrint
+import qualified Text.PrettyPrint.HughesPJ as PPrint
hunk ./FrontEnd/HsPretty.hs 26
+import Char
+import FlagDump as FD
+import FrontEnd.Rename(unRename)
hunk ./FrontEnd/HsPretty.hs 30
-import qualified PPrint as P
-import qualified Text.PrettyPrint.HughesPJ as P
hunk ./FrontEnd/HsPretty.hs 31
-import FlagDump as FD
-import Char
+import qualified Doc.PPrint as P
+import qualified Text.PrettyPrint.HughesPJ as P
hunk ./FrontEnd/HsPretty.hs 34
-import FrontEnd.Rename(unRename)
hunk ./FrontEnd/Representation.hs 35
-import PPrint(Doc,pprint,PPrint,pptuple,nest)
+import Doc.PPrint(pprint,PPrint)
+import Text.PrettyPrint.HughesPJ(nest,Doc)
hunk ./FrontEnd/TIMain.hs 3
-        Copyright:              Mark Jones and The Hatchet Team 
+        Copyright:              Mark Jones and The Hatchet Team
hunk ./FrontEnd/TIMain.hs 8
-        Description:            The main components of the type inference 
+        Description:            The main components of the type inference
hunk ./FrontEnd/TIMain.hs 25
-import HsPretty 
-import qualified PPrint
+import HsPretty
hunk ./FrontEnd/TIMain.hs 27
-import Representation     
-import Type      
-import Diagnostic 
+import Representation
+import Type
+import Diagnostic
hunk ./FrontEnd/TIMain.hs 41
-                                 groupEquations,
hunk ./FrontEnd/TIMain.hs 47
-import Maybe                    (fromMaybe)
hunk ./FrontEnd/TIMain.hs 49
-                                   
-import DeclsDepends             (getDeclDeps)                                
+
+import DeclsDepends             (getDeclDeps)
hunk ./FrontEnd/TIMain.hs 54
-import Doc.PPrint
+import Doc.PPrint as PPrint
+import qualified Text.PrettyPrint.HughesPJ as PPrint
hunk ./FrontEnd/TIMain.hs 60
-isBindDecl HsFunBind {} = True 
+isBindDecl HsFunBind {} = True
hunk ./FrontEnd/TIMain.hs 70
-   tv (_, y) = tv y 
+   tv (_, y) = tv y
hunk ./FrontEnd/TIMain.hs 83
-tiExpr env (HsVar v) = error $ "tiExpr: could not find type scheme for: " ++ show v ++ " " ++ show env        
-    
+tiExpr env (HsVar v) = error $ "tiExpr: could not find type scheme for: " ++ show v ++ " " ++ show env
+
hunk ./FrontEnd/TIMain.hs 86
-                  
+
hunk ./FrontEnd/TIMain.hs 88
-                  Nothing -> error $ "tiExpr: could not find type scheme for: " ++ 
-		                     show v ++ " " ++ showEnv env 
+                  Nothing -> error $ "tiExpr: could not find type scheme for: " ++
+		                     show v ++ " " ++ showEnv env
hunk ./FrontEnd/TIMain.hs 97
- = do 
+ = do
hunk ./FrontEnd/TIMain.hs 108
-    (ps,nenv, t) <- tiExpr env e 
+    (ps,nenv, t) <- tiExpr env e
hunk ./FrontEnd/TIMain.hs 116
- = withContext 
+ = withContext
hunk ./FrontEnd/TIMain.hs 119
-       (ps, env1, te1) <- tiExpr env e1 
-       (qs, env2, te2) <- tiExpr env e2 
-       (rs, env3, te3) <- tiExpr env e3 
+       (ps, env1, te1) <- tiExpr env e1
+       (qs, env2, te2) <- tiExpr env e2
+       (rs, env3, te3) <- tiExpr env e3
hunk ./FrontEnd/TIMain.hs 131
-      (qs, env2, te2) <- tiExpr env e2 
+      (qs, env2, te2) <- tiExpr env e2
hunk ./FrontEnd/TIMain.hs 145
-        return (IsIn classNum te : ps, env1, te) 
+        return (IsIn classNum te : ps, env1, te)
hunk ./FrontEnd/TIMain.hs 156
- = withContext 
+ = withContext
hunk ./FrontEnd/TIMain.hs 164
-         return (ps ++ qs, env1 `Map.union` env2, t) 
+         return (ps ++ qs, env1 `Map.union` env2, t)
hunk ./FrontEnd/TIMain.hs 168
-      (simpleMsg $ 
+      (simpleMsg $
hunk ./FrontEnd/TIMain.hs 202
-        withContext (simpleMsg "in a do expression") 
+        withContext (simpleMsg "in a do expression")
hunk ./FrontEnd/TIMain.hs 207
-   = withContext                
+   = withContext
hunk ./FrontEnd/TIMain.hs 228
-        unifyList typeList 
+        unifyList typeList
hunk ./FrontEnd/TIMain.hs 231
-        return (preds, env1, TAp tList (head typeList)) 
+        return (preds, env1, TAp tList (head typeList))
+
hunk ./FrontEnd/TIMain.hs 235
-        
-tiExpr env (HsParen e) = tiExpr env e 
+tiExpr env (HsParen e) = tiExpr env e
hunk ./FrontEnd/TIMain.hs 249
-        return (e1Ps ++ e2Ps, envE1 `Map.union` envE2, tv) 
+        return (e1Ps ++ e2Ps, envE1 `Map.union` envE2, tv)
hunk ./FrontEnd/TIMain.hs 252
--- I know this looks weird but it appears to be correct 
+-- I know this looks weird but it appears to be correct
hunk ./FrontEnd/TIMain.hs 254
--- e2 :: a -> b -> c 
+-- e2 :: a -> b -> c
hunk ./FrontEnd/TIMain.hs 264
-        return (e1Ps ++ e2Ps, envE1 `Map.union` envE2, tv1 `fn` tv2) 
+        return (e1Ps ++ e2Ps, envE1 `Map.union` envE2, tv1 `fn` tv2)
hunk ./FrontEnd/TIMain.hs 282
-        return (IsIn classEnum e1T : IsIn classEnum e2T : (e1Ps ++ e2Ps), 
-                e1Env `Map.union` e2Env, 
+        return (IsIn classEnum e1T : IsIn classEnum e2T : (e1Ps ++ e2Ps),
+                e1Env `Map.union` e2Env,
hunk ./FrontEnd/TIMain.hs 291
-        return (IsIn classEnum e1T : IsIn classEnum e2T : (e1Ps ++ e2Ps), 
-                e1Env `Map.union` e2Env, 
+        return (IsIn classEnum e1T : IsIn classEnum e2T : (e1Ps ++ e2Ps),
+                e1Env `Map.union` e2Env,
hunk ./FrontEnd/TIMain.hs 301
-        return (IsIn classEnum e1T : IsIn classEnum e2T : IsIn classEnum e3T : (e1Ps ++ e2Ps ++ e3Ps), 
-                e1Env `Map.union` e2Env `Map.union` e3Env, 
+        return (IsIn classEnum e1T : IsIn classEnum e2T : IsIn classEnum e3T : (e1Ps ++ e2Ps ++ e3Ps),
+                e1Env `Map.union` e2Env `Map.union` e3Env,
hunk ./FrontEnd/TIMain.hs 309
-        let stmtsEnv = snd psEnv 
+        let stmtsEnv = snd psEnv
hunk ./FrontEnd/TIMain.hs 325
-tiStmts = tiStmtsAcc [] Map.empty 
+tiStmts = tiStmtsAcc [] Map.empty
hunk ./FrontEnd/TIMain.hs 328
-tiStmtsAcc predAcc envAcc _ [] 
+tiStmtsAcc predAcc envAcc _ []
hunk ./FrontEnd/TIMain.hs 335
- 
+
hunk ./FrontEnd/TIMain.hs 338
--- with lists: 
+-- with lists:
hunk ./FrontEnd/TIMain.hs 341
--- x :: a 
+-- x :: a
hunk ./FrontEnd/TIMain.hs 360
-   = withContext 
+   = withContext
hunk ./FrontEnd/TIMain.hs 362
-         do 
+         do
hunk ./FrontEnd/TIMain.hs 381
-                       
+
hunk ./FrontEnd/TIMain.hs 389
-     do 
-        psEnvTs <- mapM (tiGuardedAlt env) gAlts 
+     do
+        psEnvTs <- mapM (tiGuardedAlt env) gAlts
hunk ./FrontEnd/TIMain.hs 398
-        let rhsEnv      = Map.unions $ map snd3 rhsPsEnvTs 
+        let rhsEnv      = Map.unions $ map snd3 rhsPsEnvTs
hunk ./FrontEnd/TIMain.hs 410
-        (rhsPs, rhsEnv, rhsT)     <- tiExpr env eRhs 
+        (rhsPs, rhsEnv, rhsT)     <- tiExpr env eRhs
hunk ./FrontEnd/TIMain.hs 425
-    
+
hunk ./FrontEnd/TIMain.hs 429
-        (ps, env1)     <- tiSeq tiBindGroup env wheresBgs 
+        (ps, env1)     <- tiSeq tiBindGroup env wheresBgs
hunk ./FrontEnd/TIMain.hs 440
-        return (ps', matchesEnv, head ts') 
+        return (ps', matchesEnv, head ts')
hunk ./FrontEnd/TIMain.hs 443
-declDiagnostic decl@(HsPatBind sloc (HsPVar {}) _ _) = locMsg sloc "in the declaration" $ render $ ppHsDecl decl 
-declDiagnostic decl@(HsPatBind sloc pat _ _) = locMsg sloc "in the pattern binding" $ render $ ppHsDecl decl 
-declDiagnostic decl@(HsFunBind matches) = locMsg (srcLoc decl) "in the function binding" $ render $ ppHsDecl decl 
+declDiagnostic decl@(HsPatBind sloc (HsPVar {}) _ _) = locMsg sloc "in the declaration" $ render $ ppHsDecl decl
+declDiagnostic decl@(HsPatBind sloc pat _ _) = locMsg sloc "in the pattern binding" $ render $ ppHsDecl decl
+declDiagnostic decl@(HsFunBind matches) = locMsg (srcLoc decl) "in the function binding" $ render $ ppHsDecl decl
hunk ./FrontEnd/TIMain.hs 448
---       = case matches of 
+--       = case matches of
hunk ./FrontEnd/TIMain.hs 456
-   = do psEnvT <- tiDecl env decl 
+   = do psEnvT <- tiDecl env decl
hunk ./FrontEnd/TIMain.hs 459
- 
+
hunk ./FrontEnd/TIMain.hs 470
-        let wheresBgs = getFunDeclsBg sigEnv wheres 
-        (wheresPs, wheresEnv) <- tiSeq tiBindGroup (patsEnv `Map.union` env) wheresBgs  
+        let wheresBgs = getFunDeclsBg sigEnv wheres
+        (wheresPs, wheresEnv) <- tiSeq tiBindGroup (patsEnv `Map.union` env) wheresBgs
hunk ./FrontEnd/TIMain.hs 488
-        let rhsPs      = concatMap fst3 rhsPsEnvTs 
+        let rhsPs      = concatMap fst3 rhsPsEnvTs
hunk ./FrontEnd/TIMain.hs 492
-        let rhsEnv      = Map.unions $ map snd3 rhsPsEnvTs 
+        let rhsEnv      = Map.unions $ map snd3 rhsPsEnvTs
hunk ./FrontEnd/TIMain.hs 496
-        
+
hunk ./FrontEnd/TIMain.hs 505
-        return ((guardPs, guardEnv, guardT), (rhsPs, rhsEnv, rhsT)) 
+        return ((guardPs, guardEnv, guardT), (rhsPs, rhsEnv, rhsT))
+
hunk ./FrontEnd/TIMain.hs 508
-        
hunk ./FrontEnd/TIMain.hs 518
- = withContext 
+ = withContext
hunk ./FrontEnd/TIMain.hs 520
-    do 
+    do
hunk ./FrontEnd/TIMain.hs 529
-           fs      = tv (apply s env) 
+           fs      = tv (apply s env)
hunk ./FrontEnd/TIMain.hs 553
-restricted bs 
+restricted bs
hunk ./FrontEnd/TIMain.hs 555
-   where 
+   where
hunk ./FrontEnd/TIMain.hs 564
-      let 
+      let
hunk ./FrontEnd/TIMain.hs 567
-          newEnv1 = Map.fromList $ zip is scs -- map assumpToPair $ zipWith makeAssump is scs 
-          env'    = newEnv1 `Map.union` env 
+          newEnv1 = Map.fromList $ zip is scs -- map assumpToPair $ zipWith makeAssump is scs
+          env'    = newEnv1 `Map.union` env
hunk ./FrontEnd/TIMain.hs 575
-          fs      = tv (apply s env)  
+          fs      = tv (apply s env)
hunk ./FrontEnd/TIMain.hs 590
-          in return (ds,  (Map.unions envs) `Map.union` newEnv3)  
+          in return (ds,  (Map.unions envs) `Map.union` newEnv3)
hunk ./FrontEnd/TIMain.hs 606
-   = do 
+   = do
hunk ./FrontEnd/TIMain.hs 611
-     explPsEnv   <- mapM (tiExpl (implEnv `Map.union` env1 `Map.union` env)) es 
+     explPsEnv   <- mapM (tiExpl (implEnv `Map.union` env1 `Map.union` env)) es
hunk ./FrontEnd/TIMain.hs 647
- 
+
hunk ./FrontEnd/TIMain.hs 658
-           -> ((scheme, d):restExpls, restImpls) 
+           -> ((scheme, d):restExpls, restImpls)
hunk ./FrontEnd/TIMain.hs 672
-  do (ps, env1) <- tiSeq tiBindGroup env bgs 
+  do (ps, env1) <- tiSeq tiBindGroup env bgs
hunk ./FrontEnd/TIMain.hs 676
-       Right s' -> return $  apply ( s'@@s)  env1 
-       --Nothing -> return $  apply  s env1 
+       Right s' -> return $  apply ( s'@@s)  env1
+       --Nothing -> return $  apply  s env1
hunk ./FrontEnd/TIMain.hs 683
--- Typing Literals 
+-- Typing Literals
hunk ./FrontEnd/TIMain.hs 687
-tiLit (HsInt _)  
-   = do 
+tiLit (HsInt _)
+   = do
hunk ./FrontEnd/TIMain.hs 692
-tiLit (HsFrac _) 
-   = do 
+tiLit (HsFrac _)
+   = do
hunk ./FrontEnd/TIMain.hs 705
-tiPat (HsPVar i) = do 
+tiPat (HsPVar i) = do
hunk ./FrontEnd/TIMain.hs 711
-tiPat (HsPLit l) 
-   = do 
+tiPat (HsPLit l)
+   = do
hunk ./FrontEnd/TIMain.hs 741
-        return (ps++qs, env, t') 
+        return (ps++qs, env, t')
hunk ./FrontEnd/TIMain.hs 745
-        (ps, env, ts) <- tiPats pats 
-        return (ps, env, tTTuple ts) 
+        (ps, env, ts) <- tiPats pats
+        return (ps, env, tTTuple ts)
hunk ./FrontEnd/TIMain.hs 764
- = do (ps, env, t) <- tiPat pat 
+ = do (ps, env, t) <- tiPat pat
hunk ./FrontEnd/TIMain.hs 774
- = tiPat p 
+ = tiPat p
hunk ./FrontEnd/TIModule.hs 30
-import qualified PPrint 
+import Doc.PPrint as PPrint
+import Text.PrettyPrint.HughesPJ as PPrint
hunk ./FrontEnd/TIModule.hs 40
-import PPrint
hunk ./FrontEnd/TIMonad.hs 45
-import Control.Monad.State hiding(State(..))
hunk ./FrontEnd/TIMonad.hs 46
+import Text.PrettyPrint.HughesPJ(render,Doc)
+import Doc.PPrint(pprint,PPrint)
hunk ./FrontEnd/TIMonad.hs 52
-import PPrint                (pretty)
hunk ./FrontEnd/TIMonad.hs 57
-import VConsts
hunk ./FrontEnd/TIMonad.hs 260
+pretty  :: PPrint Doc a => a -> String
+pretty   = render . pprint
hunk ./FrontEnd/Utils.hs 20
---import PPrint (PPrint (..),vcat)
hunk ./Ho.hs 6
+
hunk ./Ho.hs 16
+import Directory
hunk ./Ho.hs 18
-import E.E 
-import qualified PPrint(render)
+import Doc.PPrint
+import Doc.Pretty
+import E.E
+import E.Inline(emapE)
hunk ./Ho.hs 23
+import E.Subst(substMap'')
hunk ./Ho.hs 25
+import FrontEnd.HsParser
hunk ./Ho.hs 27
+import FrontEnd.ParseMonad
hunk ./Ho.hs 30
-import FrontEnd.ParseMonad
-import FrontEnd.HsParser
hunk ./Ho.hs 31
+import IO(bracket)
hunk ./Ho.hs 35
-import Doc.Pretty
+import Maybe
hunk ./Ho.hs 41
+import qualified Data.Map as Map
hunk ./Ho.hs 44
-import qualified Data.Map as Map
+import qualified Text.PrettyPrint.HughesPJ as PPrint
hunk ./Ho.hs 48
+import Text.PrettyPrint.HughesPJ(render)
hunk ./Ho.hs 51
-import Doc.PPrint
-import Directory
-import Maybe
-import IO(bracket)
-import E.Subst(substMap'')
-import E.Inline(emapE)
hunk ./Ho.hs 67
-    return $ fromJust $ getPrefix cd x `mplus` f pwd `mplus` liftM ("~/" ++) (f h) `mplus` return x 
+    return $ fromJust $ getPrefix cd x `mplus` f pwd `mplus` liftM ("~/" ++) (f h) `mplus` return x
hunk ./Ho.hs 69
-            
+
hunk ./Ho.hs 81
-    hoExports :: Map.Map Module [Name], 
+    hoExports :: Map.Map Module [Name],
hunk ./Ho.hs 83
-    hoAssumps :: Map.Map Name Scheme,        -- used for typechecking 
+    hoAssumps :: Map.Map Name Scheme,        -- used for typechecking
hunk ./Ho.hs 91
-    hoEs :: Map.Map Name (TVr,E), 
+    hoEs :: Map.Map Name (TVr,E),
hunk ./Ho.hs 95
+
hunk ./Ho.hs 97
-                      
hunk ./Ho.hs 112
-    a == b = map ($ a) fs == map ($ b) fs && fileDeviceID a == fileDeviceID b where 
+    a == b = map ($ a) fs == map ($ b) fs && fileDeviceID a == fileDeviceID b where
hunk ./Ho.hs 115
-instance DocLike d => PPrint d FileDep where 
-    pprint fd = tshow (fileName fd) <> char ':' <+> tshow (fileModifyTime fd) 
+instance DocLike d => PPrint d FileDep where
+    pprint fd = tshow (fileName fd) <> char ':' <+> tshow (fileModifyTime fd)
hunk ./Ho.hs 118
-toFileDep fn fs = FileDep { 
-    fileName = toAtom fn 
-    ,fileModifyTime = fromEnum (modificationTime fs) 
-    ,fileDeviceID = toAtom $ show (deviceID fs) 
-    ,fileFileID = fromIntegral (fileID fs) 
-    ,fileFileSize = fromIntegral (fileSize fs) 
+toFileDep fn fs = FileDep {
+    fileName = toAtom fn
+    ,fileModifyTime = fromEnum (modificationTime fs)
+    ,fileDeviceID = toAtom $ show (deviceID fs)
+    ,fileFileID = fromIntegral (fileID fs)
+    ,fileFileSize = fromIntegral (fileSize fs)
hunk ./Ho.hs 126
-findFirstFile :: String -> [(String,a)] -> IO (Handle,FileDep,a) 
+findFirstFile :: String -> [(String,a)] -> IO (Handle,FileDep,a)
hunk ./Ho.hs 131
-    
+
hunk ./Ho.hs 136
-              -> (Ho -> [HsModule] -> IO Ho)     -- ^ Process set of mutually recursive modules to produce final Ho 
+              -> (Ho -> [HsModule] -> IO Ho)     -- ^ Process set of mutually recursive modules to produce final Ho
hunk ./Ho.hs 139
-findModule have need func  = do 
+findModule have need func  = do
hunk ./Ho.hs 145
-    let scc = map f $  stronglyConnComp [ (x,fromModule $ hsModuleName hs,hsModuleRequires hs) | x@(hs,fd,honm) <- ms ] 
+    let scc = map f $  stronglyConnComp [ (x,fromModule $ hsModuleName hs,hsModuleRequires hs) | x@(hs,fd,honm) <- ms ]
hunk ./Ho.hs 154
-                mdeps = [ (m,runIdentity $ Map.lookup m (hoModules ho)) | m <- mods'] 
+                mdeps = [ (m,runIdentity $ Map.lookup m (hoModules ho)) | m <- mods']
hunk ./Ho.hs 156
-            f (ho `mappend` ho') scs 
-    f (ho `mappend` have) scc 
+            f (ho `mappend` ho') scs
+    f (ho `mappend` have) scc
hunk ./Ho.hs 162
-    bracket (openGetFileDep fn) (hClose . fst) $ \ (fh,dep) -> do 
+    bracket (openGetFileDep fn) (hClose . fst) $ \ (fh,dep) -> do
hunk ./Ho.hs 168
---        return Nothing 
---     else do 
+--        return Nothing
+--     else do
hunk ./Ho.hs 174
-    if x /= magic then (putErrLn $ "Bad ho file:" <+> fn)  >> return Nothing else do 
+    if x /= magic then (putErrLn $ "Bad ho file:" <+> fn)  >> return Nothing else do
hunk ./Ho.hs 178
-        ho <- get bh 
+        ho <- get bh
hunk ./Ho.hs 180
-        if x /= magic2 then (putErrLn $ "Bad ho file:" <+> fn)  >>  return Nothing else do 
+        if x /= magic2 then (putErrLn $ "Bad ho file:" <+> fn)  >>  return Nothing else do
hunk ./Ho.hs 189
-     
+
hunk ./Ho.hs 192
-readHoFile :: String -> IO (HoHeader,Ho)  
+readHoFile :: String -> IO (HoHeader,Ho)
hunk ./Ho.hs 196
+    x <- get bh
+    when (x /= magic) (putErrDie $ "Bad ho file magic1:" <+> fn)
+    hh <- get bh
+    ho <- get bh
hunk ./Ho.hs 201
-    when (x /= magic) (putErrDie $ "Bad ho file magic1:" <+> fn)  
-    hh <- get bh 
-    ho <- get bh 
-    x <- get bh 
-    when (x /= magic2) (putErrDie $ "Bad ho file magic2:" <+> fn)  
+    when (x /= magic2) (putErrDie $ "Bad ho file magic2:" <+> fn)
hunk ./Ho.hs 203
-    
+
hunk ./Ho.hs 208
-    (hoh,ho) <- readHoFile fn 
-    putStrLn fn 
+    (hoh,ho) <- readHoFile fn
+    putStrLn fn
hunk ./Ho.hs 226
-    when (dump FD.Kind) $ do 
+    when (dump FD.Kind) $ do
hunk ./Ho.hs 235
-    when (dump FD.Rules) $ do 
+    when (dump FD.Rules) $ do
hunk ./Ho.hs 244
-        putStrLn $ PPrint.render $ pprint (hoAssumps ho) 
-        
+        putStrLn $ PPrint.render $ pprint (hoAssumps ho)
+
hunk ./Ho.hs 250
-    
+
hunk ./Ho.hs 252
- 
-recordHoFile :: 
+
+recordHoFile ::
hunk ./Ho.hs 262
-            putErrLn $ "Skipping Writing Ho Files: " ++ show fs' 
+            putErrLn $ "Skipping Writing Ho Files: " ++ show fs'
hunk ./Ho.hs 269
-            mapM_ (l fn) fs 
+            mapM_ (l fn) fs
hunk ./Ho.hs 276
-                when (optNoWriteHo options) $ putErr "Skipping " 
+                when (optNoWriteHo options) $ putErr "Skipping "
hunk ./Ho.hs 280
-            removeLink' tfn 
-            createLink fn tfn 
+            removeLink' tfn
+            createLink fn tfn
hunk ./Ho.hs 285
-                when (optNoWriteHo options) $ putErr "Skipping " 
+                when (optNoWriteHo options) $ putErr "Skipping "
hunk ./Ho.hs 293
-            put bh header 
+            put bh header
hunk ./Ho.hs 307
--- contents of files that still need to be processed, This chases dependencies so 
+-- contents of files that still need to be processed, This chases dependencies so
hunk ./Ho.hs 311
-getModule :: 
+getModule ::
hunk ./Ho.hs 313
-    -> String   -- ^ Module name for printing error messages 
+    -> String   -- ^ Module name for printing error messages
hunk ./Ho.hs 316
-getModule ho name files  = do         
+getModule ho name files  = do
hunk ./Ho.hs 324
-            (fh,fd,ho_name) <- findFirstFile name files 
+            (fh,fd,ho_name) <- findFirstFile name files
hunk ./Ho.hs 330
-                    return Nothing 
-                   else checkForHoFile ho_name 
-            case mho of 
-                Just (hh,ho') -> do 
-                    as <- mapM checkHoDep (hohModDepends hh) 
+                    return Nothing
+                   else checkForHoFile ho_name
+            case mho of
+                Just (hh,ho') -> do
+                    as <- mapM checkHoDep (hohModDepends hh)
hunk ./Ho.hs 336
-                        True -> do 
-                            fixups <- readIORef fixup_ref 
+                        True -> do
+                            fixups <- readIORef fixup_ref
hunk ./Ho.hs 340
-                            modifyIORef ho_ref (applyFixups nfixups ho' `mappend`) >> hClose fh 
-                        False -> addNeed name fd fh ho_name 
+                            modifyIORef ho_ref (applyFixups nfixups ho' `mappend`) >> hClose fh
+                        False -> addNeed name fd fh ho_name
hunk ./Ho.hs 346
-            --    putErrLn $ "checking dependency:" <+> show m <+> "at" <+> fromAtom (fileName fd) 
+            --    putErrLn $ "checking dependency:" <+> show m <+> "at" <+> fromAtom (fileName fd)
hunk ./Ho.hs 357
-                    case lookup m xs of 
+                    case lookup m xs of
hunk ./Ho.hs 362
-            cs <- if fopts FO.Cpp then filterInput "cpp" ["-D__JHC__","-traditional","-P"] fh 
+            cs <- if fopts FO.Cpp then filterInput "cpp" ["-D__JHC__","-traditional","-P"] fh
hunk ./Ho.hs 368
-            modifyIORef need_ref $ ((hsModuleName hs,(hs,fd,ho_name)):) 
+            modifyIORef need_ref $ ((hsModuleName hs,(hs,fd,ho_name)):)
hunk ./Ho.hs 376
-    noPrelude =   or $ not (optPrelude options):[ opt == c | opt <- hsModuleOptions x, c <- ["-N","--noprelude"]] 
+    noPrelude =   or $ not (optPrelude options):[ opt == c | opt <- hsModuleOptions x, c <- ["-N","--noprelude"]]
hunk ./Ho.hs 381
-    f m | (xs,'.':ys) <- span (/= '.') m = let n = (xs ++ "/" ++ ys) in m:f n 
+    f m | (xs,'.':ys) <- span (/= '.') m = let n = (xs ++ "/" ++ ys) in m:f n
hunk ./Ho.hs 384
+
hunk ./Ho.hs 386
- 
hunk ./Ho.hs 389
-                      ParseOk e -> return e 
-                      ParseFailed sl err -> putErrDie $ show sl ++ ": " ++ err 
-    where 
+                      ParseOk e -> return e
+                      ParseFailed sl err -> putErrDie $ show sl ++ ": " ++ err
+    where
hunk ./Ho.hs 398
-    f (t,e) = (t,sm e)  
+    f (t,e) = (t,sm e)
hunk ./Ho.hs 402
-eraseE :: E -> E 
+eraseE :: E -> E
hunk ./Ho.hs 408
-getFixups ho = Map.fromList [ (tvrIdent x,EVar x) | (x,_) <- Map.elems (hoEs ho)]  
+getFixups ho = Map.fromList [ (tvrIdent x,EVar x) | (x,_) <- Map.elems (hoEs ho)]
hunk ./Ho.hs 412
-    f (t,e) = (t,sm e)  
-    sm = substMap'' mie 
+    f (t,e) = (t,sm e)
+    sm = substMap'' mie
hunk ./Ho.hs 433
-    
+
hunk ./Ho.hs 439
-openGetStatus fn = do 
+openGetStatus fn = do
hunk ./Ho.hs 445
-                      
-    
+
+
hunk ./Ho.hs 462
-loadLibraries :: IO Ho 
+loadLibraries :: IO Ho
hunk ./Ho.hs 468
-        
-    
+
+
hunk ./Ho.hs 487
-        tt 'B' = tBool 
+        tt 'B' = tBool
hunk ./Ho.hs 491
-      -}  
+      -}
+
hunk ./Ho.hs 496
-    
hunk ./Ho.hs 503
-    (c,fd,honm) <- findFirstFile name files  
-    if fd == emptyFileDep then return (mempty,mempty,mempty) else do 
+    (c,fd,honm) <- findFirstFile name files
+    if fd == emptyFileDep then return (mempty,mempty,mempty) else do
hunk ./Ho.hs 513
-            modifyIORef ws $ Set.insert ( hsModuleName hs) 
+            modifyIORef ws $ Set.insert ( hsModuleName hs)
hunk ./Ho.hs 515
-            --mapM_ (modifyIORef ws) [Set.insert (Module x) | x <- hsModuleRequires hs] 
+            --mapM_ (modifyIORef ws) [Set.insert (Module x) | x <- hsModuleRequires hs]
hunk ./Ho.hs 520
-                    False -> Ho.getModule ws x (searchPaths x) 
+                    False -> Ho.getModule ws x (searchPaths x)
hunk ./Ho.hs 522
-                --    | otherwise = Ho.getModule ws x (searchPaths x) 
-            xs <- mapM f (hsModuleRequires hs) 
-            let x@(_,_,ds) = mconcat xs 
-            return $ mconcat [(mempty,[(hs,fd,honm,ds)],mempty),x] 
-            
+                --    | otherwise = Ho.getModule ws x (searchPaths x)
+            xs <- mapM f (hsModuleRequires hs)
+            let x@(_,_,ds) = mconcat xs
+            return $ mconcat [(mempty,[(hs,fd,honm,ds)],mempty),x]
+