X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FSerialized.hs;h=95a09b9f2943d516caf495a34e23abadea9ee881;hb=e95ee1f718c6915c478005aad8af81705357d6ab;hp=82cc065aa97de81aab442215648dbabb69344df1;hpb=fa1e4ffe87bc607e95a1e82c160ff1e821d28b6e;p=ghc-hetmet.git

diff --git a/compiler/utils/Serialized.hs b/compiler/utils/Serialized.hs
index 82cc065..95a09b9 100644
--- a/compiler/utils/Serialized.hs
+++ b/compiler/utils/Serialized.hs
@@ -24,12 +24,7 @@ import Util
 import Data.Bits
 import Data.Word        ( Word8 )
 
-#if __GLASGOW_HASKELL__ > 609
 import Data.Data
-#else
-import Data.Generics
-#endif
-import Data.Typeable
 
 
 -- | Represents a serialized value of a particular type. Attempts can be made to deserialize it at certain types
@@ -87,7 +82,12 @@ serializeConstr :: ConstrRep -> [Word8] -> [Word8]
 serializeConstr (AlgConstr ix)   = serializeWord8 1 . serializeInt ix
 serializeConstr (IntConstr i)    = serializeWord8 2 . serializeInteger i
 serializeConstr (FloatConstr r)  = serializeWord8 3 . serializeRational r
+#if __GLASGOW_HASKELL__ < 611
 serializeConstr (StringConstr s) = serializeWord8 4 . serializeString s
+#else
+serializeConstr (CharConstr c)   = serializeWord8 4 . serializeChar c
+#endif
+
 
 deserializeConstr :: [Word8] -> (ConstrRep -> [Word8] -> a) -> a
 deserializeConstr bytes k = deserializeWord8 bytes $ \constr_ix bytes ->
@@ -95,7 +95,11 @@ deserializeConstr bytes k = deserializeWord8 bytes $ \constr_ix bytes ->
                                 1 -> deserializeInt      bytes $ \ix -> k (AlgConstr ix)
                                 2 -> deserializeInteger  bytes $ \i  -> k (IntConstr i)
                                 3 -> deserializeRational bytes $ \r  -> k (FloatConstr r)
+#if __GLASGOW_HASKELL__ >= 611
+                                4 -> deserializeChar     bytes $ \c  -> k (CharConstr c)
+#else
                                 4 -> deserializeString   bytes $ \s  -> k (StringConstr s)
+#endif
                                 x -> error $ "deserializeConstr: unrecognised serialized constructor type " ++ show x ++ " in context " ++ show bytes
 
 
@@ -154,6 +158,15 @@ deserializeInteger :: [Word8] -> (Integer -> [Word8] -> a) -> a
 deserializeInteger bytes k = deserializeString bytes (k . read)
 
 
+#if __GLASGOW_HASKELL__ >= 611
+serializeChar :: Char -> [Word8] -> [Word8]
+serializeChar = serializeString . show
+
+deserializeChar :: [Word8] -> (Char -> [Word8] -> a) -> a
+deserializeChar bytes k = deserializeString bytes (k . read)
+#endif
+
+
 serializeString :: String -> [Word8] -> [Word8]
 serializeString = serializeList serializeEnum