text 0.8.1.0 → 0.9.0.0

raw patch · 3 files changed

+32/−13 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/Text/Foreign.hs +16/−12
• tests/Benchmarks.hs +15/−0
• text.cabal +1/−1

@@ -1,4 +1,4 @@-{-# LANGUAGE BangPatterns, CPP #-}+{-# LANGUAGE BangPatterns, CPP, GeneralizedNewtypeDeriving #-} -- | -- Module      : Data.Text.Foreign -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan@@ -16,9 +16,9 @@     (     -- * Interoperability with native code     -- $interop-+      I16     -- * Safe conversion functions-      fromPtr+    , fromPtr     , useAsPtr     -- * Unsafe conversion code     , lengthWord16@@ -54,13 +54,17 @@ -- internal representations, such as UTF-8 or UTF-32, consider using -- the functions in the 'Data.Text.Encoding' module. +-- | A type representing a number of UTF-16 code units.+newtype I16 = I16 Int+    deriving (Bounded, Enum, Eq, Integral, Num, Ord, Read, Real, Show)+ -- | /O(n)/ Create a new 'Text' from a 'Ptr' 'Word16' by copying the -- contents of the array. fromPtr :: Ptr Word16           -- ^ source array-        -> Int                  -- ^ length of source array (in 'Word16' units)+        -> I16                  -- ^ length of source array (in 'Word16' units)         -> IO Text-fromPtr _   0   = return empty-fromPtr ptr len =+fromPtr _   (I16 0)   = return empty+fromPtr ptr (I16 len) = #if defined(ASSERTS)     assert (len > 0) $ #endif@@ -87,8 +91,8 @@ -- If @n@ would cause the 'Text' to end inside a surrogate pair, the -- end of the prefix will be advanced by one additional 'Word16' unit -- to maintain its validity.-takeWord16 :: Int -> Text -> Text-takeWord16 n t@(Text arr off len)+takeWord16 :: I16 -> Text -> Text+takeWord16 (I16 n) t@(Text arr off len)     | n <= 0               = empty     | n >= len || m >= len = t     | otherwise            = Text arr off m@@ -103,8 +107,8 @@ -- If @n@ would cause the 'Text' to begin inside a surrogate pair, the -- beginning of the suffix will be advanced by one additional 'Word16' -- unit to maintain its validity.-dropWord16 :: Int -> Text -> Text-dropWord16 n t@(Text arr off len)+dropWord16 :: I16 -> Text -> Text+dropWord16 (I16 n) t@(Text arr off len)     | n <= 0               = t     | n >= len || m >= len = empty     | otherwise            = Text arr (off+m) (len-m)@@ -126,8 +130,8 @@  -- | /O(n)/ Perform an action on a temporary, mutable copy of a -- 'Text'.  The copy is freed as soon as the action returns.-useAsPtr :: Text -> (Ptr Word16 -> Int -> IO a) -> IO a+useAsPtr :: Text -> (Ptr Word16 -> I16 -> IO a) -> IO a useAsPtr t@(Text _arr _off len) action =     allocaBytes (len * 2) $ \buf -> do       unsafeCopyToPtr t buf-      action (castPtr buf) len+      action (castPtr buf) (fromIntegral len)

@@ -198,6 +198,20 @@       , bench "bl" $ nf (BL.map f) bla       , bench "l" $ nf (L.map f) la       ],+      bgroup "mapAccumL" [+        bench "ts" $ nf (TS.mapAccumL g 0) tsa+      , bench "tl" $ nf (TL.mapAccumL g 0) tla+      , bench "bs" $ nf (BS.mapAccumL g 0) bsa+      , bench "bl" $ nf (BL.mapAccumL g 0) bla+      , bench "l" $ nf (L.mapAccumL g 0) la+      ],+      bgroup "mapAccumR" [+        bench "ts" $ nf (TS.mapAccumR g 0) tsa+      , bench "tl" $ nf (TL.mapAccumR g 0) tla+      , bench "bs" $ nf (BS.mapAccumR g 0) bsa+      , bench "bl" $ nf (BL.mapAccumR g 0) bla+      , bench "l" $ nf (L.mapAccumR g 0) la+      ],       bgroup "map.map" [         bench "ts" $ nf (TS.map f . TS.map f) tsa       , bench "tl" $ nf (TL.map f . TL.map f) tla@@ -414,6 +428,7 @@     tsw  = TS.pack lw     tlw  = TL.fromChunks [tsw]     f (C# c#) = C# (chr# (ord# c# +# 1#))+    g (I# i#) (C# c#) = (I# (i# +# 1#), C# (chr# (ord# c# +# i#)))     len l _ = l + (1::Int)     replicat n = concat . L.replicate n     short = TS.pack "short"

@@ -1,5 +1,5 @@ name:           text-version:        0.8.1.0+version:        0.9.0.0 homepage:       http://code.haskell.org/text synopsis:       An efficient packed Unicode text type. description: