[project @ 1997-07-31 00:05:10 by sof]

[ghc-hetmet.git] / ghc / compiler / deforest / DefExpr.lhs

diff --git a/ghc/compiler/deforest/DefExpr.lhs b/ghc/compiler/deforest/DefExpr.lhs
index bae8836..57a2230 100644 (file)
--- a/ghc/compiler/deforest/DefExpr.lhs
+++ b/ghc/compiler/deforest/DefExpr.lhs
@@ -16,18 +16,17 @@
 > import TreelessForm
 > import Cyclic
 
-> import Type          ( applyTypeEnvToTy, isPrimType,
->                        SigmaType(..), Type
+> import Type          ( applyTypeEnvToTy,
+>                        SYN_IE(SigmaType), Type
 >                      )
 > import CmdLineOpts   ( SwitchResult, switchIsOn )
-> import CoreUnfold    ( UnfoldingDetails(..) )
+> import CoreUnfold    ( Unfolding(..) )
 > import CoreUtils     ( mkValLam, unTagBinders, coreExprType )
-> import Id            ( applyTypeEnvToId, getIdUnfolding, isTopLevId, Id,
+> import Id            ( applyTypeEnvToId, getIdUnfolding, Id,
 >                        isInstId_maybe
 >                      )
 > import Inst          -- Inst(..)
 > import IdInfo
-> import Maybes                ( Maybe(..) )
 > import Outputable
 > import UniqSupply
 > import Util
@@ -293,8 +292,8 @@ should an unfolding be required.
 >              then  no_unfold
 >
 >              else case (getIdUnfolding id) of
->                      GenForm _ expr guidance ->
->                        panic "DefExpr:GenForm has changed a little; needs mod here"
+>                      SimpleUnfolding _ expr guidance ->
+>                        panic "DefExpr:SimpleUnfolding has changed a little; needs mod here"
 >                        -- SLPJ March 95
 >
 >--???                   -- ToDo: too much overhead here.
@@ -311,7 +310,7 @@ should an unfolding be required.
 
 >                      {- panic
 >                              ("DefExpr(tran): Deforestable id `"
->                              ++ ppShow 80 (ppr PprDebug id)
+>                              ++ show (ppr PprDebug id)
 >                              ++ "' doesn't have an unfolding.") -}
 
 -----------------------------------------------------------------------------
@@ -450,14 +449,14 @@ and substitute the new function calls throughout the function set.
 >                              ++ showIds evs
 >                              ++ "\n{ input:\n" ++ (concat (map showBind (zip vs' es'))) ++ "}\n"
 >                              ++ "{ result:\n" ++ (concat  (map showBind (zip evs ees))) ++ "}\n") res
->                 where showBind (v,e) = ppShow 80 (ppr PprDebug v) ++ "=\n" ++ ppShow 80 (ppr PprDebug e) ++ "\n"
+>                 where showBind (v,e) = show (ppr PprDebug v) ++ "=\n" ++ show (ppr PprDebug e) ++ "\n"
 
 > tranRecBind sw p t (id,e) =
 >      tran sw p t e []                        `thenUs` \e ->
 >      returnUs (applyTypeEnvToId t id,e)
 
 > showIds :: [Id] -> String
-> showIds ids = "(" ++ concat (map ((' ' :) . ppShow 80 . ppr PprDebug) ids)
+> showIds ids = "(" ++ concat (map ((' ' :) . show . ppr PprDebug) ids)
 >      ++ " )"
 
 -----------------------------------------------------------------------------