X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=12bde117344fcb0c1b903c8cca3b1a0d8d20606e;hb=36fa8c4890e439fe8c2a4682df2a877fa2cc606b;hp=49235d99484a31572bfa76531c6ecf4d5e554e28;hpb=940524aec90652b5ef81789c9a453c57c0e42cc9;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 49235d9..12bde11 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -- 
 --  (c) The University of Glasgow 2002-2006
 -- 
@@ -34,6 +41,7 @@ import Config
 import FastMutInt
 import Outputable
 
+import Data.List
 import Data.Word
 import Data.Array
 import Data.IORef
@@ -46,7 +54,7 @@ import Control.Monad
 readBinIface :: FilePath -> TcRnIf a b ModIface
 readBinIface hi_path = do
   nc <- getNameCache
-  (new_nc, iface) <- ioToIOEnv $ readBinIface_ hi_path nc
+  (new_nc, iface) <- liftIO $ readBinIface_ hi_path nc
   setNameCache new_nc
   return iface
 
@@ -294,7 +302,8 @@ instance Binary ModIface where
 		 mi_fam_insts = fam_insts,
 		 mi_rules     = rules,
 		 mi_rule_vers = rule_vers,
-                 mi_vect_info = vect_info }) = do
+                 mi_vect_info = vect_info,
+		 mi_hpc       = hpc_info }) = do
 	put_ bh mod
 	put_ bh is_boot
 	put_ bh mod_vers
@@ -312,6 +321,7 @@ instance Binary ModIface where
 	lazyPut bh rules
 	put_ bh rule_vers
         put_ bh vect_info
+	put_ bh hpc_info
 
    get bh = do
 	mod_name  <- get bh
@@ -331,6 +341,7 @@ instance Binary ModIface where
 	rules	  <- {-# SCC "bin_rules" #-} lazyGet bh
 	rule_vers <- get bh
         vect_info <- get bh
+        hpc_info  <- get bh
 	return (ModIface {
 		 mi_module    = mod_name,
 		 mi_boot      = is_boot,
@@ -350,6 +361,7 @@ instance Binary ModIface where
 		 mi_rules     = rules,
 		 mi_rule_vers = rule_vers,
                  mi_vect_info = vect_info,
+		 mi_hpc       = hpc_info,
 			-- And build the cached values
 		 mi_dep_fn    = mkIfaceDepCache deprecs,
 		 mi_fix_fn    = mkIfaceFixCache fixities,
@@ -416,7 +428,7 @@ instance Binary Usage where
 			usg_exports = exps, usg_entities = ents,
 			usg_rules = rules })
 
-instance Binary a => Binary (Deprecs a) where
+instance Binary Deprecations where
     put_ bh NoDeprecs     = putByte bh 0
     put_ bh (DeprecAll t) = do
 	    putByte bh 1
@@ -888,6 +900,10 @@ instance Binary IfaceExpr where
             putByte bh 11
             put_ bh ie
             put_ bh ico
+    put_ bh (IfaceTick m ix) = do
+            putByte bh 12
+            put_ bh m
+            put_ bh ix
     get bh = do
 	    h <- getByte bh
 	    case h of
@@ -927,6 +943,9 @@ instance Binary IfaceExpr where
               11 -> do ie <- get bh
                        ico <- get bh
                        return (IfaceCast ie ico)
+              12 -> do m <- get bh
+                       ix <- get bh
+                       return (IfaceTick m ix)
 
 instance Binary IfaceConAlt where
     put_ bh IfaceDefault = do
@@ -1062,12 +1081,13 @@ instance Binary IfaceDecl where
 	    put_ bh a6
 	    put_ bh a7
 	    put_ bh a8
-    put_ bh (IfaceSyn aq ar as at) = do
+    put_ bh (IfaceSyn a1 a2 a3 a4 a5) = do
 	    putByte bh 3
-	    put_ bh (occNameFS aq)
-	    put_ bh ar
-	    put_ bh as
-	    put_ bh at
+	    put_ bh (occNameFS a1)
+	    put_ bh a2
+	    put_ bh a3
+	    put_ bh a4
+	    put_ bh a5
     put_ bh (IfaceClass a1 a2 a3 a4 a5 a6 a7) = do
 	    putByte bh 4
 	    put_ bh a1
@@ -1098,12 +1118,13 @@ instance Binary IfaceDecl where
                     occ <- return $! mkOccNameFS tcName a1
 		    return (IfaceData occ a2 a3 a4 a5 a6 a7 a8)
 	      3 -> do
-		    aq <- get bh
-		    ar <- get bh
-		    as <- get bh
-		    at <- get bh
-                    occ <- return $! mkOccNameFS tcName aq
-		    return (IfaceSyn occ ar as at)
+		    a1 <- get bh
+		    a2 <- get bh
+		    a3 <- get bh
+		    a4 <- get bh
+		    a5 <- get bh
+                    occ <- return $! mkOccNameFS tcName a1
+		    return (IfaceSyn occ a2 a3 a4 a5)
 	      _ -> do
 		    a1 <- get bh
 		    a2 <- get bh
@@ -1152,18 +1173,16 @@ instance Binary OverlapFlag where
 instance Binary IfaceConDecls where
     put_ bh IfAbstractTyCon = putByte bh 0
     put_ bh IfOpenDataTyCon = putByte bh 1
-    put_ bh IfOpenNewTyCon = putByte bh 2
-    put_ bh (IfDataTyCon cs) = do { putByte bh 3
+    put_ bh (IfDataTyCon cs) = do { putByte bh 2
 				  ; put_ bh cs }
-    put_ bh (IfNewTyCon c)  = do { putByte bh 4
+    put_ bh (IfNewTyCon c)  = do { putByte bh 3
 				  ; put_ bh c }
     get bh = do
 	    h <- getByte bh
 	    case h of
 	      0 -> return IfAbstractTyCon
 	      1 -> return IfOpenDataTyCon
-	      2 -> return IfOpenNewTyCon
-	      3 -> do cs <- get bh
+	      2 -> do cs <- get bh
 		      return (IfDataTyCon cs)
 	      _ -> do aa <- get bh
 		      return (IfNewTyCon aa)
@@ -1222,10 +1241,14 @@ instance Binary IfaceRule where
 	    return (IfaceRule a1 a2 a3 a4 a5 a6 a7)
 
 instance Binary IfaceVectInfo where
-    put_ bh (IfaceVectInfo a1) = do
+    put_ bh (IfaceVectInfo a1 a2 a3) = do
 	    put_ bh a1
+	    put_ bh a2
+	    put_ bh a3
     get bh = do
 	    a1 <- get bh
-	    return (IfaceVectInfo a1)
+	    a2 <- get bh
+	    a3 <- get bh
+	    return (IfaceVectInfo a1 a2 a3)