X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=ac21632db3a0ae7f4b21ed5312d928919a8adc6a;hp=9cc824a97f0d757234dffb77ec67b27aca8b0856;hb=2c1c4d3540e5671274d45a473f1d1da5d37f76c1;hpb=92267aa26adb1ab5a6d8004a80fdf6aa06ea4e44

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 9cc824a..ac21632 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -19,6 +19,7 @@ import HscTypes
 import BasicTypes
 import Demand
 import Annotations
+import CoreSyn
 import IfaceSyn
 import Module
 import Name
@@ -256,22 +257,20 @@ fromOnDiskName
    -> OnDiskName
    -> (NameCache, Name)
 fromOnDiskName _ nc (pid, mod_name, occ) =
-  let 
+  let
         mod   = mkModule pid mod_name
         cache = nsNames nc
   in
   case lookupOrigNameCache cache  mod occ of
      Just name -> (nc, name)
-     Nothing   -> 
-        let 
-                us        = nsUniqs nc
-                uniq      = uniqFromSupply us
+     Nothing   ->
+        case takeUniqFromSupply (nsUniqs nc) of
+        (uniq, us) ->
+            let
                 name      = mkExternalName uniq mod occ noSrcSpan
                 new_cache = extendNameCache cache mod occ name
-        in        
-        case splitUniqSupply us of { (us',_) -> 
-        ( nc{ nsUniqs = us', nsNames = new_cache }, name )
-        }
+            in
+            ( nc{ nsUniqs = us, nsNames = new_cache }, name )
 
 serialiseName :: BinHandle -> Name -> UniqFM (Int,Name) -> IO ()
 serialiseName bh name _ = do
@@ -1147,7 +1146,7 @@ instance Binary IfaceBinding where
 instance Binary IfaceIdDetails where
     put_ bh IfVanillaId      = putByte bh 0
     put_ bh (IfRecSelId a b) = do { putByte bh 1; put_ bh a; put_ bh b }
-    put_ bh IfDFunId         = putByte bh 2
+    put_ bh (IfDFunId n)     = do { putByte bh 2; put_ bh n }
     get bh = do
 	    h <- getByte bh
 	    case h of
@@ -1155,7 +1154,7 @@ instance Binary IfaceIdDetails where
 	      1 -> do a <- get bh
 		      b <- get bh
 		      return (IfRecSelId a b)
-	      _ -> return IfDFunId
+              _ -> do { n <- get bh; return (IfDFunId n) }
 
 instance Binary IfaceIdInfo where
     put_ bh NoInfo = putByte bh 0
@@ -1211,15 +1210,19 @@ instance Binary IfaceUnfolding where
 	put_ bh b
 	put_ bh c
 	put_ bh d
-    put_ bh (IfWrapper a n) = do
+    put_ bh (IfLclWrapper a n) = do
 	putByte bh 2
 	put_ bh a
 	put_ bh n
-    put_ bh (IfDFunUnfold as) = do
+    put_ bh (IfExtWrapper a n) = do
 	putByte bh 3
+	put_ bh a
+	put_ bh n
+    put_ bh (IfDFunUnfold as) = do
+	putByte bh 4
 	put_ bh as
     put_ bh (IfCompulsory e) = do
-	putByte bh 4
+	putByte bh 5
 	put_ bh e
     get bh = do
 	h <- getByte bh
@@ -1234,12 +1237,25 @@ instance Binary IfaceUnfolding where
 		  return (IfInlineRule a b c d)
 	  2 -> do a <- get bh
 		  n <- get bh
-		  return (IfWrapper a n)
-	  3 -> do as <- get bh
+		  return (IfLclWrapper a n)
+	  3 -> do a <- get bh
+		  n <- get bh
+		  return (IfExtWrapper a n)
+	  4 -> do as <- get bh
 		  return (IfDFunUnfold as)
 	  _ -> do e <- get bh
 		  return (IfCompulsory e)
 
+instance Binary (DFunArg IfaceExpr) where
+    put_ bh (DFunPolyArg  e) = putByte bh 0 >> put_ bh e
+    put_ bh (DFunConstArg e) = putByte bh 1 >> put_ bh e
+    put_ bh (DFunLamArg i)   = putByte bh 2 >> put_ bh i
+    get bh = do { h <- getByte bh
+                ; case h of
+                    0 -> do { a <- get bh; return (DFunPolyArg a) }
+                    1 -> do { a <- get bh; return (DFunConstArg a) }
+                    _ -> do { a <- get bh; return (DFunLamArg a) } }
+
 instance Binary IfaceNote where
     put_ bh (IfaceSCC aa) = do
 	    putByte bh 0
@@ -1266,10 +1282,14 @@ 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
@@ -1305,10 +1325,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
@@ -1420,13 +1441,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