X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FFamInstEnv.lhs;h=c8a509f059c2f592ab06c01222a14f3e61ec5dd2;hb=13cd965d80be5c25dc54534a833df39ab7aa7a12;hp=b9276b7cf6ee2ff406969c808deff9ae11ff7a8d;hpb=3548802de235eca280982270463db84910ee3748;p=ghc-hetmet.git

diff --git a/compiler/types/FamInstEnv.lhs b/compiler/types/FamInstEnv.lhs
index b9276b7..c8a509f 100644
--- a/compiler/types/FamInstEnv.lhs
+++ b/compiler/types/FamInstEnv.lhs
@@ -46,13 +46,19 @@ import Maybe
 \begin{code}
 data FamInst 
   = FamInst { fi_fam   :: Name		-- Family name
+		-- INVARIANT: fi_fam = case tyConFamInst_maybe fi_tycon of
+		--			   Just (tc, tys) -> tc
 
 		-- Used for "rough matching"; same idea as for class instances
 	    , fi_tcs   :: [Maybe Name]	-- Top of type args
+		-- INVARIANT: fi_tcs = roughMatchTcs fi_tys
 
 		-- Used for "proper matching"; ditto
 	    , fi_tvs   :: TyVarSet	-- Template tyvars for full match
 	    , fi_tys   :: [Type]	-- Full arg types
+		-- INVARIANT: fi_tvs = tyConTyVars fi_tycon
+		--	      fi_tys = case tyConFamInst_maybe fi_tycon of
+		--			   Just (_, tys) -> tys
 
 	    , fi_tycon :: TyCon		-- Representation tycon
 	    }
@@ -82,8 +88,7 @@ pprFamInstHdr :: FamInst -> SDoc
 pprFamInstHdr (FamInst {fi_fam = fam, fi_tys = tys, fi_tycon = tycon})
   = pprTyConSort <+> pprHead
   where
-    pprHead = parenSymOcc (getOccName fam) (ppr fam) <+> 
-	      sep (map pprParendType tys)
+    pprHead = pprTypeApp (parenSymOcc (getOccName fam) (ppr fam)) tys
     pprTyConSort | isDataTyCon tycon = ptext SLIT("data instance")
 		 | isNewTyCon  tycon = ptext SLIT("newtype instance")
 		 | isSynTyCon  tycon = ptext SLIT("type instance")