the unlifted kind

[ghc-hetmet.git] / compiler / iface / BinIface.hs

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 6d02fe0..631a286 100644 (file)
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -562,11 +562,12 @@ instance Binary IfaceBndr where
 instance Binary Kind where
     put_ bh LiftedTypeKind   = putByte bh 0
     put_ bh UnliftedTypeKind = putByte bh 1
-    put_ bh OpenTypeKind     = putByte bh 2
-    put_ bh ArgTypeKind      = putByte bh 3
-    put_ bh UbxTupleKind     = putByte bh 4
+    put_ bh UnboxedTypeKind  = putByte bh 2
+    put_ bh OpenTypeKind     = putByte bh 3
+    put_ bh ArgTypeKind      = putByte bh 4
+    put_ bh UbxTupleKind     = putByte bh 5
     put_ bh (FunKind k1 k2)  = do 
-           putByte bh 5
+           putByte bh 6
            put_ bh k1
            put_ bh k2
     put_ bh (KindVar kv) = pprPanic "BinIface.put_: kind var" (ppr kv)
@@ -576,9 +577,10 @@ instance Binary Kind where
            case h of
              0 -> return LiftedTypeKind 
              1 -> return UnliftedTypeKind
-             2 -> return OpenTypeKind
-             3 -> return ArgTypeKind
-             4 -> return UbxTupleKind
+             2 -> return UnboxedTypeKind
+             3 -> return OpenTypeKind
+             4 -> return ArgTypeKind
+             5 -> return UbxTupleKind
              _ -> do k1 <- get bh
                      k2 <- get bh
                      return (FunKind k1 k2)
@@ -829,14 +831,16 @@ instance Binary IfaceInfoItem where
     put_ bh (HsStrictness ab) = do
            putByte bh 1
            put_ bh ab
-    put_ bh (HsUnfold ac ad) = do
+    put_ bh (HsUnfold ad) = do
            putByte bh 2
-           put_ bh ac
            put_ bh ad
-    put_ bh HsNoCafRefs = do
+    put_ bh (HsInline ad) = do
            putByte bh 3
-    put_ bh (HsWorker ae af) = do
+           put_ bh ad
+    put_ bh HsNoCafRefs = do
            putByte bh 4
+    put_ bh (HsWorker ae af) = do
+           putByte bh 5
            put_ bh ae
            put_ bh af
     get bh = do
@@ -846,10 +850,11 @@ instance Binary IfaceInfoItem where
                      return (HsArity aa)
              1 -> do ab <- get bh
                      return (HsStrictness ab)
-             2 -> do ac <- get bh
-                     ad <- get bh
-                     return (HsUnfold ac ad)
-             3 -> do return HsNoCafRefs
+             2 -> do ad <- get bh
+                     return (HsUnfold ad)
+             3 -> do ad <- get bh
+                     return (HsInline ad)
+             4 -> do return HsNoCafRefs
              _ -> do ae <- get bh
                      af <- get bh
                      return (HsWorker ae af)
@@ -861,8 +866,6 @@ instance Binary IfaceNote where
     put_ bh (IfaceCoerce ab) = do
            putByte bh 1
            put_ bh ab
-    put_ bh IfaceInlineCall = do
-           putByte bh 2
     put_ bh IfaceInlineMe = do
            putByte bh 3
     put_ bh (IfaceCoreNote s) = do
@@ -875,7 +878,6 @@ instance Binary IfaceNote where
                      return (IfaceSCC aa)
              1 -> do ab <- get bh
                      return (IfaceCoerce ab)
-             2 -> do return IfaceInlineCall
              3 -> do return IfaceInlineMe
               _ -> do ac <- get bh
                       return (IfaceCoreNote ac)