on master help sign in
Oops! I accidentally released 0.10.0.1 with backwards-incompatible API changes

This change reapplies the reserved surrogate code space bug fix to 0.10.0.0, and bumps the version to 0.10.0.2.

commitb00c8a593a67927bceab426e353f308a22c3ca35 authorBryan O'Sullivan <bos@serpentine.com> dateThu 2 Dec 2010, 21:00 (16 years ago) parentd904602
4 files changed+282−109
Data/Text.hs+101−37 Data/Text/Internal.hs+24 Data/Text/Lazy.hs+147−67 text.cabal+10−5
Data/Text.hs+101−37
@@ -13,20 +13,31 @@
1313-- Stability : experimental
1414-- Portability : GHC
1515--
16−-- A time and space-efficient implementation of Unicode text using
17−-- packed Word16 arrays. Suitable for performance critical use, both
18−-- in terms of large data quantities and high speed.
16+-- A time and space-efficient implementation of Unicode text.
17+-- Suitable for performance critical use, both in terms of large data
18+-- quantities and high speed.
19+--
20+-- /Note/: Read below the synopsis for important notes on the use of
21+-- this module.
1922--
2023-- This module is intended to be imported @qualified@, to avoid name
2124-- clashes with "Prelude" functions, e.g.
2225--
2326-- > import qualified Data.Text as T
27+--
28+-- To use an extended and very rich family of functions for working
29+-- with Unicode text (including normalization, regular expressions,
30+-- non-standard encodings, text breaking, and locales), see the
31+-- @text-icu@ package: <http://hackage.haskell.org/package/text-icu>
2432
2533module Data.Text
2634 (
2735 -- * Strict vs lazy types
2836 -- $strict
2937
38+ -- * Acceptable data
39+ -- $replacement
40+
3041 -- * Fusion
3142 -- $fusion
3243
@@ -196,7 +207,7 @@ import Data.String (IsString(..))
196207import qualified Data.Text.Fusion as S
197208import qualified Data.Text.Fusion.Common as S
198209import Data.Text.Fusion (stream, reverseStream, unstream)
199−import Data.Text.Internal (Text(..), empty, text, textP)
210+import Data.Text.Internal (Text(..), empty, firstf, safe, text, textP)
200211import qualified Prelude as P
201212import Data.Text.Unsafe (Iter(..), iter, iter_, lengthWord16, reverseIter,
202213 unsafeHead, unsafeTail)
@@ -230,6 +241,33 @@ import Data.Int (Int64)
230241-- difference being that the strict module uses 'Int' values for
231242-- lengths and counts, while the lazy module uses 'Int64' lengths.
232243
244+-- $replacement
245+--
246+-- A 'Text' value is a sequence of Unicode scalar values, as defined
247+-- in &#xa7;3.9, definition D76 of the Unicode 5.2 standard:
248+-- <http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf#page=35>. As
249+-- such, a 'Text' cannot contain values in the range U+D800 to U+DFFF
250+-- inclusive. Haskell implementations admit all Unicode code points
251+-- (&#xa7;3.4, definition D10) as 'Char' values, including code points
252+-- from this invalid range. This means that there are some 'Char'
253+-- values that are not valid Unicode scalar values, and the functions
254+-- in this module must handle those cases.
255+--
256+-- Within this module, many functions construct a 'Text' from one or
257+-- more 'Char' values. Those functions will substitute 'Char' values
258+-- that are not valid Unicode scalar values with the replacement
259+-- character \"&#xfffd;\" (U+FFFD). Functions that perform this
260+-- inspection and replacement are documented with the phrase
261+-- \"Performs replacement on invalid scalar values\".
262+--
263+-- (One reason for this policy of replacement is that internally, a
264+-- 'Text' value is represented as packed UTF-16 data. Values in the
265+-- range U+D800 through U+DFFF are used by UTF-16 to denote surrogate
266+-- code points, and so cannot be represented. The functions replace
267+-- invalid scalar values, instead of dropping them, as a security
268+-- measure. For details, see Unicode Technical Report 36, &#xa7;3.5:
269+-- <http://unicode.org/reports/tr36/#Deletion_of_Noncharacters>)
270+
233271-- $fusion
234272--
235273-- Most of the functions in this module are subject to /fusion/,
@@ -240,6 +278,7 @@ import Data.Int (Int64)
240278--
241279-- > import Data.Text as T
242280-- > import Data.Text.Encoding as E
281+-- > import Data.ByteString (ByteString)
243282-- >
244283-- > countChars :: ByteString -> Int
245284-- > countChars = T.length . T.toUpper . E.decodeUtf8
@@ -251,7 +290,7 @@ import Data.Int (Int64)
251290-- function will be compiled down to a single loop over the source
252291-- 'ByteString'.
253292--
254−-- Functions that can be fused by the compiler are marked with the
293+-- Functions that can be fused by the compiler are documented with the
255294-- phrase \"Subject to fusion\".
256295
257296instance Eq Text where
@@ -320,9 +359,10 @@ compareText ta@(Text _arrA _offA lenA) tb@(Text _arrB _offB lenB)
320359-- -----------------------------------------------------------------------------
321360-- * Conversion to/from 'Text'
322361
323−-- | /O(n)/ Convert a 'String' into a 'Text'. Subject to fusion.
362+-- | /O(n)/ Convert a 'String' into a 'Text'. Subject to
363+-- fusion. Performs replacement on invalid scalar values.
324364pack :: String -> Text
325−pack = unstream . S.streamList
365+pack = unstream . S.streamList . L.map safe
326366{-# INLINE [1] pack #-}
327367
328368-- | /O(n)/ Convert a Text into a String. Subject to fusion.
@@ -330,10 +370,10 @@ unpack :: Text -> String
330370unpack = S.unstreamList . stream
331371{-# INLINE [1] unpack #-}
332372
333−-- | /O(1)/ Convert a character into a Text.
334−-- Subject to fusion.
373+-- | /O(1)/ Convert a character into a Text. Subject to fusion.
374+-- Performs replacement on invalid scalar values.
335375singleton :: Char -> Text
336−singleton = unstream . S.singleton
376+singleton = unstream . S.singleton . safe
337377{-# INLINE [1] singleton #-}
338378
339379-- -----------------------------------------------------------------------------
@@ -341,15 +381,17 @@ singleton = unstream . S.singleton
341381
342382-- | /O(n)/ Adds a character to the front of a 'Text'. This function
343383-- is more costly than its 'List' counterpart because it requires
344−-- copying a new array. Subject to fusion.
384+-- copying a new array. Subject to fusion. Performs replacement on
385+-- invalid scalar values.
345386cons :: Char -> Text -> Text
346−cons c t = unstream (S.cons c (stream t))
387+cons c t = unstream (S.cons (safe c) (stream t))
347388{-# INLINE cons #-}
348389
349390-- | /O(n)/ Adds a character to the end of a 'Text'. This copies the
350391-- entire array in the process, unless fused. Subject to fusion.
392+-- Performs replacement on invalid scalar values.
351393snoc :: Text -> Char -> Text
352−snoc t c = unstream (S.snoc (stream t) c)
394+snoc t c = unstream (S.snoc (stream t) (safe c))
353395{-# INLINE snoc #-}
354396
355397-- | /O(n)/ Appends one 'Text' to the other by copying both of them
@@ -523,9 +565,10 @@ compareLength t n = S.compareLengthI (stream t) n
523565-- -----------------------------------------------------------------------------
524566-- * Transformations
525567-- | /O(n)/ 'map' @f@ @t@ is the 'Text' obtained by applying @f@ to
526−-- each element of @t@. Subject to fusion.
568+-- each element of @t@. Subject to fusion. Performs replacement on
569+-- invalid scalar values.
527570map :: (Char -> Char) -> Text -> Text
528−map f t = unstream (S.map f (stream t))
571+map f t = unstream (S.map (safe . f) (stream t))
529572{-# INLINE [1] map #-}
530573
531574-- | /O(n)/ The 'intercalate' function takes a 'Text' and a list of
@@ -536,9 +579,10 @@ intercalate t = concat . (U.intersperse t)
536579{-# INLINE intercalate #-}
537580
538581-- | /O(n)/ The 'intersperse' function takes a character and places it
539−-- between the characters of a 'Text'. Subject to fusion.
582+-- between the characters of a 'Text'. Subject to fusion. Performs
583+-- replacement on invalid scalar values.
540584intersperse :: Char -> Text -> Text
541−intersperse c t = unstream (S.intersperse c (stream t))
585+intersperse c t = unstream (S.intersperse (safe c) (stream t))
542586{-# INLINE intersperse #-}
543587
544588-- | /O(n)/ Reverse the characters of a string. Subject to fusion.
@@ -614,7 +658,10 @@ toUpper t = unstream (S.toUpper (stream t))
614658{-# INLINE toUpper #-}
615659
616660-- | /O(n)/ Left-justify a string to the given length, using the
617−-- specified fill character on the right. Subject to fusion. Examples:
661+-- specified fill character on the right. Subject to fusion.
662+-- Performs replacement on invalid scalar values.
663+--
664+-- Examples:
618665--
619666-- > justifyLeft 7 'x' "foo" == "fooxxxx"
620667-- > justifyLeft 3 'x' "foobar" == "foobar"
@@ -633,7 +680,10 @@ justifyLeft k c t
633680 #-}
634681
635682-- | /O(n)/ Right-justify a string to the given length, using the
636−-- specified fill character on the left. Examples:
683+-- specified fill character on the left. Performs replacement on
684+-- invalid scalar values.
685+--
686+-- Examples:
637687--
638688-- > justifyRight 7 'x' "bar" == "xxxxbar"
639689-- > justifyRight 3 'x' "foobar" == "foobar"
@@ -644,8 +694,11 @@ justifyRight k c t
644694 where len = length t
645695{-# INLINE justifyRight #-}
646696
647−-- | /O(n)/ Center a string to the given length, using the
648−-- specified fill character on either side. Examples:
697+-- | /O(n)/ Center a string to the given length, using the specified
698+-- fill character on either side. Performs replacement on invalid
699+-- scalar values.
700+--
701+-- Examples:
649702--
650703-- > center 8 'x' "HS" = "xxxHSxxx"
651704center :: Int -> Char -> Text -> Text
@@ -760,6 +813,7 @@ minimum t = S.minimum (stream t)
760813
761814-- | /O(n)/ 'scanl' is similar to 'foldl', but returns a list of
762815-- successive reduced values from the left. Subject to fusion.
816+-- Performs replacement on invalid scalar values.
763817--
764818-- > scanl f z [x1, x2, ...] == [z, z `f` x1, (z `f` x1) `f` x2, ...]
765819--
@@ -767,11 +821,13 @@ minimum t = S.minimum (stream t)
767821--
768822-- > last (scanl f z xs) == foldl f z xs.
769823scanl :: (Char -> Char -> Char) -> Char -> Text -> Text
770−scanl f z t = unstream (S.scanl f z (stream t))
824+scanl f z t = unstream (S.scanl g z (stream t))
825+ where g a b = safe (f a b)
771826{-# INLINE scanl #-}
772827
773828-- | /O(n)/ 'scanl1' is a variant of 'scanl' that has no starting
774−-- value argument. Subject to fusion.
829+-- value argument. Subject to fusion. Performs replacement on
830+-- invalid scalar values.
775831--
776832-- > scanl1 f [x1, x2, ...] == [x1, x1 `f` x2, ...]
777833scanl1 :: (Char -> Char -> Char) -> Text -> Text
@@ -779,15 +835,18 @@ scanl1 f t | null t = empty
779835 | otherwise = scanl f (unsafeHead t) (unsafeTail t)
780836{-# INLINE scanl1 #-}
781837
782−-- | /O(n)/ 'scanr' is the right-to-left dual of 'scanl'.
838+-- | /O(n)/ 'scanr' is the right-to-left dual of 'scanl'. Performs
839+-- replacement on invalid scalar values.
783840--
784841-- > scanr f v == reverse . scanl (flip f) v . reverse
785842scanr :: (Char -> Char -> Char) -> Char -> Text -> Text
786−scanr f z = S.reverse . S.reverseScanr f z . reverseStream
843+scanr f z = S.reverse . S.reverseScanr g z . reverseStream
844+ where g a b = safe (f a b)
787845{-# INLINE scanr #-}
788846
789847-- | /O(n)/ 'scanr1' is a variant of 'scanr' that has no starting
790−-- value argument. Subject to fusion.
848+-- value argument. Subject to fusion. Performs replacement on
849+-- invalid scalar values.
791850scanr1 :: (Char -> Char -> Char) -> Text -> Text
792851scanr1 f t | null t = empty
793852 | otherwise = scanr f (last t) (init t)
@@ -795,9 +854,11 @@ scanr1 f t | null t = empty
795854
796855-- | /O(n)/ Like a combination of 'map' and 'foldl''. Applies a
797856-- function to each element of a 'Text', passing an accumulating
798−-- parameter from left to right, and returns a final 'Text'.
857+-- parameter from left to right, and returns a final 'Text'. Performs
858+-- replacement on invalid scalar values.
799859mapAccumL :: (a -> Char -> (a,Char)) -> a -> Text -> (a, Text)
800−mapAccumL f z0 = S.mapAccumL f z0 . stream
860+mapAccumL f z0 = S.mapAccumL g z0 . stream
861+ where g a b = second safe (f a b)
801862{-# INLINE mapAccumL #-}
802863
803864-- | The 'mapAccumR' function behaves like a combination of 'map' and
@@ -805,8 +866,10 @@ mapAccumL f z0 = S.mapAccumL f z0 . stream
805866-- 'Text', passing an accumulating parameter from right to left, and
806867-- returning a final value of this accumulator together with the new
807868-- 'Text'.
869+-- Performs replacement on invalid scalar values.
808870mapAccumR :: (a -> Char -> (a,Char)) -> a -> Text -> (a, Text)
809−mapAccumR f z0 = second reverse . S.mapAccumL f z0 . reverseStream
871+mapAccumR f z0 = second reverse . S.mapAccumL g z0 . reverseStream
872+ where g a b = second safe (f a b)
810873{-# INLINE mapAccumR #-}
811874
812875-- -----------------------------------------------------------------------------
@@ -839,7 +902,7 @@ replicate n t@(Text a o l)
839902-- | /O(n)/ 'replicateChar' @n@ @c@ is a 'Text' of length @n@ with @c@ the
840903-- value of every element. Subject to fusion.
841904replicateChar :: Int -> Char -> Text
842−replicateChar n c = unstream (S.replicateCharI n c)
905+replicateChar n c = unstream (S.replicateCharI n (safe c))
843906{-# INLINE replicateChar #-}
844907
845908-- | /O(n)/, where @n@ is the length of the result. The 'unfoldr'
@@ -848,9 +911,9 @@ replicateChar n c = unstream (S.replicateCharI n c)
848911-- returns 'Nothing' if it is done producing the 'Text', otherwise
849912-- 'Just' @(a,b)@. In this case, @a@ is the next 'Char' in the
850913-- string, and @b@ is the seed value for further production. Subject
851−-- to fusion.
914+-- to fusion. Performs replacement on invalid scalar values.
852915unfoldr :: (a -> Maybe (Char,a)) -> a -> Text
853−unfoldr f s = unstream (S.unfoldr f s)
916+unfoldr f s = unstream (S.unfoldr (firstf safe . f) s)
854917{-# INLINE unfoldr #-}
855918
856919-- | /O(n)/ Like 'unfoldr', 'unfoldrN' builds a 'Text' from a seed
@@ -858,9 +921,9 @@ unfoldr f s = unstream (S.unfoldr f s)
858921-- first argument to 'unfoldrN'. This function is more efficient than
859922-- 'unfoldr' when the maximum length of the result is known and
860923-- correct, otherwise its performance is similar to 'unfoldr'. Subject
861−-- to fusion.
924+-- to fusion. Performs replacement on invalid scalar values.
862925unfoldrN :: Int -> (a -> Maybe (Char,a)) -> a -> Text
863−unfoldrN n f s = unstream (S.unfoldrN n f s)
926+unfoldrN n f s = unstream (S.unfoldrN n (firstf safe . f) s)
864927{-# INLINE unfoldrN #-}
865928
866929-- -----------------------------------------------------------------------------
@@ -1297,8 +1360,10 @@ zip a b = S.unstreamList $ S.zipWith (,) (stream a) (stream b)
12971360
12981361-- | /O(n)/ 'zipWith' generalises 'zip' by zipping with the function
12991362-- given as the first argument, instead of a tupling function.
1363+-- Performs replacement on invalid scalar values.
13001364zipWith :: (Char -> Char -> Char) -> Text -> Text -> Text
1301−zipWith f t1 t2 = unstream (S.zipWith f (stream t1) (stream t2))
1365+zipWith f t1 t2 = unstream (S.zipWith g (stream t1) (stream t2))
1366+ where g a b = safe (f a b)
13021367{-# INLINE [0] zipWith #-}
13031368
13041369-- | /O(n)/ Breaks a 'Text' up into a list of words, delimited by 'Char's
@@ -1362,8 +1427,7 @@ unwords = intercalate (singleton ' ')
13621427{-# INLINE unwords #-}
13631428
13641429-- | /O(n)/ The 'isPrefixOf' function takes two 'Text's and returns
1365−-- 'True' iff the first is a prefix of the second. This function is
1366−-- subject to fusion.
1430+-- 'True' iff the first is a prefix of the second. Subject to fusion.
13671431isPrefixOf :: Text -> Text -> Bool
13681432isPrefixOf a@(Text _ _ alen) b@(Text _ _ blen) =
13691433 alen <= blen && S.isPrefixOf (stream a) (stream b)
Data/Text/Internal.hs+24
@@ -22,8 +22,12 @@ module Data.Text.Internal
2222 -- * Construction
2323 , text
2424 , textP
25+ -- * Safety
26+ , safe
2527 -- * Code that must be here for accessibility
2628 , empty
29+ -- * Utilities
30+ , firstf
2731 -- * Debugging
2832 , showText
2933 ) where
@@ -31,7 +35,9 @@ module Data.Text.Internal
3135#if defined(ASSERTS)
3236import Control.Exception (assert)
3337#endif
38+import Data.Bits ((.&.))
3439import qualified Data.Text.Array as A
40+import Data.Text.UnsafeChar (ord)
3541import Data.Typeable (Typeable)
3642
3743-- | A space efficient, packed, unboxed Unicode text type.
@@ -72,3 +78,21 @@ showText :: Text -> String
7278showText (Text arr off len) =
7379 "Text " ++ show (A.toList arr off len) ++ ' ' :
7480 show off ++ ' ' : show len
81+
82+-- | Map a 'Char' to a 'Text'-safe value.
83+--
84+-- UTF-16 surrogate code points are not included in the set of Unicode
85+-- scalar values, but are unfortunately admitted as valid 'Char'
86+-- values by Haskell. They cannot be represented in a 'Text'. This
87+-- function remaps those code points to the Unicode replacement
88+-- character \"&#xfffd;\", and leaves other code points unchanged.
89+safe :: Char -> Char
90+safe c
91+ | ord c .&. 0x1ff800 /= 0xd800 = c
92+ | otherwise = '\xfffd'
93+{-# INLINE safe #-}
94+
95+-- | Apply a function to the first element of an optional pair.
96+firstf :: (a -> c) -> Maybe (a,b) -> Maybe (c,b)
97+firstf f (Just (a, b)) = Just (f a, b)
98+firstf _ Nothing = Nothing
Data/Text/Lazy.hs+147−67
@@ -11,18 +11,23 @@
1111-- Portability : GHC
1212--
1313-- A time and space-efficient implementation of Unicode text using
14−-- lists of packed arrays. This representation is suitable for high
14+-- lists of packed arrays.
15+--
16+-- /Note/: Read below the synopsis for important notes on the use of
17+-- this module.
18+--
19+-- The representation used by this module is suitable for high
1520-- performance use and for streaming large quantities of data. It
1621-- provides a means to manipulate a large body of text without
1722-- requiring that the entire content be resident in memory.
1823--
1924-- Some operations, such as 'concat', 'append', 'reverse' and 'cons',
20−-- have better complexity than their "Data.Text" equivalents, due to
21−-- optimisations resulting from the list spine structure. And for
22−-- other operations lazy 'Text's are usually within a few percent of
23−-- strict ones, but with better heap usage. For data larger than
24−-- available memory, or if you have tight memory constraints, this
25−-- module will be the only option.
25+-- have better time complexity than their "Data.Text" equivalents, due
26+-- to the underlying representation being a list of chunks. For other
27+-- operations, lazy 'Text's are usually within a few percent of strict
28+-- ones, but often with better heap usage if used in a streaming
29+-- fashion. For data larger than available memory, or if you have
30+-- tight memory constraints, this module will be the only option.
2631--
2732-- This module is intended to be imported @qualified@, to avoid name
2833-- clashes with "Prelude" functions. eg.
@@ -31,7 +36,15 @@
3136
3237module Data.Text.Lazy
3338 (
39+ -- * Fusion
40+ -- $fusion
41+
42+ -- * Acceptable data
43+ -- $replacement
44+
45+ -- * Types
3446 Text
47+
3548 -- * Creation and elimination
3649 , pack
3750 , unpack
@@ -200,10 +213,62 @@ import qualified Data.Text.Lazy.Fusion as S
200213import Data.Text.Fusion.Internal (PairS(..))
201214import Data.Text.Lazy.Fusion (stream, unstream)
202215import Data.Text.Lazy.Internal (Text(..), chunk, empty, foldlChunks, foldrChunks)
203−import Data.Text.Internal (textP)
216+import Data.Text.Internal (firstf, safe, textP)
204217import qualified Data.Text.Util as U
205218import Data.Text.Lazy.Search (indices)
206219
220+-- $fusion
221+--
222+-- Most of the functions in this module are subject to /fusion/,
223+-- meaning that a pipeline of such functions will usually allocate at
224+-- most one 'Text' value.
225+--
226+-- As an example, consider the following pipeline:
227+--
228+-- > import Data.Text.Lazy as T
229+-- > import Data.Text.Lazy.Encoding as E
230+-- > import Data.ByteString.Lazy (ByteString)
231+-- >
232+-- > countChars :: ByteString -> Int
233+-- > countChars = T.length . T.toUpper . E.decodeUtf8
234+--
235+-- From the type signatures involved, this looks like it should
236+-- allocate one 'ByteString' value, and two 'Text' values. However,
237+-- when a module is compiled with optimisation enabled under GHC, the
238+-- two intermediate 'Text' values will be optimised away, and the
239+-- function will be compiled down to a single loop over the source
240+-- 'ByteString'.
241+--
242+-- Functions that can be fused by the compiler are documented with the
243+-- phrase \"Subject to fusion\".
244+
245+-- $replacement
246+--
247+-- A 'Text' value is a sequence of Unicode scalar values, as defined
248+-- in &#xa7;3.9, definition D76 of the Unicode 5.2 standard:
249+-- <http://www.unicode.org/versions/Unicode5.2.0/ch03.pdf#page=35>. As
250+-- such, a 'Text' cannot contain values in the range U+D800 to U+DFFF
251+-- inclusive. Haskell implementations admit all Unicode code points
252+-- (&#xa7;3.4, definition D10) as 'Char' values, including code points
253+-- from this invalid range. This means that there are some 'Char'
254+-- values that are not valid Unicode scalar values, and the functions
255+-- in this module must handle those cases.
256+--
257+-- Within this module, many functions construct a 'Text' from one or
258+-- more 'Char' values. Those functions will substitute 'Char' values
259+-- that are not valid Unicode scalar values with the replacement
260+-- character \"&#xfffd;\" (U+FFFD). Functions that perform this
261+-- inspection and replacement are documented with the phrase
262+-- \"Performs replacement on invalid scalar values\".
263+--
264+-- (One reason for this policy of replacement is that internally, a
265+-- 'Text' value is represented as packed UTF-16 data. Values in the
266+-- range U+D800 through U+DFFF are used by UTF-16 to denote surrogate
267+-- code points, and so cannot be represented. The functions replace
268+-- invalid scalar values, instead of dropping them, as a security
269+-- measure. For details, see Unicode Technical Report 36, &#xa7;3.5:
270+-- <http://unicode.org/reports/tr36#Deletion_of_Noncharacters>)
271+
207272equal :: Text -> Text -> Bool
208273equal Empty Empty = True
209274equal Empty _ = False
@@ -274,19 +339,19 @@ instance Data Text where
274339
275340-- | /O(n)/ Convert a 'String' into a 'Text'.
276341--
277−-- This function is subject to array fusion.
342+-- Subject to fusion. Performs replacement on invalid scalar values.
278343pack :: String -> Text
279−pack s = unstream (S.streamList s)
344+pack = unstream . S.streamList . L.map safe
280345{-# INLINE [1] pack #-}
281346
282347-- | /O(n)/ Convert a 'Text' into a 'String'.
283−-- Subject to array fusion.
348+-- Subject to fusion.
284349unpack :: Text -> String
285350unpack t = S.unstreamList (stream t)
286351{-# INLINE [1] unpack #-}
287352
288−-- | /O(1)/ Convert a character into a Text.
289−-- Subject to fusion.
353+-- | /O(1)/ Convert a character into a Text. Subject to fusion.
354+-- Performs replacement on invalid scalar values.
290355singleton :: Char -> Text
291356singleton c = Chunk (T.singleton c) Empty
292357{-# INLINE [1] singleton #-}
@@ -346,8 +411,7 @@ snoc t c = foldrChunks Chunk (singleton c) t
346411 unstream (S.snoc (stream t) c) = snoc t c
347412 #-}
348413
349−-- | /O(n\/c)/ Appends one 'Text' to another. Subject to array
350−-- fusion.
414+-- | /O(n\/c)/ Appends one 'Text' to another. Subject to fusion.
351415append :: Text -> Text -> Text
352416append xs ys = foldrChunks Chunk ys xs
353417{-# INLINE [1] append #-}
@@ -360,7 +424,7 @@ append xs ys = foldrChunks Chunk ys xs
360424 #-}
361425
362426-- | /O(1)/ Returns the first character and rest of a 'Text', or
363−-- 'Nothing' if empty. Subject to array fusion.
427+-- 'Nothing' if empty. Subject to fusion.
364428uncons :: Text -> Maybe (Char, Text)
365429uncons Empty = Nothing
366430uncons (Chunk t ts) = Just (T.unsafeHead t, ts')
@@ -369,13 +433,13 @@ uncons (Chunk t ts) = Just (T.unsafeHead t, ts')
369433{-# INLINE uncons #-}
370434
371435-- | /O(1)/ Returns the first character of a 'Text', which must be
372−-- non-empty. Subject to array fusion.
436+-- non-empty. Subject to fusion.
373437head :: Text -> Char
374438head t = S.head (stream t)
375439{-# INLINE head #-}
376440
377441-- | /O(1)/ Returns all characters after the head of a 'Text', which
378−-- must be non-empty. Subject to array fusion.
442+-- must be non-empty. Subject to fusion.
379443tail :: Text -> Text
380444tail (Chunk t ts) = chunk (T.tail t) ts
381445tail Empty = emptyError "tail"
@@ -389,7 +453,7 @@ tail Empty = emptyError "tail"
389453 #-}
390454
391455-- | /O(1)/ Returns all but the last character of a 'Text', which must
392−-- be non-empty. Subject to array fusion.
456+-- be non-empty. Subject to fusion.
393457init :: Text -> Text
394458init (Chunk t0 ts0) = go t0 ts0
395459 where go t (Chunk t' ts) = Chunk t (go t' ts)
@@ -404,7 +468,7 @@ init Empty = emptyError "init"
404468 unstream (S.init (stream t)) = init t
405469 #-}
406470
407−-- | /O(1)/ Tests whether a 'Text' is empty or not. Subject to array
471+-- | /O(1)/ Tests whether a 'Text' is empty or not. Subject to
408472-- fusion.
409473null :: Text -> Bool
410474null Empty = True
@@ -425,7 +489,7 @@ isSingleton = S.isSingleton . stream
425489{-# INLINE isSingleton #-}
426490
427491-- | /O(1)/ Returns the last character of a 'Text', which must be
428−-- non-empty. Subject to array fusion.
492+-- non-empty. Subject to fusion.
429493last :: Text -> Char
430494last Empty = emptyError "last"
431495last (Chunk t ts) = go t ts
@@ -469,9 +533,10 @@ compareLength t n = S.compareLengthI (stream t) n
469533-- properties of code.
470534
471535-- | /O(n)/ 'map' @f@ @t@ is the 'Text' obtained by applying @f@ to
472−-- each element of @t@. Subject to array fusion.
536+-- each element of @t@. Subject to fusion. Performs replacement on
537+-- invalid scalar values.
473538map :: (Char -> Char) -> Text -> Text
474−map f t = unstream (S.map f (stream t))
539+map f t = unstream (S.map (safe . f) (stream t))
475540{-# INLINE [1] map #-}
476541
477542-- | /O(n)/ The 'intercalate' function takes a 'Text' and a list of
@@ -482,13 +547,17 @@ intercalate t = concat . (U.intersperse t)
482547{-# INLINE intercalate #-}
483548
484549-- | /O(n)/ The 'intersperse' function takes a character and places it
485−-- between the characters of a 'Text'. Subject to array fusion.
486−intersperse :: Char -> Text -> Text
487−intersperse c t = unstream (S.intersperse c (stream t))
550+-- between the characters of a 'Text'. Subject to fusion. Performs
551+-- replacement on invalid scalar values.
552+intersperse :: Char -> Text -> Text
553+intersperse c t = unstream (S.intersperse (safe c) (stream t))
488554{-# INLINE intersperse #-}
489555
490556-- | /O(n)/ Left-justify a string to the given length, using the
491−-- specified fill character on the right. Subject to fusion. Examples:
557+-- specified fill character on the right. Subject to fusion. Performs
558+-- replacement on invalid scalar values.
559+--
560+-- Examples:
492561--
493562-- > justifyLeft 7 'x' "foo" == "fooxxxx"
494563-- > justifyLeft 3 'x' "foobar" == "foobar"
@@ -507,7 +576,10 @@ justifyLeft k c t
507576 #-}
508577
509578-- | /O(n)/ Right-justify a string to the given length, using the
510−-- specified fill character on the left. Examples:
579+-- specified fill character on the left. Performs replacement on
580+-- invalid scalar values.
581+--
582+-- Examples:
511583--
512584-- > justifyRight 7 'x' "bar" == "xxxxbar"
513585-- > justifyRight 3 'x' "foobar" == "foobar"
@@ -518,8 +590,11 @@ justifyRight k c t
518590 where len = length t
519591{-# INLINE justifyRight #-}
520592
521−-- | /O(n)/ Center a string to the given length, using the
522−-- specified fill character on either side. Examples:
593+-- | /O(n)/ Center a string to the given length, using the specified
594+-- fill character on either side. Performs replacement on invalid
595+-- scalar values.
596+--
597+-- Examples:
523598--
524599-- > center 8 'x' "HS" = "xxxHSxxx"
525600center :: Int64 -> Char -> Text -> Text
@@ -608,26 +683,24 @@ toUpper t = unstream (S.toUpper (stream t))
608683-- | /O(n)/ 'foldl', applied to a binary operator, a starting value
609684-- (typically the left-identity of the operator), and a 'Text',
610685-- reduces the 'Text' using the binary operator, from left to right.
611−-- Subject to array fusion.
686+-- Subject to fusion.
612687foldl :: (a -> Char -> a) -> a -> Text -> a
613688foldl f z t = S.foldl f z (stream t)
614689{-# INLINE foldl #-}
615690
616691-- | /O(n)/ A strict version of 'foldl'.
617−-- Subject to array fusion.
692+-- Subject to fusion.
618693foldl' :: (a -> Char -> a) -> a -> Text -> a
619694foldl' f z t = S.foldl' f z (stream t)
620695{-# INLINE foldl' #-}
621696
622697-- | /O(n)/ A variant of 'foldl' that has no starting value argument,
623−-- and thus must be applied to a non-empty 'Text'. Subject to array
624−-- fusion.
698+-- and thus must be applied to a non-empty 'Text'. Subject to fusion.
625699foldl1 :: (Char -> Char -> Char) -> Text -> Char
626700foldl1 f t = S.foldl1 f (stream t)
627701{-# INLINE foldl1 #-}
628702
629−-- | /O(n)/ A strict version of 'foldl1'.
630−-- Subject to array fusion.
703+-- | /O(n)/ A strict version of 'foldl1'. Subject to fusion.
631704foldl1' :: (Char -> Char -> Char) -> Text -> Char
632705foldl1' f t = S.foldl1' f (stream t)
633706{-# INLINE foldl1' #-}
@@ -635,13 +708,13 @@ foldl1' f t = S.foldl1' f (stream t)
635708-- | /O(n)/ 'foldr', applied to a binary operator, a starting value
636709-- (typically the right-identity of the operator), and a 'Text',
637710-- reduces the 'Text' using the binary operator, from right to left.
638−-- Subject to array fusion.
711+-- Subject to fusion.
639712foldr :: (Char -> a -> a) -> a -> Text -> a
640713foldr f z t = S.foldr f z (stream t)
641714{-# INLINE foldr #-}
642715
643−-- | /O(n)/ A variant of 'foldr' that has no starting value argument, and
644−-- thust must be applied to a non-empty 'Text'. Subject to array
716+-- | /O(n)/ A variant of 'foldr' that has no starting value argument,
717+-- and thust must be applied to a non-empty 'Text'. Subject to
645718-- fusion.
646719foldr1 :: (Char -> Char -> Char) -> Text -> Char
647720foldr1 f t = S.foldr1 f (stream t)
@@ -664,32 +737,32 @@ concatMap f = concat . foldr ((:) . f) []
664737{-# INLINE concatMap #-}
665738
666739-- | /O(n)/ 'any' @p@ @t@ determines whether any character in the
667−-- 'Text' @t@ satisifes the predicate @p@. Subject to array fusion.
740+-- 'Text' @t@ satisifes the predicate @p@. Subject to fusion.
668741any :: (Char -> Bool) -> Text -> Bool
669742any p t = S.any p (stream t)
670743{-# INLINE any #-}
671744
672745-- | /O(n)/ 'all' @p@ @t@ determines whether all characters in the
673−-- 'Text' @t@ satisify the predicate @p@. Subject to array fusion.
746+-- 'Text' @t@ satisify the predicate @p@. Subject to fusion.
674747all :: (Char -> Bool) -> Text -> Bool
675748all p t = S.all p (stream t)
676749{-# INLINE all #-}
677750
678751-- | /O(n)/ 'maximum' returns the maximum value from a 'Text', which
679−-- must be non-empty. Subject to array fusion.
752+-- must be non-empty. Subject to fusion.
680753maximum :: Text -> Char
681754maximum t = S.maximum (stream t)
682755{-# INLINE maximum #-}
683756
684757-- | /O(n)/ 'minimum' returns the minimum value from a 'Text', which
685−-- must be non-empty. Subject to array fusion.
758+-- must be non-empty. Subject to fusion.
686759minimum :: Text -> Char
687760minimum t = S.minimum (stream t)
688761{-# INLINE minimum #-}
689762
690763-- | /O(n)/ 'scanl' is similar to 'foldl', but returns a list of
691−-- successive reduced values from the left. This function is subject
692−-- to array fusion.
764+-- successive reduced values from the left. Subject to fusion.
765+-- Performs replacement on invalid scalar values.
693766--
694767-- > scanl f z [x1, x2, ...] == [z, z `f` x1, (z `f` x1) `f` x2, ...]
695768--
@@ -697,11 +770,13 @@ minimum t = S.minimum (stream t)
697770--
698771-- > last (scanl f z xs) == foldl f z xs.
699772scanl :: (Char -> Char -> Char) -> Char -> Text -> Text
700−scanl f z t = unstream (S.scanl f z (stream t))
773+scanl f z t = unstream (S.scanl g z (stream t))
774+ where g a b = safe (f a b)
701775{-# INLINE scanl #-}
702776
703777-- | /O(n)/ 'scanl1' is a variant of 'scanl' that has no starting
704−-- value argument. This function is subject to array fusion.
778+-- value argument. Subject to fusion. Performs replacement on
779+-- invalid scalar values.
705780--
706781-- > scanl1 f [x1, x2, ...] == [x1, x1 `f` x2, ...]
707782scanl1 :: (Char -> Char -> Char) -> Text -> Text
@@ -710,21 +785,24 @@ scanl1 f t0 = case uncons t0 of
710785 Just (t,ts) -> scanl f t ts
711786{-# INLINE scanl1 #-}
712787
713−-- | /O(n)/ 'scanr' is the right-to-left dual of 'scanl'.
788+-- | /O(n)/ 'scanr' is the right-to-left dual of 'scanl'. Performs
789+-- replacement on invalid scalar values.
714790--
715791-- > scanr f v == reverse . scanl (flip f) v . reverse
716792scanr :: (Char -> Char -> Char) -> Char -> Text -> Text
717−scanr f v = reverse . scanl (flip f) v . reverse
793+scanr f v = reverse . scanl g v . reverse
794+ where g a b = safe (f b a)
718795
719796-- | /O(n)/ 'scanr1' is a variant of 'scanr' that has no starting
720−-- value argument.
797+-- value argument. Performs replacement on invalid scalar values.
721798scanr1 :: (Char -> Char -> Char) -> Text -> Text
722799scanr1 f t | null t = empty
723800 | otherwise = scanr f (last t) (init t)
724801
725802-- | /O(n)/ Like a combination of 'map' and 'foldl''. Applies a
726803-- function to each element of a 'Text', passing an accumulating
727−-- parameter from left to right, and returns a final 'Text'.
804+-- parameter from left to right, and returns a final 'Text'. Performs
805+-- replacement on invalid scalar values.
728806mapAccumL :: (a -> Char -> (a,Char)) -> a -> Text -> (a, Text)
729807mapAccumL f = go
730808 where
@@ -738,7 +816,7 @@ mapAccumL f = go
738816-- a strict 'foldr'; it applies a function to each element of a
739817-- 'Text', passing an accumulating parameter from right to left, and
740818-- returning a final value of this accumulator together with the new
741−-- 'Text'.
819+-- 'Text'. Performs replacement on invalid scalar values.
742820mapAccumR :: (a -> Char -> (a,Char)) -> a -> Text -> (a, Text)
743821mapAccumR f = go
744822 where
@@ -762,7 +840,7 @@ replicate n t
762840-- | /O(n)/ 'replicateChar' @n@ @c@ is a 'Text' of length @n@ with @c@ the
763841-- value of every element. Subject to fusion.
764842replicateChar :: Int64 -> Char -> Text
765−replicateChar n c = unstream (S.replicateCharI n c)
843+replicateChar n c = unstream (S.replicateCharI n (safe c))
766844{-# INLINE replicateChar #-}
767845
768846{-# RULES
@@ -775,9 +853,10 @@ replicateChar n c = unstream (S.replicateCharI n c)
775853-- 'Text' from a seed value. The function takes the element and
776854-- returns 'Nothing' if it is done producing the 'Text', otherwise
777855-- 'Just' @(a,b)@. In this case, @a@ is the next 'Char' in the
778−-- string, and @b@ is the seed value for further production.
779−unfoldr :: (a -> Maybe (Char,a)) -> a -> Text
780−unfoldr f s = unstream (S.unfoldr f s)
856+-- string, and @b@ is the seed value for further production. Performs
857+-- replacement on invalid scalar values.
858+unfoldr :: (a -> Maybe (Char,a)) -> a -> Text
859+unfoldr f s = unstream (S.unfoldr (firstf safe . f) s)
781860{-# INLINE unfoldr #-}
782861
783862-- | /O(n)/ Like 'unfoldr', 'unfoldrN' builds a 'Text' from a seed
@@ -785,8 +864,9 @@ unfoldr f s = unstream (S.unfoldr f s)
785864-- first argument to 'unfoldrN'. This function is more efficient than
786865-- 'unfoldr' when the maximum length of the result is known and
787866-- correct, otherwise its performance is similar to 'unfoldr'.
788−unfoldrN :: Int64 -> (a -> Maybe (Char,a)) -> a -> Text
789−unfoldrN n f s = unstream (S.unfoldrN n f s)
867+-- Performs replacement on invalid scalar values.
868+unfoldrN :: Int64 -> (a -> Maybe (Char,a)) -> a -> Text
869+unfoldrN n f s = unstream (S.unfoldrN n (firstf safe . f) s)
790870{-# INLINE unfoldrN #-}
791871
792872-- | /O(n)/ 'take' @n@, applied to a 'Text', returns the prefix of the
@@ -847,9 +927,9 @@ dropWords i t0
847927 where len' = fromIntegral len
848928 n' = fromIntegral n
849929
850−-- | /O(n)/ 'takeWhile', applied to a predicate @p@ and a 'Text', returns
851−-- the longest prefix (possibly empty) of elements that satisfy @p@.
852−-- This function is subject to array fusion.
930+-- | /O(n)/ 'takeWhile', applied to a predicate @p@ and a 'Text',
931+-- returns the longest prefix (possibly empty) of elements that
932+-- satisfy @p@. Subject to fusion.
853933takeWhile :: (Char -> Bool) -> Text -> Text
854934takeWhile p t0 = takeWhile' t0
855935 where takeWhile' Empty = Empty
@@ -868,7 +948,7 @@ takeWhile p t0 = takeWhile' t0
868948 #-}
869949
870950-- | /O(n)/ 'dropWhile' @p@ @t@ returns the suffix remaining after
871−-- 'takeWhile' @p@ @t@. This function is subject to array fusion.
951+-- 'takeWhile' @p@ @t@. Subject to fusion.
872952dropWhile :: (Char -> Bool) -> Text -> Text
873953dropWhile p t0 = dropWhile' t0
874954 where dropWhile' Empty = Empty
@@ -1193,8 +1273,7 @@ unwords = intercalate (singleton ' ')
11931273{-# INLINE unwords #-}
11941274
11951275-- | /O(n)/ The 'isPrefixOf' function takes two 'Text's and returns
1196−-- 'True' iff the first is a prefix of the second. This function is
1197−-- subject to fusion.
1276+-- 'True' iff the first is a prefix of the second. Subject to fusion.
11981277isPrefixOf :: Text -> Text -> Bool
11991278isPrefixOf Empty _ = True
12001279isPrefixOf _ Empty = False
@@ -1340,8 +1419,7 @@ count pat src
13401419 #-}
13411420
13421421-- | /O(n)/ The 'countChar' function returns the number of times the
1343−-- query element appears in the given 'Text'. This function is subject
1344−-- to fusion.
1422+-- query element appears in the given 'Text'. Subject to fusion.
13451423countChar :: Char -> Text -> Int64
13461424countChar c t = S.countChar c (stream t)
13471425
@@ -1355,8 +1433,10 @@ zip a b = S.unstreamList $ S.zipWith (,) (stream a) (stream b)
13551433
13561434-- | /O(n)/ 'zipWith' generalises 'zip' by zipping with the function
13571435-- given as the first argument, instead of a tupling function.
1436+-- Performs replacement on invalid scalar values.
13581437zipWith :: (Char -> Char -> Char) -> Text -> Text -> Text
1359−zipWith f t1 t2 = unstream (S.zipWith f (stream t1) (stream t2))
1438+zipWith f t1 t2 = unstream (S.zipWith g (stream t1) (stream t2))
1439+ where g a b = safe (f a b)
13601440{-# INLINE [0] zipWith #-}
13611441
13621442revChunks :: [T.Text] -> Text
text.cabal+10−5
@@ -1,5 +1,5 @@
11name: text
2−version: 0.10.0.0
2+version: 0.10.0.2
33homepage: http://bitbucket.org/bos/text
44bug-reports: http://bitbucket.org/bos/text/issues
55synopsis: An efficient packed Unicode text type.
@@ -15,17 +15,22 @@ description:
1515 .
1616 The 'Text' type provides character-encoding, type-safe case
1717 conversion via whole-string case conversion functions. It also
18− provides a range of functions for converting Text values to and from
19− 'ByteStrings', using several standard encodings (see the 'text-icu'
20− package for a much larger variety of encoding functions).
18+ provides a range of functions for converting 'Text' values to and from
19+ 'ByteStrings', using several standard encodings.
2120 .
2221 Efficient locale-sensitive support for text IO is also supported.
2322 .
24− This module is intended to be imported qualified, to avoid name
23+ These modules are intended to be imported qualified, to avoid name
2524 clashes with Prelude functions, e.g.
2625 .
2726 > import qualified Data.Text as T
2827 .
28+ To use an extended and very rich family of functions for working
29+ with Unicode text (including normalization, regular expressions,
30+ non-standard encodings, text breaking, and locales), see
31+ the @text-icu@ package:
32+ <http://hackage.haskell.org/package/text-icu>
33+ .
2934license: BSD3
3035license-file: LICENSE
3136author: Bryan O'Sullivan <bos@serpentine.com>