@@ -3,6 +3,9 @@
3#if __GLASGOW_HASKELL__ >= 702
3#if __GLASGOW_HASKELL__ >= 702
4{-# LANGUAGE Trustworthy #-}
4{-# LANGUAGE Trustworthy #-}
6+#if __GLASGOW_HASKELL__ >= 708
7+{-# LANGUAGE TypeFamilies #-}
8-- Module : Data.Text
11-- Module : Data.Text
@@ -29,8 +32,8 @@
30-- To use an extended and very rich family of functions for working
33-- To use an extended and very rich family of functions for working
31-- with Unicode text (including normalization, regular expressions,
34-- with Unicode text (including normalization, regular expressions,
32−-- non-standard encodings, text breaking, and locales), see the
35+-- non-standard encodings, text breaking, and locales), see
33−-- @text-icu@ package: <http://hackage.haskell.org/package/text-icu>
36+-- <http://hackage.haskell.org/package/text-icu the text-icu package >.
35module Data.Text
38module Data.Text
@@ -122,8 +125,11 @@ module Data.Text
123 -- ** Breaking strings
126 -- ** Breaking strings
126 , takeWhile
131 , takeWhile
127 , dropWhile
133 , dropWhile
128 , dropWhileEnd
134 , dropWhileEnd
129 , dropAround
135 , dropAround
@@ -186,35 +192,43 @@ module Data.Text
187 -- * Low level operations
193 -- * Low level operations
191import Prelude (Char, Bool(..), Int, Maybe(..), String,
198import Prelude (Char, Bool(..), Int, Maybe(..), String,
192 Eq(..), Ord(..), Ordering(..), (++),
199 Eq(..), Ord(..), Ordering(..), (++),
193− Read(..), Show(..),
200+ Read(..),
194− (&&), (||), (+), (-), (.), ($), ($!), (>>), (*),
201+ (&&), (||), (+), (-), (.), ($), ($!), (>>),
195− maxBound, not, return, otherwise, quot)
202+ not, return, otherwise, quot)
196#if defined(HAVE_DEEPSEQ)
203#if defined(HAVE_DEEPSEQ)
197−import Control.DeepSeq (NFData)
204+import Control.DeepSeq (NFData(rnf))
199#if defined(ASSERTS)
206#if defined(ASSERTS)
200import Control.Exception (assert)
207import Control.Exception (assert)
202import Data.Char (isSpace)
209import Data.Char (isSpace)
203−import Data.Data (Data(gfoldl, toConstr, gunfold, dataTypeOf))
210+import Data.Data (Data(gfoldl, toConstr, gunfold, dataTypeOf), constrIndex,
204−import Data.Data (mkNoRepType)
211+ Constr, mkConstr, DataType, mkDataType, Fixity(Prefix))
205import Control.Monad (foldM)
212import Control.Monad (foldM)
213+import Control.Monad.ST (ST)
206import qualified Data.Text.Array as A
214import qualified Data.Text.Array as A
207import qualified Data.List as L
215import qualified Data.List as L
216+import Data.Binary (Binary(get, put))
208import Data.Monoid (Monoid(..))
217import Data.Monoid (Monoid(..))
218+#if MIN_VERSION_base(4,9,0)
219+import Data.Semigroup (Semigroup(..))
209import Data.String (IsString(..))
221import Data.String (IsString(..))
210import qualified Data.Text.Internal.Fusion as S
222import qualified Data.Text.Internal.Fusion as S
211import qualified Data.Text.Internal.Fusion.Common as S
223import qualified Data.Text.Internal.Fusion.Common as S
224+import Data.Text.Encoding (decodeUtf8', encodeUtf8)
212import Data.Text.Internal.Fusion (stream, reverseStream, unstream)
225import Data.Text.Internal.Fusion (stream, reverseStream, unstream)
213import Data.Text.Internal.Private (span_)
226import Data.Text.Internal.Private (span_)
214−import Data.Text.Internal (Text(..), empty, firstf, safe, text, textP)
227+import Data.Text.Internal (Text(..), empty, firstf, mul, safe, text)
228+import Data.Text.Show (singleton, unpack, unpackCString#)
215import qualified Prelude as P
229import qualified Prelude as P
216import Data.Text.Unsafe (Iter(..), iter, iter_, lengthWord16, reverseIter,
230import Data.Text.Unsafe (Iter(..), iter, iter_, lengthWord16, reverseIter,
217− unsafeHead, unsafeTail)
231+ reverseIter_, unsafeHead, unsafeTail)
218import Data.Text.Internal.Unsafe.Char (unsafeChr)
232import Data.Text.Internal.Unsafe.Char (unsafeChr)
219import qualified Data.Text.Internal.Functions as F
233import qualified Data.Text.Internal.Functions as F
220import qualified Data.Text.Internal.Encoding.Utf16 as U16
234import qualified Data.Text.Internal.Encoding.Utf16 as U16
@@ -224,12 +238,13 @@ import Data.ByteString (ByteString)
224import qualified Data.Text.Lazy as L
238import qualified Data.Text.Lazy as L
225import Data.Int (Int64)
239import Data.Int (Int64)
241+import GHC.Base (eqInt, neInt, gtInt, geInt, ltInt, leInt)
227−#if __GLASGOW_HASKELL__ >= 702
242+#if __GLASGOW_HASKELL__ >= 708
228−import qualified GHC.CString as GHC
243+import qualified GHC.Exts as Exts
230−import qualified GHC.Base as GHC
245+#if MIN_VERSION_base(4,7,0)
246+import Text.Printf (PrintfArg, formatArg, formatString)
232−import GHC.Prim (Addr#)
234-- $strict
249-- $strict
@@ -239,29 +254,32 @@ import GHC.Prim (Addr#)
239-- lazy @Text@ type consists of a list of strict chunks.
254-- lazy @Text@ type consists of a list of strict chunks.
241-- The strict 'Text' type requires that an entire string fit into
256-- The strict 'Text' type requires that an entire string fit into
242−-- memory at once. The lazy @Text@ type is capable of streaming
257+-- memory at once. The lazy 'Data.Text.Lazy.Text' type is capable of
243−-- strings that are larger than memory using a small memory footprint.
258+-- streaming strings that are larger than memory using a small memory
244−-- In many cases, the overhead of chunked streaming makes the lazy
259+-- footprint. In many cases, the overhead of chunked streaming makes
245−-- @Text@ type slower than its strict counterpart, but this is not
260+-- the lazy 'Data.Text.Lazy.Text' type slower than its strict
246−-- always the case. Sometimes, the time complexity of a function in
261+-- counterpart, but this is not always the case. Sometimes, the time
247−-- one module may be different from the other, due to their differing
262+-- complexity of a function in one module may be different from the
248−-- internal structures.
263+-- other, due to their differing internal structures.
250-- Each module provides an almost identical API, with the main
265-- Each module provides an almost identical API, with the main
251-- difference being that the strict module uses 'Int' values for
266-- difference being that the strict module uses 'Int' values for
252−-- lengths and counts, while the lazy module uses 'Int64' lengths.
267+-- lengths and counts, while the lazy module uses 'Data.Int.Int64'
254-- $replacement
270-- $replacement
256-- A 'Text' value is a sequence of Unicode scalar values, as defined
272-- A 'Text' value is a sequence of Unicode scalar values, as defined
257−-- in §3.9, definition D76 of the Unicode 5.2 standard:
274+-- <http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf#page=35 §3.9, definition D76 of the Unicode 5.2 standard >.
258−-- <http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf#page=35>. As
259−-- such, a 'Text' cannot contain values in the range U+D800 to U+DFFF
275+-- As such, a 'Text' cannot contain values in the range U+D800 to
260−-- inclusive. Haskell implementations admit all Unicode code points
276+-- U+DFFF inclusive. Haskell implementations admit all Unicode code
278+-- (<http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf#page=13 §3.4, definition D10 >)
261−-- (§3.4, definition D10) as 'Char' values, including code points
279+-- as 'Char' values, including code points from this invalid range.
262−-- from this invalid range. This means that there are some 'Char'
280+-- This means that there are some 'Char' values that are not valid
263−-- values that are not valid Unicode scalar values, and the functions
281+-- Unicode scalar values, and the functions in this module must handle
264−-- in this module must handle those cases.
282+-- those cases.
266-- Within this module, many functions construct a 'Text' from one or
284-- Within this module, many functions construct a 'Text' from one or
267-- more 'Char' values. Those functions will substitute 'Char' values
285-- more 'Char' values. Those functions will substitute 'Char' values
@@ -275,8 +293,8 @@ import GHC.Prim (Addr#)
275-- range U+D800 through U+DFFF are used by UTF-16 to denote surrogate
293-- range U+D800 through U+DFFF are used by UTF-16 to denote surrogate
276-- code points, and so cannot be represented. The functions replace
294-- code points, and so cannot be represented. The functions replace
277-- invalid scalar values, instead of dropping them, as a security
295-- invalid scalar values, instead of dropping them, as a security
278−-- measure. For details, see Unicode Technical Report 36, §3.5:
296+-- measure. For details, see
279−-- <http://unicode.org/reports/tr36/#Deletion_of_Noncharacters>)
297+-- <http://unicode.org/reports/tr36/#Deletion_of_Noncharacters Unicode Technical Report 36, §3.5 >.)
281-- $fusion
299-- $fusion
@@ -294,11 +312,11 @@ import GHC.Prim (Addr#)
294-- > countChars = T.length . T.toUpper . E.decodeUtf8
312-- > countChars = T.length . T.toUpper . E.decodeUtf8
296-- From the type signatures involved, this looks like it should
314-- From the type signatures involved, this looks like it should
297−-- allocate one 'ByteString' value, and two 'Text' values. However,
315+-- allocate one 'Data.ByteString.ByteString' value, and two 'Text'
298−-- when a module is compiled with optimisation enabled under GHC, the
316+-- values. However, when a module is compiled with optimisation
299−-- two intermediate 'Text' values will be optimised away, and the
317+-- enabled under GHC, the two intermediate 'Text' values will be
300−-- function will be compiled down to a single loop over the source
318+-- optimised away, and the function will be compiled down to a single
301−-- 'ByteString'.
319+-- loop over the source 'Data.ByteString.ByteString'.
303-- Functions that can be fused by the compiler are documented with the
321-- Functions that can be fused by the compiler are documented with the
304-- phrase \"Subject to fusion\".
322-- phrase \"Subject to fusion\".
@@ -312,41 +330,82 @@ instance Eq Text where
312instance Ord Text where
330instance Ord Text where
313 compare = compareText
331 compare = compareText
315−instance Show Text where
316− showsPrec p ps r = showsPrec p (unpack ps) r
318instance Read Text where
333instance Read Text where
319 readsPrec p str = [(pack x,y) | (x,y) <- readsPrec p str]
334 readsPrec p str = [(pack x,y) | (x,y) <- readsPrec p str]
336+#if MIN_VERSION_base(4,9,0)
337+-- Semigroup orphan instances for older GHCs are provided by
338+-- 'semigroups` package
340+instance Semigroup Text where
321instance Monoid Text where
344instance Monoid Text where
322 mempty = empty
345 mempty = empty
346+#if MIN_VERSION_base(4,9,0)
347+ mappend = (<>) -- future-proof definition
323 mappend = append
349 mappend = append
324 mconcat = concat
351 mconcat = concat
326instance IsString Text where
353instance IsString Text where
327 fromString = pack
354 fromString = pack
356+#if __GLASGOW_HASKELL__ >= 708
357+instance Exts.IsList Text where
358+ type Item Text = Char
329#if defined(HAVE_DEEPSEQ)
363#if defined(HAVE_DEEPSEQ)
330−instance NFData Text
364+instance NFData Text where rnf !_ = ()
367+instance Binary Text where
368+ put t = put (encodeUtf8 t)
371+ case decodeUtf8' bs of
372+ P.Left exn -> P.fail (P.show exn)
373+ P.Right a -> P.return a
333-- | This instance preserves data abstraction at the cost of inefficiency.
375-- | This instance preserves data abstraction at the cost of inefficiency.
334-- We omit reflection services for the sake of data abstraction.
376-- We omit reflection services for the sake of data abstraction.
336−-- This instance was created by copying the behavior of Data.Set and
378+-- This instance was created by copying the updated behavior of
379+-- @"Data.Set".@'Data.Set.Set' and @"Data.Map".@'Data.Map.Map'. If you
337−-- Data.Map. If you feel a mistake has been made, please feel free to
380+-- feel a mistake has been made, please feel free to submit
338−-- submit improvements.
381+-- improvements.
340−-- Original discussion is archived here:
383+-- The original discussion is archived here:
384+-- <http://groups.google.com/group/haskell-cafe/browse_thread/thread/b5bbb1b28a7e525d/0639d46852575b93 could we get a Data instance for Data.Text.Text? >
342−-- "could we get a Data instance for Data.Text.Text?"
386+-- The followup discussion that changed the behavior of 'Data.Set.Set'
343−-- http://groups.google.com/group/haskell-cafe/browse_thread/thread/b5bbb1b28a7e525d/0639d46852575b93
387+-- and 'Data.Map.Map' is archived here:
388+-- <http://markmail.org/message/trovdc6zkphyi3cr#query:+page:1+mid:a46der3iacwjcf6n+state:results Proposal: Allow gunfold for Data.Map, ... >
345instance Data Text where
390instance Data Text where
346 gfoldl f z txt = z pack `f` (unpack txt)
391 gfoldl f z txt = z pack `f` (unpack txt)
347− toConstr _ = P.error "Data.Text.Text.toConstr"
392+ toConstr _ = packConstr
393+ gunfold k z c = case constrIndex c of
348− gunfold _ _ = P.error "Data.Text.Text.gunfold"
395+ _ -> P.error "gunfold"
349− dataTypeOf _ = mkNoRepType "Data.Text.Text"
396+ dataTypeOf _ = textDataType
398+#if MIN_VERSION_base(4,7,0)
399+-- | Only defined for @base-4.7.0.0@ and later
400+instance PrintfArg Text where
401+ formatArg txt = formatString $ unpack txt
405+packConstr = mkConstr textDataType "pack" [] Prefix
407+textDataType :: DataType
408+textDataType = mkDataType "Data.Text.Text" [packConstr]
351-- | /O(n)/ Compare two 'Text' values lexicographically.
410-- | /O(n)/ Compare two 'Text' values lexicographically.
352compareText :: Text -> Text -> Ordering
411compareText :: Text -> Text -> Ordering
@@ -371,30 +430,6 @@ pack :: String -> Text
371pack = unstream . S.map safe . S.streamList
430pack = unstream . S.map safe . S.streamList
372{-# INLINE [1] pack #-}
431{-# INLINE [1] pack #-}
374−-- | /O(n)/ Convert a 'Text' into a 'String'. Subject to fusion.
375−unpack :: Text -> String
376−unpack = S.unstreamList . stream
377−{-# INLINE [1] unpack #-}
379−-- | /O(n)/ Convert a literal string into a Text. Subject to fusion.
380−unpackCString# :: Addr# -> Text
381−unpackCString# addr# = unstream (S.streamCString# addr#)
382−{-# NOINLINE unpackCString# #-}
384−{-# RULES "TEXT literal" forall a.
385− unstream (S.map safe (S.streamList (GHC.unpackCString# a)))
386− = unpackCString# a #-}
388−{-# RULES "TEXT literal UTF8" forall a.
389− unstream (S.map safe (S.streamList (GHC.unpackCStringUtf8# a)))
390− = unpackCString# a #-}
392−-- | /O(1)/ Convert a character into a Text. Subject to fusion.
393−-- Performs replacement on invalid scalar values.
394−singleton :: Char -> Text
395−singleton = unstream . S.singleton . safe
396−{-# INLINE [1] singleton #-}
398-- -----------------------------------------------------------------------------
433-- -----------------------------------------------------------------------------
399-- * Basic functions
434-- * Basic functions
@@ -425,6 +460,7 @@ append a@(Text arr1 off1 len1) b@(Text arr2 off2 len2)
425 | otherwise = overflowError "append"
460 | otherwise = overflowError "append"
427 len = len1+len2
462 len = len1+len2
463+ x :: ST s (A.MArray s)
429 arr <- A.new len
465 arr <- A.new len
430 A.copyI arr 0 arr1 off1 len1
466 A.copyI arr 0 arr1 off1 len1
@@ -450,8 +486,8 @@ head t = S.head (stream t)
450uncons :: Text -> Maybe (Char, Text)
486uncons :: Text -> Maybe (Char, Text)
451uncons t@(Text arr off len)
487uncons t@(Text arr off len)
452 | len <= 0 = Nothing
488 | len <= 0 = Nothing
489+ | otherwise = Just $ let !(Iter c d) = iter t 0
453− | otherwise = Just (c, textP arr (off+d) (len-d))
490+ in (c, text arr (off+d) (len-d))
454− where Iter c d = iter t 0
455{-# INLINE [1] uncons #-}
491{-# INLINE [1] uncons #-}
457-- | Lifted from Control.Arrow and specialized.
493-- | Lifted from Control.Arrow and specialized.
@@ -481,7 +517,7 @@ last (Text arr off len)
481tail :: Text -> Text
517tail :: Text -> Text
482tail t@(Text arr off len)
518tail t@(Text arr off len)
483 | len <= 0 = emptyError "tail"
519 | len <= 0 = emptyError "tail"
484− | otherwise = textP arr (off+d) (len-d)
520+ | otherwise = text arr (off+d) (len-d)
485 where d = iter_ t 0
521 where d = iter_ t 0
486{-# INLINE [1] tail #-}
522{-# INLINE [1] tail #-}
@@ -496,8 +532,8 @@ tail t@(Text arr off len)
496-- be non-empty. Subject to fusion.
532-- be non-empty. Subject to fusion.
497init :: Text -> Text
533init :: Text -> Text
498init (Text arr off len) | len <= 0 = emptyError "init"
534init (Text arr off len) | len <= 0 = emptyError "init"
499− | n >= 0xDC00 && n <= 0xDFFF = textP arr off (len-2)
535+ | n >= 0xDC00 && n <= 0xDFFF = text arr off (len-2)
500− | otherwise = textP arr off (len-1)
536+ | otherwise = text arr off (len-1)
502 n = A.unsafeIndex arr (off+len-1)
538 n = A.unsafeIndex arr (off+len-1)
503{-# INLINE [1] init #-}
539{-# INLINE [1] init #-}
@@ -536,7 +572,9 @@ isSingleton = S.isSingleton . stream
536-- Subject to fusion.
572-- Subject to fusion.
537length :: Text -> Int
573length :: Text -> Int
538length t = S.length (stream t)
574length t = S.length (stream t)
539−{-# INLINE length #-}
575+{-# INLINE [0] length #-}
576+-- length needs to be phased after the compareN/length rules otherwise
577+-- it may inline before the rules have an opportunity to fire.
541-- | /O(n)/ Compare the count of characters in a 'Text' to a number.
579-- | /O(n)/ Compare the count of characters in a 'Text' to a number.
542-- Subject to fusion.
580-- Subject to fusion.
@@ -555,32 +593,32 @@ compareLength t n = S.compareLengthI (stream t) n
557"TEXT ==N/length -> compareLength/==EQ" [~1] forall t n.
595"TEXT ==N/length -> compareLength/==EQ" [~1] forall t n.
558− (==) (length t) n = compareLength t n == EQ
596+ eqInt (length t) n = compareLength t n == EQ
562"TEXT /=N/length -> compareLength//=EQ" [~1] forall t n.
600"TEXT /=N/length -> compareLength//=EQ" [~1] forall t n.
563− (/=) (length t) n = compareLength t n /= EQ
601+ neInt (length t) n = compareLength t n /= EQ
567"TEXT <N/length -> compareLength/==LT" [~1] forall t n.
605"TEXT <N/length -> compareLength/==LT" [~1] forall t n.
568− (<) (length t) n = compareLength t n == LT
606+ ltInt (length t) n = compareLength t n == LT
572"TEXT <=N/length -> compareLength//=GT" [~1] forall t n.
610"TEXT <=N/length -> compareLength//=GT" [~1] forall t n.
573− (<=) (length t) n = compareLength t n /= GT
611+ leInt (length t) n = compareLength t n /= GT
577"TEXT >N/length -> compareLength/==GT" [~1] forall t n.
615"TEXT >N/length -> compareLength/==GT" [~1] forall t n.
578− (>) (length t) n = compareLength t n == GT
616+ gtInt (length t) n = compareLength t n == GT
582"TEXT >=N/length -> compareLength//=LT" [~1] forall t n.
620"TEXT >=N/length -> compareLength//=LT" [~1] forall t n.
583− (>=) (length t) n = compareLength t n /= LT
621+ geInt (length t) n = compareLength t n /= LT
586-- -----------------------------------------------------------------------------
624-- -----------------------------------------------------------------------------
@@ -611,22 +649,48 @@ reverse :: Text -> Text
611reverse t = S.reverse (stream t)
649reverse t = S.reverse (stream t)
612{-# INLINE reverse #-}
650{-# INLINE reverse #-}
614−-- | /O(m+n)/ Replace every occurrence of one substring with another.
652+-- | /O(m+n)/ Replace every non-overlapping occurrence of @needle@ in
653+-- @haystack@ with @replacement@.
655+-- This function behaves as though it was defined as follows:
658+-- replace needle replacement haystack =
659+-- 'intercalate' replacement ('splitOn' needle haystack)
662+-- As this suggests, each occurrence is replaced exactly once. So if
663+-- @needle@ occurs in @replacement@, that occurrence will /not/ itself
664+-- be replaced recursively:
666+-- > replace "oo" "foo" "oo" == "foo"
668+-- In cases where several instances of @needle@ overlap, only the
669+-- first one will be replaced:
671+-- > replace "ofo" "bar" "ofofo" == "barfo"
616-- In (unlikely) bad cases, this function's time complexity degrades
673-- In (unlikely) bad cases, this function's time complexity degrades
617-- towards /O(n*m)/.
674-- towards /O(n*m)/.
618−replace :: Text -> Text -> Text -> Text
675+replace :: Text
676+ -- ^ @needle@ to search for. If this string is empty, an
677+ -- error will occur.
679+ -- ^ @replacement@ to replace @needle@ with.
681+ -- ^ @haystack@ in which to search.
619replace needle@(Text _ _ neeLen)
683replace needle@(Text _ _ neeLen)
620 (Text repArr repOff repLen)
684 (Text repArr repOff repLen)
621 haystack@(Text hayArr hayOff hayLen)
685 haystack@(Text hayArr hayOff hayLen)
622 | neeLen == 0 = emptyError "replace"
686 | neeLen == 0 = emptyError "replace"
623 | L.null ixs = haystack
687 | L.null ixs = haystack
624 | len > 0 = Text (A.run x) 0 len
688 | len > 0 = Text (A.run x) 0 len
625− | len < 0 = overflowError "replace"
626 | otherwise = empty
689 | otherwise = empty
628 ixs = indices needle haystack
691 ixs = indices needle haystack
629− len = hayLen - (neeLen - repLen) * L.length ixs
692+ len = hayLen - (neeLen - repLen) `mul` L.length ixs
693+ x :: ST s (A.MArray s)
631 marr <- A.new len
695 marr <- A.new len
632 let loop (i:is) o d = do
696 let loop (i:is) o d = do
@@ -656,9 +720,8 @@ replace needle@(Text _ _ neeLen)
656-- /Note/: In some languages, case conversion is a locale- and
720-- /Note/: In some languages, case conversion is a locale- and
657-- context-dependent operation. The case conversion functions in this
721-- context-dependent operation. The case conversion functions in this
658-- module are /not/ locale sensitive. Programs that require locale
722-- module are /not/ locale sensitive. Programs that require locale
659−-- sensitivity should use appropriate versions of the case mapping
723+-- sensitivity should use appropriate versions of the
660−-- functions from the @text-icu@ package:
661−-- <http://hackage.haskell.org/package/text-icu>
724+-- <http://hackage.haskell.org/package/text-icu-0.6.3.7/docs/Data-Text-ICU.html#g:4 case mapping functions from the text-icu package >.
663-- | /O(n)/ Convert a string to folded case. Subject to fusion.
726-- | /O(n)/ Convert a string to folded case. Subject to fusion.
@@ -678,7 +741,7 @@ replace needle@(Text _ _ neeLen)
678-- instead of itself.
741-- instead of itself.
679toCaseFold :: Text -> Text
742toCaseFold :: Text -> Text
680toCaseFold t = unstream (S.toCaseFold (stream t))
743toCaseFold t = unstream (S.toCaseFold (stream t))
681−{-# INLINE [0] toCaseFold #-}
744+{-# INLINE toCaseFold #-}
683-- | /O(n)/ Convert a string to lower case, using simple case
746-- | /O(n)/ Convert a string to lower case, using simple case
684-- conversion. Subject to fusion.
747-- conversion. Subject to fusion.
@@ -838,6 +901,7 @@ concat ts = case ts' of
839 ts' = L.filter (not . null) ts
902 ts' = L.filter (not . null) ts
840 len = sumP "concat" $ L.map lengthWord16 ts'
903 len = sumP "concat" $ L.map lengthWord16 ts'
904+ go :: ST s (A.MArray s)
842 arr <- A.new len
906 arr <- A.new len
843 let step i (Text a o l) =
907 let step i (Text a o l) =
@@ -851,13 +915,13 @@ concatMap f = concat . foldr ((:) . f) []
851{-# INLINE concatMap #-}
915{-# INLINE concatMap #-}
853-- | /O(n)/ 'any' @p@ @t@ determines whether any character in the
917-- | /O(n)/ 'any' @p@ @t@ determines whether any character in the
854−-- 'Text' @t@ satisifes the predicate @p@. Subject to fusion.
918+-- 'Text' @t@ satisfies the predicate @p@. Subject to fusion.
855any :: (Char -> Bool) -> Text -> Bool
919any :: (Char -> Bool) -> Text -> Bool
856any p t = S.any p (stream t)
920any p t = S.any p (stream t)
857{-# INLINE any #-}
921{-# INLINE any #-}
859-- | /O(n)/ 'all' @p@ @t@ determines whether all characters in the
923-- | /O(n)/ 'all' @p@ @t@ determines whether all characters in the
860−-- 'Text' @t@ satisify the predicate @p@. Subject to fusion.
924+-- 'Text' @t@ satisfy the predicate @p@. Subject to fusion.
861all :: (Char -> Bool) -> Text -> Bool
925all :: (Char -> Bool) -> Text -> Bool
862all p t = S.all p (stream t)
926all p t = S.all p (stream t)
863{-# INLINE all #-}
927{-# INLINE all #-}
@@ -948,10 +1012,10 @@ replicate n t@(Text a o l)
948 | n <= 0 || l <= 0 = empty
1012 | n <= 0 || l <= 0 = empty
949 | n == 1 = t
1013 | n == 1 = t
950 | isSingleton t = replicateChar n (unsafeHead t)
1014 | isSingleton t = replicateChar n (unsafeHead t)
951− | n <= maxBound `quot` l = Text (A.run x) 0 len
1015+ | otherwise = Text (A.run x) 0 len
952− | otherwise = overflowError "replicate"
954− len = l * n
1017+ len = l `mul` n
1018+ x :: ST s (A.MArray s)
956 arr <- A.new len
1020 arr <- A.new len
957 let loop !d !i | i >= n = return arr
1021 let loop !d !i | i >= n = return arr
@@ -1002,14 +1066,16 @@ take :: Int -> Text -> Text
1002take n t@(Text arr off len)
1066take n t@(Text arr off len)
1003 | n <= 0 = empty
1067 | n <= 0 = empty
1004 | n >= len = t
1068 | n >= len = t
1005− | otherwise = Text arr off (loop 0 0)
1069+ | otherwise = text arr off (iterN n t)
1008− | i >= len || cnt >= n = i
1009− | otherwise = loop (i+d) (cnt+1)
1010− where d = iter_ t i
1011{-# INLINE [1] take #-}
1070{-# INLINE [1] take #-}
1072+iterN :: Int -> Text -> Int
1073+iterN n t@(Text _arr _off len) = loop 0 0
1075+ | i >= len || cnt >= n = i
1076+ | otherwise = loop (i+d) (cnt+1)
1077+ where d = iter_ t i
1013{-# RULES
1079{-# RULES
1014"TEXT take -> fused" [~1] forall n t.
1080"TEXT take -> fused" [~1] forall n t.
1015 take n t = unstream (S.take n (stream t))
1081 take n t = unstream (S.take n (stream t))
@@ -1017,6 +1083,27 @@ take n t@(Text arr off len)
1017 unstream (S.take n (stream t)) = take n t
1083 unstream (S.take n (stream t)) = take n t
1086+-- | /O(n)/ 'takeEnd' @n@ @t@ returns the suffix remaining after
1087+-- taking @n@ characters from the end of @t@.
1091+-- > takeEnd 3 "foobar" == "bar"
1092+takeEnd :: Int -> Text -> Text
1093+takeEnd n t@(Text arr off len)
1096+ | otherwise = text arr (off+i) (len-i)
1097+ where i = iterNEnd n t
1099+iterNEnd :: Int -> Text -> Int
1100+iterNEnd n t@(Text _arr _off len) = loop (len-1) n
1104+ | otherwise = loop (i+d) (m-1)
1105+ where d = reverseIter_ t i
1020-- | /O(n)/ 'drop' @n@, applied to a 'Text', returns the suffix of the
1107-- | /O(n)/ 'drop' @n@, applied to a 'Text', returns the suffix of the
1021-- 'Text' after the first @n@ characters, or the empty 'Text' if @n@
1108-- 'Text' after the first @n@ characters, or the empty 'Text' if @n@
1022-- is greater than the length of the 'Text'. Subject to fusion.
1109-- is greater than the length of the 'Text'. Subject to fusion.
@@ -1024,11 +1111,8 @@ drop :: Int -> Text -> Text
1024drop n t@(Text arr off len)
1111drop n t@(Text arr off len)
1025 | n <= 0 = t
1112 | n <= 0 = t
1026 | n >= len = empty
1113 | n >= len = empty
1027− | otherwise = loop 0 0
1114+ | otherwise = text arr (off+i) (len-i)
1029− | i >= len || cnt >= n = Text arr (off+i) (len-i)
1030− | otherwise = loop (i+d) (cnt+1)
1031− where d = iter_ t i
1115+ where i = iterN n t
1032{-# INLINE [1] drop #-}
1116{-# INLINE [1] drop #-}
1034{-# RULES
1118{-# RULES
@@ -1038,6 +1122,18 @@ drop n t@(Text arr off len)
1038 unstream (S.drop n (stream t)) = drop n t
1122 unstream (S.drop n (stream t)) = drop n t
1125+-- | /O(n)/ 'dropEnd' @n@ @t@ returns the prefix remaining after
1126+-- dropping @n@ characters from the end of @t@.
1130+-- > dropEnd 3 "foobar" == "foo"
1131+dropEnd :: Int -> Text -> Text
1132+dropEnd n t@(Text arr off len)
1135+ | otherwise = text arr off (iterNEnd n t)
1041-- | /O(n)/ 'takeWhile', applied to a predicate @p@ and a 'Text',
1137-- | /O(n)/ 'takeWhile', applied to a predicate @p@ and a 'Text',
1042-- returns the longest prefix (possibly empty) of elements that
1138-- returns the longest prefix (possibly empty) of elements that
1043-- satisfy @p@. Subject to fusion.
1139-- satisfy @p@. Subject to fusion.
@@ -1045,7 +1141,7 @@ takeWhile :: (Char -> Bool) -> Text -> Text
1045takeWhile p t@(Text arr off len) = loop 0
1141takeWhile p t@(Text arr off len) = loop 0
1046 where loop !i | i >= len = t
1142 where loop !i | i >= len = t
1047 | p c = loop (i+d)
1143 | p c = loop (i+d)
1048− | otherwise = textP arr off i
1144+ | otherwise = text arr off i
1049 where Iter c d = iter t i
1145 where Iter c d = iter t i
1050{-# INLINE [1] takeWhile #-}
1146{-# INLINE [1] takeWhile #-}
@@ -1056,6 +1152,27 @@ takeWhile p t@(Text arr off len) = loop 0
1056 unstream (S.takeWhile p (stream t)) = takeWhile p t
1152 unstream (S.takeWhile p (stream t)) = takeWhile p t
1155+-- | /O(n)/ 'takeWhileEnd', applied to a predicate @p@ and a 'Text',
1156+-- returns the longest suffix (possibly empty) of elements that
1157+-- satisfy @p@. Subject to fusion.
1160+-- > takeWhileEnd (=='o') "foo" == "oo"
1161+takeWhileEnd :: (Char -> Bool) -> Text -> Text
1162+takeWhileEnd p t@(Text arr off len) = loop (len-1) len
1163+ where loop !i !l | l <= 0 = t
1164+ | p c = loop (i+d) (l+d)
1165+ | otherwise = text arr (off+l) (len-l)
1166+ where (c,d) = reverseIter t i
1167+{-# INLINE [1] takeWhileEnd #-}
1170+"TEXT takeWhileEnd -> fused" [~1] forall p t.
1171+ takeWhileEnd p t = S.reverse (S.takeWhile p (S.reverseStream t))
1172+"TEXT takeWhileEnd -> unfused" [1] forall p t.
1173+ S.reverse (S.takeWhile p (S.reverseStream t)) = takeWhileEnd p t
1059-- | /O(n)/ 'dropWhile' @p@ @t@ returns the suffix remaining after
1176-- | /O(n)/ 'dropWhile' @p@ @t@ returns the suffix remaining after
1060-- 'takeWhile' @p@ @t@. Subject to fusion.
1177-- 'takeWhile' @p@ @t@. Subject to fusion.
1061dropWhile :: (Char -> Bool) -> Text -> Text
1178dropWhile :: (Char -> Bool) -> Text -> Text
@@ -1074,8 +1191,9 @@ dropWhile p t@(Text arr off len) = loop 0 0
1076-- | /O(n)/ 'dropWhileEnd' @p@ @t@ returns the prefix remaining after
1193-- | /O(n)/ 'dropWhileEnd' @p@ @t@ returns the prefix remaining after
1077−-- dropping characters that fail the predicate @p@ from the end of
1194+-- dropping characters that satisfy the predicate @p@ from the end of
1078-- @t@. Subject to fusion.
1195-- @t@. Subject to fusion.
1079-- Examples:
1197-- Examples:
1081-- > dropWhileEnd (=='.') "foo..." == "foo"
1199-- > dropWhileEnd (=='.') "foo..." == "foo"
@@ -1095,7 +1213,7 @@ dropWhileEnd p t@(Text arr off len) = loop (len-1) len
1097-- | /O(n)/ 'dropAround' @p@ @t@ returns the substring remaining after
1215-- | /O(n)/ 'dropAround' @p@ @t@ returns the substring remaining after
1098−-- dropping characters that fail the predicate @p@ from both the
1216+-- dropping characters that satisfy the predicate @p@ from both the
1099-- beginning and end of @t@. Subject to fusion.
1217-- beginning and end of @t@. Subject to fusion.
1100dropAround :: (Char -> Bool) -> Text -> Text
1218dropAround :: (Char -> Bool) -> Text -> Text
1101dropAround p = dropWhile p . dropWhileEnd p
1219dropAround p = dropWhile p . dropWhileEnd p
@@ -1130,13 +1248,8 @@ splitAt :: Int -> Text -> (Text, Text)
1130splitAt n t@(Text arr off len)
1248splitAt n t@(Text arr off len)
1131 | n <= 0 = (empty, t)
1249 | n <= 0 = (empty, t)
1132 | n >= len = (t, empty)
1250 | n >= len = (t, empty)
1133− | otherwise = (Text arr off k, Text arr (off+k) (len-k))
1251+ | otherwise = let k = iterN n t
1134− where k = loop 0 0
1252+ in (text arr off k, text arr (off+k) (len-k))
1136− | i >= len || cnt >= n = i
1137− | otherwise = loop (i+d) (cnt+1)
1138− where d = iter_ t i
1139−{-# INLINE splitAt #-}
1141-- | /O(n)/ 'span', applied to a predicate @p@ and text @t@, returns
1254-- | /O(n)/ 'span', applied to a predicate @p@ and text @t@, returns
1142-- a pair whose first element is the longest prefix (possibly empty)
1255-- a pair whose first element is the longest prefix (possibly empty)
@@ -1195,9 +1308,9 @@ tails t | null t = [empty]
1195-- copies to create substrings; they just construct new 'Text's that
1308-- copies to create substrings; they just construct new 'Text's that
1196-- are slices of the original.
1309-- are slices of the original.
1198−-- | /O(m+n)/ Break a 'Text' into pieces separated by the first
1311+-- | /O(m+n)/ Break a 'Text' into pieces separated by the first 'Text'
1199−-- 'Text' argument, consuming the delimiter. An empty delimiter is
1312+-- argument (which cannot be empty), consuming the delimiter. An empty
1200−-- invalid, and will cause an error to be raised.
1313+-- delimiter is invalid, and will cause an error to be raised.
1202-- Examples:
1315-- Examples:
@@ -1210,16 +1323,23 @@ tails t | null t = [empty]
1210-- > intercalate s . splitOn s == id
1323-- > intercalate s . splitOn s == id
1211-- > splitOn (singleton c) == split (==c)
1324-- > splitOn (singleton c) == split (==c)
1326+-- (Note: the string @s@ to split on above cannot be empty.)
1213-- In (unlikely) bad cases, this function's time complexity degrades
1328-- In (unlikely) bad cases, this function's time complexity degrades
1214-- towards /O(n*m)/.
1329-- towards /O(n*m)/.
1215−splitOn :: Text -> Text -> [Text]
1330+splitOn :: Text
1331+ -- ^ String to split on. If this string is empty, an error
1216splitOn pat@(Text _ _ l) src@(Text arr off len)
1336splitOn pat@(Text _ _ l) src@(Text arr off len)
1217 | l <= 0 = emptyError "splitOn"
1337 | l <= 0 = emptyError "splitOn"
1218 | isSingleton pat = split (== unsafeHead pat) src
1338 | isSingleton pat = split (== unsafeHead pat) src
1219 | otherwise = go 0 (indices pat src)
1339 | otherwise = go 0 (indices pat src)
1221− go !s (x:xs) = textP arr (s+off) (x-s) : go (x+l) xs
1341+ go !s (x:xs) = text arr (s+off) (x-s) : go (x+l) xs
1222− go s _ = [textP arr (s+off) (len-s)]
1342+ go s _ = [text arr (s+off) (len-s)]
1223{-# INLINE [1] splitOn #-}
1343{-# INLINE [1] splitOn #-}
1225{-# RULES
1345{-# RULES
@@ -1311,7 +1431,7 @@ breakOn pat src@(Text arr off len)
1311 | null pat = emptyError "breakOn"
1431 | null pat = emptyError "breakOn"
1312 | otherwise = case indices pat src of
1432 | otherwise = case indices pat src of
1313 [] -> (src, empty)
1433 [] -> (src, empty)
1314− (x:_) -> (textP arr off x, textP arr (off+x) (len-x))
1434+ (x:_) -> (text arr off x, text arr (off+x) (len-x))
1315{-# INLINE breakOn #-}
1435{-# INLINE breakOn #-}
1317-- | /O(n+m)/ Similar to 'breakOn', but searches from the end of the
1437-- | /O(n+m)/ Similar to 'breakOn', but searches from the end of the
@@ -1353,7 +1473,7 @@ breakOnAll pat src@(Text arr off slen)
1353 | otherwise = L.map step (indices pat src)
1473 | otherwise = L.map step (indices pat src)
1355 step x = (chunk 0 x, chunk x (slen-x))
1475 step x = (chunk 0 x, chunk x (slen-x))
1356− chunk !n !l = textP arr (n+off) l
1476+ chunk !n !l = text arr (n+off) l
1357{-# INLINE breakOnAll #-}
1477{-# INLINE breakOnAll #-}
1359-------------------------------------------------------------------------------
1479-------------------------------------------------------------------------------
@@ -1420,7 +1540,7 @@ countChar c t = S.countChar c (stream t)
1420-- equivalent to a pair of 'unpack' operations.
1540-- equivalent to a pair of 'unpack' operations.
1421zip :: Text -> Text -> [(Char,Char)]
1541zip :: Text -> Text -> [(Char,Char)]
1422zip a b = S.unstreamList $ S.zipWith (,) (stream a) (stream b)
1542zip a b = S.unstreamList $ S.zipWith (,) (stream a) (stream b)
1423−{-# INLINE [0] zip #-}
1543+{-# INLINE zip #-}
1425-- | /O(n)/ 'zipWith' generalises 'zip' by zipping with the function
1545-- | /O(n)/ 'zipWith' generalises 'zip' by zipping with the function
1426-- given as the first argument, instead of a tupling function.
1546-- given as the first argument, instead of a tupling function.
@@ -1428,7 +1548,7 @@ zip a b = S.unstreamList $ S.zipWith (,) (stream a) (stream b)
1428zipWith :: (Char -> Char -> Char) -> Text -> Text -> Text
1548zipWith :: (Char -> Char -> Char) -> Text -> Text -> Text
1429zipWith f t1 t2 = unstream (S.zipWith g (stream t1) (stream t2))
1549zipWith f t1 t2 = unstream (S.zipWith g (stream t1) (stream t2))
1430 where g a b = safe (f a b)
1550 where g a b = safe (f a b)
1431−{-# INLINE [0] zipWith #-}
1551+{-# INLINE zipWith #-}
1433-- | /O(n)/ Breaks a 'Text' up into a list of words, delimited by 'Char's
1553-- | /O(n)/ Breaks a 'Text' up into a list of words, delimited by 'Char's
1434-- representing white space.
1554-- representing white space.
@@ -1553,7 +1673,7 @@ isInfixOf needle haystack
1553-- > fnordLength _ = -1
1673-- > fnordLength _ = -1
1554stripPrefix :: Text -> Text -> Maybe Text
1674stripPrefix :: Text -> Text -> Maybe Text
1555stripPrefix p@(Text _arr _off plen) t@(Text arr off len)
1675stripPrefix p@(Text _arr _off plen) t@(Text arr off len)
1556− | p `isPrefixOf` t = Just $! textP arr (off+plen) (len-plen)
1676+ | p `isPrefixOf` t = Just $! text arr (off+plen) (len-plen)
1557 | otherwise = Nothing
1677 | otherwise = Nothing
1559-- | /O(n)/ Find the longest non-empty common prefix of two strings
1679-- | /O(n)/ Find the longest non-empty common prefix of two strings
@@ -1573,8 +1693,8 @@ commonPrefixes t0@(Text arr0 off0 len0) t1@(Text arr1 off1 len1) = go 0 0
1574 go !i !j | i < len0 && j < len1 && a == b = go (i+d0) (j+d1)
1694 go !i !j | i < len0 && j < len1 && a == b = go (i+d0) (j+d1)
1575 | i > 0 = Just (Text arr0 off0 i,
1695 | i > 0 = Just (Text arr0 off0 i,
1576− textP arr0 (off0+i) (len0-i),
1696+ text arr0 (off0+i) (len0-i),
1577− textP arr1 (off1+j) (len1-j))
1697+ text arr1 (off1+j) (len1-j))
1578 | otherwise = Nothing
1698 | otherwise = Nothing
1579 where Iter a d0 = iter t0 i
1699 where Iter a d0 = iter t0 i
1580 Iter b d1 = iter t1 j
1700 Iter b d1 = iter t1 j
@@ -1599,7 +1719,7 @@ commonPrefixes t0@(Text arr0 off0 len0) t1@(Text arr1 off1 len1) = go 0 0
1599-- > quuxLength _ = -1
1719-- > quuxLength _ = -1
1600stripSuffix :: Text -> Text -> Maybe Text
1720stripSuffix :: Text -> Text -> Maybe Text
1601stripSuffix p@(Text _arr _off plen) t@(Text arr off len)
1721stripSuffix p@(Text _arr _off plen) t@(Text arr off len)
1602− | p `isSuffixOf` t = Just $! textP arr off (len-plen)
1722+ | p `isSuffixOf` t = Just $! text arr off (len-plen)
1603 | otherwise = Nothing
1723 | otherwise = Nothing
1605-- | Add a list of non-negative numbers. Errors out on overflow.
1725-- | Add a list of non-negative numbers. Errors out on overflow.
@@ -1628,6 +1748,7 @@ overflowError fun = P.error $ "Data.Text." ++ fun ++ ": size overflow"
1628copy :: Text -> Text
1748copy :: Text -> Text
1629copy (Text arr off len) = Text (A.run go) 0 len
1749copy (Text arr off len) = Text (A.run go) 0 len
1751+ go :: ST s (A.MArray s)
1632 marr <- A.new len
1753 marr <- A.new len
1633 A.copyI marr 0 arr off len
1754 A.copyI marr 0 arr off len