[gentoo-commits] gentoo-x86 commit in dev-haskell/binary/files: binary-0.5.0.2-ghc-7.patch

[Sergei Trofimovich (slyfox)]

slyfox      11/08/01 20:24:32

  Added:                binary-0.5.0.2-ghc-7.patch
  Log:
  Added build fix for ghc-7.
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/binary/files/binary-0.5.0.2-ghc-7.patch?rev=1.1&content-type=text/plain

Index: binary-0.5.0.2-ghc-7.patch
===================================================================
Patch was taken from binary fork of ghc-7 branch
Fri Jul 30 15:29:36 EEST 2010  simonpj@×××××××××.com
  * Add type signature on local binding
diff -rN -u old-binary/src/Data/Binary/Get.hs new-binary/src/Data/Binary/Get.hs
--- old-binary/src/Data/Binary/Get.hs	2010-10-31 18:08:10.633817506 +0200
+++ new-binary/src/Data/Binary/Get.hs	2010-10-31 18:08:10.641817506 +0200
@@ -370,16 +370,17 @@
         return (xs, ys))
 
   where
-        first r 0 xs@(L.Chunk _ _) = writeSTRef r xs    >> return L.Empty
-        first r _ L.Empty          = writeSTRef r L.Empty >> return L.Empty
-
-        first r n (L.Chunk x xs)
-          | n < l     = do writeSTRef r (L.Chunk (B.drop (fromIntegral n) x) xs)
-                           return $ L.Chunk (B.take (fromIntegral n) x) L.Empty
-          | otherwise = do writeSTRef r (L.drop (n - l) xs)
-                           liftM (L.Chunk x) $ unsafeInterleaveST (first r (n - l) xs)
-
-         where l = fromIntegral (B.length x)
+    first :: STRef s L.ByteString -> Int64 -> L.ByteString -> ST s L.ByteString
+    first r 0 xs@(L.Chunk _ _) = writeSTRef r xs    >> return L.Empty
+    first r _ L.Empty          = writeSTRef r L.Empty >> return L.Empty
+
+    first r n (L.Chunk x xs)
+      | n < l     = do writeSTRef r (L.Chunk (B.drop (fromIntegral n) x) xs)
+                       return $ L.Chunk (B.take (fromIntegral n) x) L.Empty
+      | otherwise = do writeSTRef r (L.drop (n - l) xs)
+                       liftM (L.Chunk x) $ unsafeInterleaveST (first r (n - l) xs)
+      where 
+        l = fromIntegral (B.length x)
 #else
 splitAtST i (B.LPS ps)  = runST (
      do r  <- newSTRef undefined