3b30032 · text · git.iko.soy

git.iko.soy/text

Rename encoding-related modules, and make them semi-public

--HG-- rename : Data/Text/Encoding/Fusion.hs => Data/Text/Internal/Encoding/Fusion.hs rename : Data/Text/Encoding/Fusion/Common.hs => Data/Text/Internal/Encoding/Fusion/Common.hs rename : Data/Text/Encoding/Utf16.hs => Data/Text/Internal/Encoding/Utf16.hs rename : Data/Text/Encoding/Utf32.hs => Data/Text/Internal/Encoding/Utf32.hs rename : Data/Text/Encoding/Utf8.hs => Data/Text/Internal/Encoding/Utf8.hs

commit3b30032dc01c7cf8c29e67667a612cf2168fcba7 authorBryan O'Sullivan <bos@serpentine.com> dateWed 4 Dec 2013, 13:58 (13 years ago) parentba4ae05

11 files changed+33−33

compare with master

unifiedsplit

Data/Text.hs+1−1 Data/Text/Encoding.hs+4−4 Data/Text/Fusion.hs+1−1 Data/Text/Encoding/Fusion.hs → Data/Text/Internal/Encoding/Fusion.hs+8−8 Data/Text/Encoding/Fusion/Common.hs → Data/Text/Internal/Encoding/Fusion/Common.hs+2−2 Data/Text/Encoding/Utf16.hs → Data/Text/Internal/Encoding/Utf16.hs+2−2 Data/Text/Encoding/Utf32.hs → Data/Text/Internal/Encoding/Utf32.hs+2−2 Data/Text/Encoding/Utf8.hs → Data/Text/Internal/Encoding/Utf8.hs+2−2 Data/Text/Lazy/Encoding/Fusion.hs+5−5 Data/Text/Unsafe.hs+1−1 text.cabal+5−5

Data/Text.hs+1−1

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

218218 unsafeHead, unsafeTail)

219219import Data.Text.UnsafeChar (unsafeChr)

220220import 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

222222import Data.Text.Search (indices)

223223#if defined(__HADDOCK__)

224224import Data.ByteString (ByteString)

Data/Text/Encoding.hs+4−4

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

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

8282import GHC.Base (MutableByteArray#)

8383import qualified Data.Text.Array as A

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

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

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

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

8686import qualified Data.Text.Fusion as F

8787import Data.Text.Unsafe (unsafeDupablePerformIO)

8888

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

146146 loop (ptr `plusPtr` off)

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

148148 where

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

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

150150{- INLINE[0] decodeUtf8With #-}

151151

152152-- $stream

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

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

268268 (decodeChunk codepoint state)

269269 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"

271271

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

273273-- to be valid.

Data/Text/Fusion.hs+1−1

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

5959import Data.Text.Fusion.Internal

6060import Data.Text.Fusion.Size

6161import 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

6363

6464default(Int)

6565

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

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

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

33-- |

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

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

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

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

77-- (c) Duncan Coutts 2009

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

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

1616-- and several common encodings.

1717

18−module Data.Text.Encoding.Fusion

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

1919 (

2020 -- * Streaming

2121 streamASCII

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

2828 -- * Unstreaming

2929 , unstream

3030

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

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

3232 ) where

3333

3434#if defined(ASSERTS)

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

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

3939import Data.Text.Fusion.Size

4040import Data.Text.Encoding.Error

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

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

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

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

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

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

4646import Foreign.Storable (pokeByteOff)

4747import qualified Data.ByteString as B

4848import qualified Data.ByteString.Unsafe as B

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

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

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

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

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

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

5252import Data.Text.Unsafe (unsafeDupablePerformIO)

5353

5454streamASCII :: ByteString -> Stream Char

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

201201 case onErr desc mb of

202202 Nothing -> Skip i

203203 Just c -> Yield c i

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

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

205205 kind ++ " stream"

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

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

11{-# LANGUAGE BangPatterns #-}

33-- |

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

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

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

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

77-- (c) Duncan Coutts 2009,

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

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

1717-- and several common encodings.

1818

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

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

2020 (

2121 -- * Restreaming

2222 -- 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 @@

11{-# LANGUAGE MagicHash, BangPatterns #-}

33-- |

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

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

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

1313-- Portability : GHC

1414--

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

16−module Data.Text.Encoding.Utf16

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

1717 (

1818 chr2

1919 , validate1

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

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

11-- |

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

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

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

1111-- Portability : portable

1212--

1313-- Basic UTF-32 validation.

14−module Data.Text.Encoding.Utf32

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

1515 (

1616 validate

1717 ) where

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

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

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

33-- |

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

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

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

1313-- Portability : GHC

1414--

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

16−module Data.Text.Encoding.Utf8

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

1717 (

1818 -- Decomposition

1919 ord2

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

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

2626 -- * Unstreaming

2727 , unstream

2828

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

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

3030 ) where

3131

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

3333import qualified Data.ByteString as B

3434import qualified Data.ByteString.Unsafe as B

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

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

3636import Data.Text.Encoding.Error

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

3838import Data.Text.Fusion.Size

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

4040import Data.Text.UnsafeShift (shiftL)

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

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

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

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

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

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

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

4545import Data.Text.Unsafe (unsafeDupablePerformIO)

4646import Foreign.ForeignPtr (withForeignPtr, ForeignPtr)

4747import Foreign.Storable (pokeByteOff)

Data/Text/Unsafe.hs+1−1

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

2929#if defined(ASSERTS)

3030import Control.Exception (assert)

3131#endif

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

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

3333import Data.Text.Internal (Text(..))

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

3535import Data.Text.UnsafeChar (unsafeChr)

text.cabal+5−5

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

9393 Data.Text.Read

9494 Data.Text.Unsafe

9595 other-modules:

96− Data.Text.Encoding.Fusion

97− Data.Text.Encoding.Fusion.Common

98− Data.Text.Encoding.Utf16

99− Data.Text.Encoding.Utf32

100− Data.Text.Encoding.Utf8

96+ Data.Text.Internal.Encoding.Fusion

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

98+ Data.Text.Internal.Encoding.Utf16

99+ Data.Text.Internal.Encoding.Utf32

100+ Data.Text.Internal.Encoding.Utf8

101101 Data.Text.Fusion

102102 Data.Text.Fusion.CaseMapping

103103 Data.Text.Fusion.Common