X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=37f915be1dfca92944994916e3bc02fe5a1d3fae;hb=ff8e1d01524b48e028b09e2b04b2e5303cb6d95f;hp=480357e80b0054ed93bab6b30c62b568c3c8abb0;hpb=121da25a0d638bbe6c7f90525ff50b3a20949bbc;p=ghc-hetmet.git

diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs
index 480357e..37f915b 100644
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@ -54,7 +54,7 @@ module Type (
 	applyTy, applyTys, isForAllTy, dropForAlls,
 
 	-- Source types
-	predTypeRep, mkPredTy, mkPredTys,
+	predTypeRep, mkPredTy, mkPredTys, pprSourceTyCon, mkFamilyTyConApp,
 
 	-- Newtypes
 	splitRecNewType_maybe, newTyConInstRhs,
@@ -88,13 +88,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
 
@@ -410,7 +411,6 @@ splitNewTyConApp_maybe other	      = Nothing
 newTyConInstRhs :: TyCon -> [Type] -> Type
 newTyConInstRhs tycon tys =
     let (tvs, ty) = newTyConRhs tycon in substTyWith tvs tys ty
-
 \end{code}
 
 
@@ -602,6 +602,30 @@ predTypeRep (ClassP clas tys) = mkTyConApp (classTyCon clas) tys
 	-- Result might be a newtype application, but the consumer will
 	-- look through that too if necessary
 predTypeRep (EqPred ty1 ty2) = pprPanic "predTypeRep" (ppr (EqPred ty1 ty2))
+
+mkFamilyTyConApp :: TyCon -> [Type] -> Type
+-- Given a family instance TyCon and its arg types, return the
+-- corresponding family type.  E.g.
+--	data family T a
+--	data instance T (Maybe b) = MkT b	-- Instance tycon :RTL
+-- Then 
+--	mkFamilyTyConApp :RTL Int  =  T (Maybe Int)
+mkFamilyTyConApp tc tys
+  | Just (fam_tc, fam_tys) <- tyConFamInst_maybe tc
+  , let fam_subst = zipTopTvSubst (tyConTyVars tc) tys
+  = mkTyConApp fam_tc (substTys fam_subst fam_tys)
+  | otherwise
+  = mkTyConApp tc tys
+
+-- 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 (fam_tc, tys) <- tyConFamInst_maybe tycon
+  = ppr $ fam_tc `TyConApp` tys	       -- can't be FunTyCon
+  | otherwise
+  = ppr tycon
 \end{code}
 
 
@@ -627,9 +651,6 @@ splitRecNewType_maybe (TyConApp tc tys)
 			 Just (substTyWith tvs tys rep_ty)
 	
 splitRecNewType_maybe other = Nothing
-
-
-
 \end{code}
 
 
@@ -716,13 +737,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
 
@@ -1199,7 +1224,7 @@ zipTopTvSubst :: [TyVar] -> [Type] -> TvSubst
 zipTopTvSubst tyvars tys 
 #ifdef DEBUG
   | length tyvars /= length tys
-  = pprTrace "zipOpenTvSubst" (ppr tyvars $$ ppr tys) emptyTvSubst
+  = pprTrace "zipTopTvSubst" (ppr tyvars $$ ppr tys) emptyTvSubst
   | otherwise
 #endif
   = TvSubst emptyInScopeSet (zipTyEnv tyvars tys)
@@ -1305,6 +1330,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