@@ -195,7 +195,7 @@ module Data.Text
195195
196196import Prelude (Char, Bool(..), Int, Maybe(..), String,
197197 Eq(..), Ord(..), Ordering(..), (++),
198− Read(..), Show(..),
198+ Read(..),
199199 (&&), (||), (+), (-), (.), ($), ($!), (>>),
200200 not, return, otherwise, quot)
201201#if defined(HAVE_DEEPSEQ)
@@ -211,17 +211,20 @@ import Control.Monad (foldM)
211211import Control.Monad.ST (ST)
212212import qualified Data.Text.Array as A
213213import qualified Data.List as L
214+import Data.Binary (Binary(get, put))
214215import Data.Monoid (Monoid(..))
215216import Data.String (IsString(..))
216217import qualified Data.Text.Internal.Fusion as S
217218import qualified Data.Text.Internal.Fusion.Common as S
219+import Data.Text.Encoding (decodeUtf8, encodeUtf8)
218220import Data.Text.Internal.Fusion (stream, reverseStream, unstream)
219221import Data.Text.Internal.Private (span_)
220−import Data.Text.Internal (Text(..), empty, empty_, firstf, mul, safe, text)
222+import Data.Text.Internal (Text(..), empty, firstf, mul, safe, text)
223+import Data.Text.Show (singleton, unpack)
221224import qualified Prelude as P
222225import Data.Text.Unsafe (Iter(..), iter, iter_, lengthWord16, reverseIter,
223226 reverseIter_, unsafeHead, unsafeTail)
224−import Data.Text.Internal.Unsafe.Char (unsafeChr, unsafeWrite)
227+import Data.Text.Internal.Unsafe.Char (unsafeChr)
225228import qualified Data.Text.Internal.Functions as F
226229import qualified Data.Text.Internal.Encoding.Utf16 as U16
227230import Data.Text.Internal.Search (indices)
@@ -230,15 +233,9 @@ import Data.ByteString (ByteString)
230233import qualified Data.Text.Lazy as L
231234import Data.Int (Int64)
232235#endif
233−#if __GLASGOW_HASKELL__ >= 702
234−import qualified GHC.CString as GHC
235−#else
236−import qualified GHC.Base as GHC
237−#endif
238236#if __GLASGOW_HASKELL__ >= 708
239237import qualified GHC.Exts as Exts
240238#endif
241−import GHC.Prim (Addr#)
242239
243240-- $strict
244241--
@@ -324,9 +321,6 @@ instance Eq Text where
324321instance Ord Text where
325322 compare = compareText
326323
327−instance Show Text where
328− showsPrec p ps r = showsPrec p (unpack ps) r
329−
330324instance Read Text where
331325 readsPrec p str = [(pack x,y) | (x,y) <- readsPrec p str]
332326
@@ -349,6 +343,10 @@ instance Exts.IsList Text where
349343instance NFData Text where rnf !_ = ()
350344#endif
351345
346+instance Binary Text where
347+ put t = put (encodeUtf8 t)
348+ get = P.fmap decodeUtf8 get
349+
352350-- | This instance preserves data abstraction at the cost of inefficiency.
353351-- We omit reflection services for the sake of data abstraction.
354352--
@@ -401,54 +399,6 @@ pack :: String -> Text
401399pack = unstream . S.map safe . S.streamList
402400{-# INLINE [1] pack #-}
403401
404−-- | /O(n)/ Convert a 'Text' into a 'String'. Subject to fusion.
405−unpack :: Text -> String
406−unpack = S.unstreamList . stream
407−{-# INLINE [1] unpack #-}
408−
409−-- | /O(n)/ Convert a literal string into a Text. Subject to fusion.
410−unpackCString# :: Addr# -> Text
411−unpackCString# addr# = unstream (S.streamCString# addr#)
412−{-# NOINLINE unpackCString# #-}
413−
414−{-# RULES "TEXT literal" forall a.
415− unstream (S.map safe (S.streamList (GHC.unpackCString# a)))
416− = unpackCString# a #-}
417−
418−{-# RULES "TEXT literal UTF8" forall a.
419− unstream (S.map safe (S.streamList (GHC.unpackCStringUtf8# a)))
420− = unpackCString# a #-}
421−
422−{-# RULES "TEXT empty literal"
423− unstream (S.map safe (S.streamList []))
424− = empty_ #-}
425−
426−{-# RULES "TEXT singleton literal" forall a.
427− unstream (S.map safe (S.streamList [a]))
428− = singleton_ a #-}
429−
430−-- | /O(1)/ Convert a character into a Text. Subject to fusion.
431−-- Performs replacement on invalid scalar values.
432−singleton :: Char -> Text
433−singleton = unstream . S.singleton . safe
434−{-# INLINE [1] singleton #-}
435−
436−{-# RULES "TEXT singleton" forall a.
437− unstream (S.singleton (safe a))
438− = singleton_ a #-}
439−
440−-- This is intended to reduce inlining bloat.
441−singleton_ :: Char -> Text
442−singleton_ c = Text (A.run x) 0 len
443− where x :: ST s (A.MArray s)
444− x = do arr <- A.new len
445− _ <- unsafeWrite arr 0 d
446− return arr
447− len | d < '\x10000' = 1
448− | otherwise = 2
449− d = safe c
450−{-# NOINLINE singleton_ #-}
451−
452402-- -----------------------------------------------------------------------------
453403-- * Basic functions
454404