X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=41bcaed8b211206e58675f4eeb0076271c205b0e;hb=84f4c1dfb0c39c5b48a8b960fc82ab10aeb10c84;hp=ac28ddb90dec00d3157980fd72d153bc444c85a3;hpb=80c89b80c355b2aaebcd53330e6c6170c3f05aca;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index ac28ddb..41bcaed 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -18,11 +18,6 @@ import InstEnv		( OverlapFlag(..) )
 import Class		( DefMeth(..) )
 import CostCentre
 import StaticFlags	( opt_HiVersion, v_Build_tag )
-import Type		( Kind,
-                          isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
-			  isArgTypeKind, isUbxTupleKind, liftedTypeKind,
-			  unliftedTypeKind, openTypeKind, argTypeKind,  
-			  ubxTupleKind, mkArrowKind, splitFunTy_maybe )
 import Panic
 import Binary
 import Util
@@ -177,12 +172,13 @@ instance Binary ModIface where
 		 mi_decls     = decls,
 		 mi_globals   = Nothing,
 		 mi_insts     = insts,
+		 mi_fam_insts = mkIfaceFamInstsCache . map snd $ decls,
 		 mi_rules     = rules,
 		 mi_rule_vers = rule_vers,
 			-- And build the cached values
-		 mi_dep_fn = mkIfaceDepCache deprecs,
-		 mi_fix_fn = mkIfaceFixCache fixities,
-		 mi_ver_fn = mkIfaceVerCache decls })
+		 mi_dep_fn    = mkIfaceDepCache deprecs,
+		 mi_fix_fn    = mkIfaceFixCache fixities,
+		 mi_ver_fn    = mkIfaceVerCache decls })
 
 GLOBAL_VAR(v_IgnoreHiWay, False, Bool)
 
@@ -365,19 +361,9 @@ instance Binary Fixity where
 	  return (Fixity aa ab)
 
 instance (Binary name) => Binary (IPName name) where
-    put_ bh (Dupable aa) = do
-	    putByte bh 0
-	    put_ bh aa
-    put_ bh (Linear ab) = do
-	    putByte bh 1
-	    put_ bh ab
-    get bh = do
-	    h <- getByte bh
-	    case h of
-	      0 -> do aa <- get bh
-		      return (Dupable aa)
-	      _ -> do ab <- get bh
-		      return (Linear ab)
+    put_ bh (IPName aa) = put_ bh aa
+    get bh = do aa <- get bh
+	        return (IPName aa)
 
 -------------------------------------------------------------------------
 --		Types from: Demand
@@ -976,6 +962,14 @@ instance Binary IfaceInst where
 		orph <- get bh
 		return (IfaceInst cls tys dfun flag orph)
 
+instance Binary IfaceFamInst where
+    put_ bh (IfaceFamInst tycon tys) = do
+	    put_ bh tycon
+	    put_ bh tys
+    get bh = do tycon <- get bh
+		tys   <- get bh
+		return (IfaceFamInst tycon tys)
+
 instance Binary OverlapFlag where
     put_ bh NoOverlap  = putByte bh 0
     put_ bh OverlapOk  = putByte bh 1
@@ -1006,7 +1000,7 @@ instance Binary IfaceConDecls where
 		      return (IfNewTyCon aa)
 
 instance Binary IfaceConDecl where
-    put_ bh (IfCon a1 a2 a3 a4 a5 a6 a7 a8 a9 a10) = do
+    put_ bh (IfCon a1 a2 a3 a4 a5 a6 a7 a8 a9) = do
 	    put_ bh a1
 	    put_ bh a2
 	    put_ bh a3
@@ -1016,7 +1010,6 @@ instance Binary IfaceConDecl where
 	    put_ bh a7
 	    put_ bh a8
 	    put_ bh a9
-	    put_ bh a10
     get bh = do a1 <- get bh
 		a2 <- get bh
 		a3 <- get bh	      
@@ -1026,8 +1019,7 @@ instance Binary IfaceConDecl where
 		a7 <- get bh
 		a8 <- get bh
 		a9 <- get bh
-		a10 <- get bh
-	        return (IfCon a1 a2 a3 a4 a5 a6 a7 a8 a9 a10)
+	        return (IfCon a1 a2 a3 a4 a5 a6 a7 a8 a9)
 
 instance Binary IfaceClassOp where
    put_ bh (IfaceClassOp n def ty) = do