X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fiface%2FBinIface.hs;h=b3de3f487def005805da0c19488a47522157dee3;hb=b2524b3960999fffdb3767900f58825903f6560f;hp=134dcfac2cf7b82cd5fb0768c95cbeb8d8368e70;hpb=fdf8656855d26105ff36bdd24d41827b05037b91;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 134dcfa..b3de3f4 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -1301,16 +1301,20 @@ instance Binary IfaceNote where
 -- to avoid re-building it in various places.  So we build the OccName
 -- when de-serialising.
 
+-- NOTE regarding HetMet extensions: this screws up Adam's heinous
+-- hide-the-syntactical-level-in-the-namespace trick.
+
 instance Binary IfaceDecl where
     put_ bh (IfaceId name ty details idinfo) = do
 	    putByte bh 0
 	    put_ bh (occNameFS name)
+	    put_ bh (getOccNameDepth name)
 	    put_ bh ty
 	    put_ bh details
 	    put_ bh idinfo
     put_ _ (IfaceForeign _ _) = 
 	error "Binary.put_(IfaceDecl): IfaceForeign"
-    put_ bh (IfaceData a1 a2 a3 a4 a5 a6 a7 a8) = do
+    put_ bh (IfaceData a1 a2 a3 a4 a5 a6 a7) = do
 	    putByte bh 2
 	    put_ bh (occNameFS a1)
 	    put_ bh a2
@@ -1319,7 +1323,6 @@ instance Binary IfaceDecl where
 	    put_ bh a5
 	    put_ bh a6
 	    put_ bh a7
-	    put_ bh a8
     put_ bh (IfaceSyn a1 a2 a3 a4 a5) = do
 	    putByte bh 3
 	    put_ bh (occNameFS a1)
@@ -1340,10 +1343,11 @@ instance Binary IfaceDecl where
 	    h <- getByte bh
 	    case h of
 	      0 -> do name    <- get bh
+		      depth   <- get bh
 		      ty      <- get bh
 		      details <- get bh
 		      idinfo  <- get bh
-                      occ <- return $! mkOccNameFS varName name
+                      occ <- return $! mkOccNameFS (varNameDepth depth) name
 		      return (IfaceId occ ty details idinfo)
 	      1 -> error "Binary.get(TyClDecl): ForeignType"
 	      2 -> do
@@ -1354,9 +1358,8 @@ instance Binary IfaceDecl where
 		    a5 <- get bh
 		    a6 <- get bh
 		    a7 <- get bh
-		    a8 <- get bh
                     occ <- return $! mkOccNameFS tcName a1
-		    return (IfaceData occ a2 a3 a4 a5 a6 a7 a8)
+		    return (IfaceData occ a2 a3 a4 a5 a6 a7)
 	      3 -> do
 		    a1 <- get bh
 		    a2 <- get bh
@@ -1455,13 +1458,15 @@ instance Binary IfaceConDecl where
 instance Binary IfaceClassOp where
    put_ bh (IfaceClassOp n def ty) = do	
 	put_ bh (occNameFS n)
+	put_ bh (getOccNameDepth n)
 	put_ bh def	
 	put_ bh ty
    get bh = do
 	n <- get bh
+	depth <- get bh
 	def <- get bh
 	ty <- get bh
-        occ <- return $! mkOccNameFS varName n
+        occ <- return $! mkOccNameFS (varNameDepth depth) n
 	return (IfaceClassOp occ def ty)
 
 instance Binary IfaceRule where