X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2FbasicTypes%2FPprEnv.lhs;h=36293f36888cdfa994adb3af111735b79ff85d9e;hb=bbffa95af87bb66635aaffdaddcd31be063752dc;hp=4e502e05cc325f90e2f708d7a201768b72f1b3fb;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/PprEnv.lhs b/ghc/compiler/basicTypes/PprEnv.lhs
index 4e502e0..36293f3 100644
--- 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)