X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FTcIface.lhs;h=20aaa9fca8db18a489bd37073339a6f92841b1d3;hb=17434e5beb213f1e8971d1ce8ffbf40a0848bb3a;hp=68abd23d542bc7cdd83081c3c9442c1a584c1d16;hpb=d76c18e05f6366c23144624b696a02fbaa6d26e8;p=ghc-hetmet.git

diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 68abd23..20aaa9f 100644
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -27,15 +27,14 @@ import TcRnMonad
 import Type		( liftedTypeKind, splitTyConApp, mkTyConApp,
                           liftedTypeKindTyCon, unliftedTypeKindTyCon, 
                           openTypeKindTyCon, argTypeKindTyCon, 
-                          ubxTupleKindTyCon,
-			  mkTyVarTys, ThetaType )
+                          ubxTupleKindTyCon, ThetaType )
 import TypeRep		( Type(..), PredType(..) )
-import TyCon		( TyCon, tyConName, SynTyConRhs(..), 
-			  AlgTyConParent(..), setTyConArgPoss )
+import TyCon		( TyCon, tyConName, SynTyConRhs(..), setTyConArgPoss )
 import HscTypes		( ExternalPackageState(..), 
 			  TyThing(..), tyThingClass, tyThingTyCon, 
 			  ModIface(..), ModDetails(..), HomeModInfo(..),
-			  emptyModDetails, lookupTypeEnv, lookupType, typeEnvIds )
+			  emptyModDetails, lookupTypeEnv, lookupType,
+			  typeEnvIds, mkDetailsFamInstCache )
 import InstEnv		( Instance(..), mkImportedInstance )
 import CoreSyn
 import CoreUtils	( exprType, dataConRepFSInstPat )
@@ -50,9 +49,9 @@ import IdInfo		( IdInfo, CafInfo(..), WorkerInfo(..),
 			  vanillaIdInfo, newStrictnessInfo )
 import Class		( Class )
 import TyCon		( tyConDataCons, isTupleTyCon, mkForeignTyCon )
-import DataCon		( DataCon, dataConWorkId, dataConExTyVars, dataConInstArgTys )
+import DataCon		( DataCon, dataConWorkId )
 import TysWiredIn	( tupleCon, tupleTyCon, listTyCon, intTyCon, boolTyCon, charTyCon, parrTyCon )
-import Var		( TyVar, mkTyVar, tyVarKind )
+import Var		( TyVar, mkTyVar )
 import Name		( Name, nameModule, nameIsLocalOrFrom, isWiredInName,
  			  nameOccName, wiredInNameTyThing_maybe )
 import NameEnv
@@ -66,12 +65,11 @@ import Outputable
 import ErrUtils		( Message )
 import Maybes		( MaybeErr(..) )
 import SrcLoc		( noSrcLoc )
-import Util		( zipWithEqual, equalLength, splitAtList )
+import Util		( zipWithEqual, equalLength )
 import DynFlags		( DynFlag(..), isOneShot )
 
 import List		( elemIndex)
 import Maybe		( catMaybes )
-import Monad		( liftM )
 \end{code}
 
 This module takes
@@ -223,10 +221,12 @@ typecheckIface iface
 	; exports <-  ifaceExportNames (mi_exports iface)
 
 		-- Finished
-	; return (ModDetails {	md_types = type_env, 
-				md_insts = dfuns,
-				md_rules = rules,
-				md_exports = exports }) 
+	; return $ ModDetails { md_types     = type_env
+			      , md_insts     = dfuns
+			      , md_fam_insts = mkDetailsFamInstCache type_env
+			      , md_rules     = rules
+			      , md_exports   = exports 
+			      }
     }
 \end{code}
 
@@ -371,11 +371,13 @@ tcIfaceDecl (IfaceData {ifName = occ_name,
 	    { stupid_theta <- tcIfaceCtxt ctxt
 	    ; famInst <- 
 	        case mb_family of
-		  Nothing                -> return Nothing
-		  Just (fam, tys, index) -> 
+		  Nothing         -> return Nothing
+		  Just (IfaceFamInst { ifFamInstTyCon = fam
+				     , ifFamInstTys   = tys
+				     }) -> 
 		    do { famTyCon <- tcIfaceTyCon fam
 		       ; insttys <- mapM tcIfaceType tys
-		       ; return $ Just (famTyCon, insttys, index)
+		       ; return $ Just (famTyCon, insttys)
 		       }
 	    ; cons <- tcIfaceDataCons tc_name tycon tyvars rdr_cons
 	    ; buildAlgTyCon tc_name tyvars stupid_theta