3b30032 · text · git.iko.soy

Data/Text.hs+1−1

compare with master

unifiedsplit

@@ -218,7 +218,7 @@ import Data.Text.Unsafe (Iter(..), iter, iter_, lengthWord16, reverseIter,

218 unsafeHead, unsafeTail)

219import Data.Text.UnsafeChar (unsafeChr)

220import qualified Data.Text.Util as U

221−import qualified Data.Text.Encoding.Utf16 as U16

221+import qualified Data.Text.Internal.Encoding.Utf16 as U16

222import Data.Text.Search (indices)

223#if defined(__HADDOCK__)

224import Data.ByteString (ByteString)

Data/Text/Encoding.hs+4−4

@@ -81,8 +81,8 @@ import Foreign.Ptr (Ptr, minusPtr, nullPtr, plusPtr)

81import Foreign.Storable (Storable, peek, poke)

82import GHC.Base (MutableByteArray#)

83import qualified Data.Text.Array as A

84−import qualified Data.Text.Encoding.Fusion as E

84+import qualified Data.Text.Internal.Encoding.Fusion as E

85−import qualified Data.Text.Encoding.Utf16 as U16

85+import qualified Data.Text.Internal.Encoding.Utf16 as U16

86import qualified Data.Text.Fusion as F

87import Data.Text.Unsafe (unsafeDupablePerformIO)

88

@@ -146,7 +146,7 @@ decodeUtf8With onErr (PS fp off len) = runText $ \done -> do

146 loop (ptr `plusPtr` off)

147 (unsafeIOToST . go) =<< A.new len

148 where

149− desc = "Data.Text.Encoding.decodeUtf8: Invalid UTF-8 stream"

149+ desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream"

150{- INLINE[0] decodeUtf8With #-}

151

152-- $stream

@@ -267,7 +267,7 @@ streamDecodeUtf8With onErr = decodeChunk 0 0

267 return $ Some chunkText (B.drop left bs)

268 (decodeChunk codepoint state)

269 in loop (ptr `plusPtr` off)

270− desc = "Data.Text.Encoding.streamDecodeUtf8With: Invalid UTF-8 stream"

270+ desc = "Data.Text.Internal.Encoding.streamDecodeUtf8With: Invalid UTF-8 stream"

271

272-- | Decode a 'ByteString' containing UTF-8 encoded text that is known

273-- to be valid.

Data/Text/Fusion.hs+1−1

@@ -59,7 +59,7 @@ import qualified Data.Text.Fusion.Common as S

59import Data.Text.Fusion.Internal

60import Data.Text.Fusion.Size

61import qualified Data.Text.Internal as I

62−import qualified Data.Text.Encoding.Utf16 as U16

62+import qualified Data.Text.Internal.Encoding.Utf16 as U16

63

64default(Int)

65

Data/Text/Encoding/Fusion.hs → Data/Text/Internal/Encoding/Fusion.hsrenamed+8−8

@@ -1,7 +1,7 @@

1{-# LANGUAGE BangPatterns, CPP, Rank2Types #-}

2

3-- |

4−-- Module : Data.Text.Encoding.Fusion

4+-- Module : Data.Text.Internal.Encoding.Fusion

5-- Copyright : (c) Tom Harper 2008-2009,

6-- (c) Bryan O'Sullivan 2009,

7-- (c) Duncan Coutts 2009

@@ -15,7 +15,7 @@

15-- Fusible 'Stream'-oriented functions for converting between 'Text'

16-- and several common encodings.

17

18−module Data.Text.Encoding.Fusion

18+module Data.Text.Internal.Encoding.Fusion

19 (

20 -- * Streaming

21 streamASCII

@@ -28,7 +28,7 @@ module Data.Text.Encoding.Fusion

28 -- * Unstreaming

29 , unstream

30

31− , module Data.Text.Encoding.Fusion.Common

31+ , module Data.Text.Internal.Encoding.Fusion.Common

32 ) where

33

34#if defined(ASSERTS)

@@ -38,7 +38,7 @@ import Data.ByteString.Internal (ByteString(..), mallocByteString, memcpy)

38import Data.Text.Fusion (Step(..), Stream(..))

39import Data.Text.Fusion.Size

40import Data.Text.Encoding.Error

41−import Data.Text.Encoding.Fusion.Common

41+import Data.Text.Internal.Encoding.Fusion.Common

42import Data.Text.UnsafeChar (unsafeChr, unsafeChr8, unsafeChr32)

43import Data.Text.UnsafeShift (shiftL, shiftR)

44import Data.Word (Word8, Word16, Word32)

@@ -46,9 +46,9 @@ import Foreign.ForeignPtr (withForeignPtr, ForeignPtr)

46import Foreign.Storable (pokeByteOff)

47import qualified Data.ByteString as B

48import qualified Data.ByteString.Unsafe as B

49−import qualified Data.Text.Encoding.Utf8 as U8

49+import qualified Data.Text.Internal.Encoding.Utf8 as U8

50−import qualified Data.Text.Encoding.Utf16 as U16

50+import qualified Data.Text.Internal.Encoding.Utf16 as U16

51−import qualified Data.Text.Encoding.Utf32 as U32

51+import qualified Data.Text.Internal.Encoding.Utf32 as U32

52import Data.Text.Unsafe (unsafeDupablePerformIO)

53

54streamASCII :: ByteString -> Stream Char

@@ -201,5 +201,5 @@ decodeError func kind onErr mb i =

201 case onErr desc mb of

202 Nothing -> Skip i

203 Just c -> Yield c i

204− where desc = "Data.Text.Encoding.Fusion." ++ func ++ ": Invalid " ++

204+ where desc = "Data.Text.Internal.Encoding.Fusion." ++ func ++ ": Invalid " ++

205 kind ++ " stream"

Data/Text/Encoding/Fusion/Common.hs → Data/Text/Internal/Encoding/Fusion/Common.hsrenamed+2−2

@@ -1,7 +1,7 @@

1{-# LANGUAGE BangPatterns #-}

2

3-- |

4−-- Module : Data.Text.Encoding.Fusion.Common

4+-- Module : Data.Text.Internal.Encoding.Fusion.Common

5-- Copyright : (c) Tom Harper 2008-2009,

6-- (c) Bryan O'Sullivan 2009,

7-- (c) Duncan Coutts 2009,

@@ -16,7 +16,7 @@

16-- Fusible 'Stream'-oriented functions for converting between 'Text'

17-- and several common encodings.

18

19−module Data.Text.Encoding.Fusion.Common

19+module Data.Text.Internal.Encoding.Fusion.Common

20 (

21 -- * Restreaming

22 -- Restreaming is the act of converting from one 'Stream'

Data/Text/Encoding/Utf16.hs → Data/Text/Internal/Encoding/Utf16.hsrenamed+2−2

@@ -1,7 +1,7 @@

1{-# LANGUAGE MagicHash, BangPatterns #-}

2

3-- |

4−-- Module : Data.Text.Encoding.Utf16

4+-- Module : Data.Text.Internal.Encoding.Utf16

@@ -13,7 +13,7 @@

13-- Portability : GHC

14--

15-- Basic UTF-16 validation and character manipulation.

16−module Data.Text.Encoding.Utf16

16+module Data.Text.Internal.Encoding.Utf16

17 (

18 chr2

19 , validate1

Data/Text/Encoding/Utf32.hs → Data/Text/Internal/Encoding/Utf32.hsrenamed+2−2

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Data.Text.Encoding.Utf32

2+-- Module : Data.Text.Internal.Encoding.Utf32

@@ -11,7 +11,7 @@

11-- Portability : portable

12--

13-- Basic UTF-32 validation.

14−module Data.Text.Encoding.Utf32

14+module Data.Text.Internal.Encoding.Utf32

15 (

16 validate

17 ) where

Data/Text/Encoding/Utf8.hs → Data/Text/Internal/Encoding/Utf8.hsrenamed+2−2

@@ -1,7 +1,7 @@

1{-# LANGUAGE CPP, MagicHash, BangPatterns #-}

2

3-- |

4−-- Module : Data.Text.Encoding.Utf8

4+-- Module : Data.Text.Internal.Encoding.Utf8

@@ -13,7 +13,7 @@

13-- Portability : GHC

14--

15-- Basic UTF-8 validation and character manipulation.

16−module Data.Text.Encoding.Utf8

16+module Data.Text.Internal.Encoding.Utf8

17 (

18 -- Decomposition

19 ord2

Data/Text/Lazy/Encoding/Fusion.hs+5−5

@@ -26,22 +26,22 @@ module Data.Text.Lazy.Encoding.Fusion

26 -- * Unstreaming

27 , unstream

28

29− , module Data.Text.Encoding.Fusion.Common

29+ , module Data.Text.Internal.Encoding.Fusion.Common

30 ) where

31

32import Data.ByteString.Lazy.Internal (ByteString(..), defaultChunkSize)

33import qualified Data.ByteString as B

34import qualified Data.ByteString.Unsafe as B

35−import Data.Text.Encoding.Fusion.Common

35+import Data.Text.Internal.Encoding.Fusion.Common

36import Data.Text.Encoding.Error

37import Data.Text.Fusion (Step(..), Stream(..))

38import Data.Text.Fusion.Size

39import Data.Text.UnsafeChar (unsafeChr, unsafeChr8, unsafeChr32)

40import Data.Text.UnsafeShift (shiftL)

41import Data.Word (Word8, Word16, Word32)

42−import qualified Data.Text.Encoding.Utf8 as U8

42+import qualified Data.Text.Internal.Encoding.Utf8 as U8

43−import qualified Data.Text.Encoding.Utf16 as U16

43+import qualified Data.Text.Internal.Encoding.Utf16 as U16

44−import qualified Data.Text.Encoding.Utf32 as U32

44+import qualified Data.Text.Internal.Encoding.Utf32 as U32

45import Data.Text.Unsafe (unsafeDupablePerformIO)

46import Foreign.ForeignPtr (withForeignPtr, ForeignPtr)

47import Foreign.Storable (pokeByteOff)

Data/Text/Unsafe.hs+1−1

@@ -29,7 +29,7 @@ module Data.Text.Unsafe

29#if defined(ASSERTS)

30import Control.Exception (assert)

31#endif

32−import Data.Text.Encoding.Utf16 (chr2)

32+import Data.Text.Internal.Encoding.Utf16 (chr2)

33import Data.Text.Internal (Text(..))

34import Data.Text.Unsafe.Base (inlineInterleaveST, inlinePerformIO)

35import Data.Text.UnsafeChar (unsafeChr)

text.cabal+5−5

@@ -93,11 +93,11 @@ library

93 Data.Text.Read

94 Data.Text.Unsafe

95 other-modules:

96− Data.Text.Encoding.Fusion

96+ Data.Text.Internal.Encoding.Fusion

97− Data.Text.Encoding.Fusion.Common

97+ Data.Text.Internal.Encoding.Fusion.Common

98− Data.Text.Encoding.Utf16

98+ Data.Text.Internal.Encoding.Utf16

99− Data.Text.Encoding.Utf32

99+ Data.Text.Internal.Encoding.Utf32

100− Data.Text.Encoding.Utf8

100+ Data.Text.Internal.Encoding.Utf8

101 Data.Text.Fusion

102 Data.Text.Fusion.CaseMapping

103 Data.Text.Fusion.Common