convert to use System.FilePath

[ghc-hetmet.git] / compiler / types / FamInstEnv.lhs

diff --git a/compiler/types/FamInstEnv.lhs b/compiler/types/FamInstEnv.lhs
index 8751e40..7c06555 100644 (file)
--- a/compiler/types/FamInstEnv.lhs
+++ b/compiler/types/FamInstEnv.lhs
@@ -95,7 +95,7 @@ pprFamInstHdr :: FamInst -> SDoc
 pprFamInstHdr (FamInst {fi_fam = fam, fi_tys = tys, fi_tycon = tycon})
   = pprTyConSort <+> pprHead
   where
-    pprHead = pprTypeApp (parenSymOcc (getOccName fam) (ppr fam)) tys
+    pprHead = pprTypeApp fam (ppr fam) tys
     pprTyConSort | isDataTyCon tycon = ptext SLIT("data instance")
                 | isNewTyCon  tycon = ptext SLIT("newtype instance")
                 | isSynTyCon  tycon = ptext SLIT("type instance")
@@ -277,7 +277,7 @@ indexed synonyms and we don't want to slow that down by needless unification.
 
 \begin{code}
 lookupFamInstEnvUnify :: (FamInstEnv, FamInstEnv) -> TyCon -> [Type]
-                     -> [(FamInstMatch)]
+                     -> [(FamInstMatch, TvSubst)]
 lookupFamInstEnvUnify (pkg_ie, home_ie) fam tys
   | not (isOpenTyCon fam) 
   = []
@@ -318,7 +318,7 @@ lookupFamInstEnvUnify (pkg_ie, home_ie) fam tys
         case tcUnifyTys bind_fn tpl_tys tys of
            Just subst -> let rep_tys = substTyVars subst (tyConTyVars tycon)
                           in
-                          (item, rep_tys) : find rest
+                          ((item, rep_tys), subst) : find rest
            Nothing    -> find rest
 
 -- See explanation at @InstEnv.bind_fn@.