[project @ 2001-10-19 14:22:11 by simonpj]

[ghc-hetmet.git] / ghc / compiler / basicTypes / PprEnv.lhs

diff --git a/ghc/compiler/basicTypes/PprEnv.lhs b/ghc/compiler/basicTypes/PprEnv.lhs
index 4e502e0..36293f3 100644 (file)
--- a/ghc/compiler/basicTypes/PprEnv.lhs
+++ b/ghc/compiler/basicTypes/PprEnv.lhs
@@ -10,17 +10,15 @@ module PprEnv (
 
        initPprEnv,
 
-       pCon, pBndr, pOcc, pSCC, 
+       pBndr, pOcc, pSCC, 
        pTy, pTyVarO
     ) where
 
 #include "HsVersions.h"
 
-import {-# SOURCE #-} Const ( Con )
-
-import Var             ( GenId, GenTyVar )
+import Var             ( Id, TyVar )
 import CostCentre      ( CostCentre )
-import Type            ( GenType )
+import Type            ( Type )
 import Outputable
 \end{code}
 
@@ -31,16 +29,15 @@ import Outputable
 %************************************************************************
 
 \begin{code}
-data PprEnv bndr flexi
+data PprEnv bndr
   = PE {
-       pCon :: Con        -> SDoc,
        pSCC :: CostCentre -> SDoc,
 
-       pTyVarO :: GenTyVar flexi -> SDoc,      -- to print tyvar occurrences
-       pTy     :: GenType flexi -> SDoc,       -- to print types
+       pTyVarO :: TyVar -> SDoc,       -- to print tyvar occurrences
+       pTy     :: Type -> SDoc,        -- to print types
 
        pBndr :: BindingSite -> bndr -> SDoc,   -- to print value binders
-       pOcc  :: GenId flexi -> SDoc            -- to print value occurrences
+       pOcc  :: Id -> SDoc             -- to print value occurrences
    }
 \end{code}
 
@@ -53,20 +50,18 @@ data BindingSite = LambdaBind | CaseBind | LetBind
 
 \begin{code}
 initPprEnv
-       :: Maybe (Con -> SDoc)
-       -> Maybe (CostCentre -> SDoc)
-       -> Maybe (GenTyVar flexi -> SDoc)
-       -> Maybe (GenType flexi -> SDoc)
+       :: Maybe (CostCentre -> SDoc)
+       -> Maybe (TyVar -> SDoc)
+       -> Maybe (Type -> SDoc)
        -> Maybe (BindingSite -> bndr -> SDoc)
-       -> Maybe (GenId flexi -> SDoc)
-       -> PprEnv bndr flexi
+       -> Maybe (Id -> SDoc)
+       -> PprEnv bndr
 
 -- you can specify all the printers individually; if
 -- you don't specify one, you get bottom
 
-initPprEnv p c tvo ty bndr occ
-  = PE (demaybe p)
-       (demaybe c)
+initPprEnv c tvo ty bndr occ
+  = PE (demaybe c)
        (demaybe tvo)
        (demaybe ty)
        (demaybe bndr)