X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=db90b8c828062c776604586e98437bd8226a0eb7;hb=fa56e2107bd1b097580fbd2cf2c5760a772cc402;hp=cdc54a1b7afc90ab144842d570600fccaffd9086;hpb=380512de6eef0cbb17431d9e64007a9320914e23;p=ghc-hetmet.git

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index cdc54a1..db90b8c 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -55,7 +55,7 @@ module Type (
 
 	-- Source types
 	predTypeRep, mkPredTy, mkPredTys,
-	tyConOrigHead,
+	tyConOrigHead, pprSourceTyCon,
 
 	-- Newtypes
 	splitRecNewType_maybe, newTyConInstRhs,
@@ -89,13 +89,14 @@ module Type (
 	mkTvSubst, mkOpenTvSubst, zipOpenTvSubst, zipTopTvSubst, mkTopTvSubst, notElemTvSubst,
 	getTvSubstEnv, setTvSubstEnv, getTvInScope, extendTvInScope,
  	extendTvSubst, extendTvSubstList, isInScope, composeTvSubst, zipTyEnv,
+        isEmptyTvSubst,
 
 	-- Performing substitution on types
 	substTy, substTys, substTyWith, substTheta, 
-	substPred, substTyVar, substTyVarBndr, deShadowTy, lookupTyVar,
+	substPred, substTyVar, substTyVars, substTyVarBndr, deShadowTy, lookupTyVar,
 
 	-- Pretty-printing
-	pprType, pprParendType, pprTyThingCategory, pprForAll,
+	pprType, pprParendType, pprTypeApp, pprTyThingCategory, pprForAll,
 	pprPred, pprTheta, pprThetaArrow, pprClassPred, pprKind, pprParendKind
     ) where
 
@@ -411,7 +412,6 @@ splitNewTyConApp_maybe other	      = Nothing
 newTyConInstRhs :: TyCon -> [Type] -> Type
 newTyConInstRhs tycon tys =
     let (tvs, ty) = newTyConRhs tycon in substTyWith tvs tys ty
-
 \end{code}
 
 
@@ -610,6 +610,16 @@ tyConOrigHead :: TyCon -> (TyCon, [Type])
 tyConOrigHead tycon = case tyConFamInst_maybe tycon of
 		        Nothing      -> (tycon, mkTyVarTys (tyConTyVars tycon))
 			Just famInst -> famInst
+
+-- Pretty prints a tycon, using the family instance in case of a
+-- representation tycon.  For example
+--  	e.g.  data T [a] = ...
+-- In that case we want to print `T [a]', where T is the family TyCon
+pprSourceTyCon tycon 
+  | Just (repTyCon, tys) <- tyConFamInst_maybe tycon
+  = ppr $ repTyCon `TyConApp` tys	       -- can't be FunTyCon
+  | otherwise
+  = ppr tycon
 \end{code}
 
 
@@ -724,13 +734,17 @@ It doesn't change the uniques at all, just the print names.
 
 \begin{code}
 tidyTyVarBndr :: TidyEnv -> TyVar -> (TidyEnv, TyVar)
-tidyTyVarBndr (tidy_env, subst) tyvar
+tidyTyVarBndr env@(tidy_env, subst) tyvar
   = case tidyOccName tidy_env (getOccName name) of
-      (tidy', occ') -> 	((tidy', subst'), tyvar')
-		    where
-			subst' = extendVarEnv subst tyvar tyvar'
-			tyvar' = setTyVarName tyvar name'
-			name'  = tidyNameOcc name occ'
+      (tidy', occ') -> ((tidy', subst'), tyvar'')
+	where
+	  subst' = extendVarEnv subst tyvar tyvar''
+	  tyvar' = setTyVarName tyvar name'
+	  name'  = tidyNameOcc name occ'
+		-- Don't forget to tidy the kind for coercions!
+	  tyvar'' | isCoVar tyvar = setTyVarKind tyvar' kind'
+		  | otherwise	  = tyvar'
+	  kind'  = tidyType env (tyVarKind tyvar)
   where
     name = tyVarName tyvar
 
@@ -1313,6 +1327,9 @@ substTyVar subst@(TvSubst in_scope env) tv
        	Just ty -> ty	-- See Note [Apply Once]
     } 
 
+substTyVars :: TvSubst -> [TyVar] -> [Type]
+substTyVars subst tvs = map (substTyVar subst) tvs
+
 lookupTyVar :: TvSubst -> TyVar  -> Maybe Type
 	-- See Note [Extending the TvSubst]
 lookupTyVar (TvSubst in_scope env) tv = lookupVarEnv env tv