git.iko.soy/text
on master help sign in
Backport the fix for bug 19 to GHC < 7.2
commit875fcccac661e6e3d265f7205cafd9078eefedbf authorBryan O'Sullivan <bos@serpentine.com> dateSat 7 Apr 2012, 21:50 (15 years ago) parent2b2cb08
3 files changed+9−1
compare with master
unifiedsplit
Data/Text.hs+4 Data/Text/Fusion/Common.hs+1−1 Data/Text/Lazy.hs+4
Data/Text.hs+4
@@ -222,7 +222,11 @@ import Data.ByteString (ByteString)
222222import qualified Data.Text.Lazy as L
223223import Data.Int (Int64)
224224#endif
225+#if __GLASGOW_HASKELL__ >= 702
225226import qualified GHC.CString as GHC
227+#else
228+import qualified GHC.Base as GHC
229+#endif
226230import GHC.Prim (Addr#)
227231
228232-- $strict
Data/Text/Fusion/Common.hs+1−1
@@ -159,7 +159,7 @@ streamCString# addr = Stream step 0 unknownSize
159159 in Yield c (i+4)
160160 where b = I# (ord# b#)
161161 next n = I# (ord# (at# (i+n))) - 0x80
162− b# = at# i
162+ !b# = at# i
163163 at# (I# i#) = indexCharOffAddr# addr i#
164164 chr (I# i#) = C# (chr# i#)
165165{-# INLINE [0] streamCString# #-}
Data/Text/Lazy.hs+4
@@ -217,7 +217,11 @@ import Data.Text.Lazy.Internal (Text(..), chunk, empty, foldlChunks, foldrChunks
217217import Data.Text.Internal (firstf, safe, textP)
218218import qualified Data.Text.Util as U
219219import Data.Text.Lazy.Search (indices)
220+#if __GLASGOW_HASKELL__ >= 702
220221import qualified GHC.CString as GHC
222+#else
223+import qualified GHC.Base as GHC
224+#endif
221225import GHC.Prim (Addr#)
222226
223227-- $fusion