X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=4664bf14eda5d654a46c4b81908c32a88d74954b;hb=b3ccd6d5a4366dc8089fd9c49f5edf43077de009;hp=3c62db923783dc844c93bbec314c2943539c1f42;hpb=7fa861d23122d4d6a3053c09b5c636bad0478ad3;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 3c62db9..4664bf1 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -216,7 +216,7 @@ fromOnDiskName arr nc (pid, mod_name, occ) =
         let 
                 us        = nsUniqs nc
                 uniq      = uniqFromSupply us
-                name      = mkExternalName uniq mod occ noSrcLoc
+                name      = mkExternalName uniq mod occ noSrcSpan
                 new_cache = extendNameCache cache mod occ name
         in        
         case splitUniqSupply us of { (us',_) -> 
@@ -1062,12 +1062,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 +1099,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 +1154,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 +1222,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)