148a2d1 · text · git.iko.soy

Data/Text.hs+3−3

compare with master

unifiedsplit

@@ -208,9 +208,9 @@ import qualified Data.Text.Array as A

208import qualified Data.List as L

209import Data.Monoid (Monoid(..))

210import Data.String (IsString(..))

211−import qualified Data.Text.Fusion as S

211+import qualified Data.Text.Internal.Fusion as S

212−import qualified Data.Text.Fusion.Common as S

212+import qualified Data.Text.Internal.Fusion.Common as S

213−import Data.Text.Fusion (stream, reverseStream, unstream)

213+import Data.Text.Internal.Fusion (stream, reverseStream, unstream)

214import Data.Text.Private (span_)

215import Data.Text.Internal (Text(..), empty, firstf, safe, text, textP)

216import qualified Prelude as P

Data/Text/Encoding.hs+1−1

@@ -83,7 +83,7 @@ import GHC.Base (MutableByteArray#)

83import qualified Data.Text.Array as A

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

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

86−import qualified Data.Text.Fusion as F

86+import qualified Data.Text.Internal.Fusion as F

87import Data.Text.Unsafe (unsafeDupablePerformIO)

88

89#include "text_cbits.h"

Data/Text/IO.hs+2−2

@@ -50,8 +50,8 @@ import qualified Control.Exception as E

50import Control.Monad (liftM2, when)

51import Data.IORef (readIORef, writeIORef)

52import qualified Data.Text as T

53−import Data.Text.Fusion (stream)

53+import Data.Text.Internal.Fusion (stream)

54−import Data.Text.Fusion.Internal (Step(..), Stream(..))

54+import Data.Text.Internal.Fusion.Types (Step(..), Stream(..))

55import Data.Text.IO.Internal (hGetLineWith, readChunk)

56import GHC.IO.Buffer (Buffer(..), BufferState(..), CharBufElem, CharBuffer,

57 RawCharBuffer, emptyBuffer, isEmptyBuffer, newCharBuffer,

Data/Text/IO/Internal.hs+3−3

@@ -19,9 +19,9 @@ module Data.Text.IO.Internal

19import qualified Control.Exception as E

20import Data.IORef (readIORef, writeIORef)

21import Data.Text (Text)

22−import Data.Text.Fusion (unstream)

22+import Data.Text.Internal.Fusion (unstream)

23−import Data.Text.Fusion.Internal (Step(..), Stream(..))

23+import Data.Text.Internal.Fusion.Types (Step(..), Stream(..))

24−import Data.Text.Fusion.Size (exactSize, maxSize)

24+import Data.Text.Internal.Fusion.Size (exactSize, maxSize)

25import Data.Text.Unsafe (inlinePerformIO)

26import Foreign.Storable (peekElemOff)

27import GHC.IO.Buffer (Buffer(..), CharBuffer, RawCharBuffer, bufferAdjustL,

Data/Text/Internal/Encoding/Fusion.hs+2−2

@@ -35,8 +35,8 @@ module Data.Text.Internal.Encoding.Fusion

35import Control.Exception (assert)

36#endif

37import Data.ByteString.Internal (ByteString(..), mallocByteString, memcpy)

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

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

39−import Data.Text.Fusion.Size

39+import Data.Text.Internal.Fusion.Size

40import Data.Text.Encoding.Error

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

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

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

@@ -28,8 +28,8 @@ module Data.Text.Internal.Encoding.Fusion.Common

28 ) where

29

30import Data.Bits ((.&.))

31−import Data.Text.Fusion (Step(..), Stream(..))

31+import Data.Text.Internal.Fusion (Step(..), Stream(..))

32−import Data.Text.Fusion.Internal (RS(..))

32+import Data.Text.Internal.Fusion.Types (RS(..))

33import Data.Text.UnsafeChar (ord)

34import Data.Text.UnsafeShift (shiftR)

35import Data.Word (Word8)

Data/Text/Fusion.hs → Data/Text/Internal/Fusion.hsrenamed+5−5

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

1{-# LANGUAGE BangPatterns, MagicHash #-}

2

3-- |

4−-- Module : Data.Text.Fusion

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

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

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

7-- (c) Duncan Coutts 2009

@@ -14,7 +14,7 @@

14--

15-- Text manipulation functions represented as fusible operations over

16-- streams.

17−module Data.Text.Fusion

17+module Data.Text.Internal.Fusion

18 (

19 -- * Types

20 Stream(..)

@@ -55,9 +55,9 @@ import Data.Text.Private (runText)

55import Data.Text.UnsafeChar (ord, unsafeChr, unsafeWrite)

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

57import qualified Data.Text.Array as A

58−import qualified Data.Text.Fusion.Common as S

58+import qualified Data.Text.Internal.Fusion.Common as S

59−import Data.Text.Fusion.Internal

59+import Data.Text.Internal.Fusion.Types

60−import Data.Text.Fusion.Size

60+import Data.Text.Internal.Fusion.Size

61import qualified Data.Text.Internal as I

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

63

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

@@ -6,9 +6,9 @@

6-- SpecialCasing-6.3.0.txt

7-- Date: 2013-05-08, 13:54:51 GMT [MD]

8

9−module Data.Text.Fusion.CaseMapping where

9+module Data.Text.Internal.Fusion.CaseMapping where

10import Data.Char

11−import Data.Text.Fusion.Internal

11+import Data.Text.Internal.Fusion.Types

12

13upperMapping :: forall s. Char -> s -> Step (CC s) Char

14{-# INLINE upperMapping #-}

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

@@ -1,6 +1,6 @@

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

2-- |

3−-- Module : Data.Text.Fusion.Common

3+-- Module : Data.Text.Internal.Fusion.Common

4-- Copyright : (c) Bryan O'Sullivan 2009, 2012

5--

6-- License : BSD-style

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

11--

12-- Common stream fusion functionality for text.

13

14−module Data.Text.Fusion.Common

14+module Data.Text.Internal.Fusion.Common

15 (

16 -- * Creation and elimination

17 singleton

@@ -109,10 +109,10 @@ import qualified Prelude as P

109import Data.Bits (shiftL)

110import Data.Char (isLetter)

111import Data.Int (Int64)

112−import Data.Text.Fusion.Internal

112+import Data.Text.Internal.Fusion.Types

113−import Data.Text.Fusion.CaseMapping (foldMapping, lowerMapping, titleMapping,

113+import Data.Text.Internal.Fusion.CaseMapping (foldMapping, lowerMapping, titleMapping,

114 upperMapping)

115−import Data.Text.Fusion.Size

115+import Data.Text.Internal.Fusion.Size

116import GHC.Prim (Addr#, chr#, indexCharOffAddr#, ord#)

117import GHC.Types (Char(..), Int(..))

118

@@ -938,7 +938,7 @@ countCharI a (Stream next s0 _len) = loop 0 s0

938{-# INLINE [0] countCharI #-}

939

940streamError :: String -> String -> a

941−streamError func msg = P.error $ "Data.Text.Fusion.Common." ++ func ++ ": " ++ msg

941+streamError func msg = P.error $ "Data.Text.Internal.Fusion.Common." ++ func ++ ": " ++ msg

942

943emptyError :: String -> a

944emptyError func = internalError func "Empty input"

Data/Text/Fusion/Size.hs → Data/Text/Internal/Fusion/Size.hsrenamed+3−3

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

1{-# LANGUAGE CPP #-}

2{-# OPTIONS_GHC -fno-warn-missing-methods #-}

3-- |

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

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

5-- Copyright : (c) Roman Leshchinskiy 2008,

6-- (c) Bryan O'Sullivan 2009

7--

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

13--

14-- Size hints.

15

16−module Data.Text.Fusion.Size

16+module Data.Text.Internal.Fusion.Size

17 (

18 Size

19 , exactly

@@ -143,4 +143,4 @@ isEmpty _ = False

143{-# INLINE isEmpty #-}

144

145overflowError :: Int

146−overflowError = error "Data.Text.Fusion.Size: size overflow"

146+overflowError = error "Data.Text.Internal.Fusion.Size: size overflow"

Data/Text/Fusion/Internal.hs → Data/Text/Internal/Fusion/Types.hsrenamed+3−3

@@ -1,6 +1,6 @@

1{-# LANGUAGE BangPatterns, ExistentialQuantification #-}

2-- |

3−-- Module : Data.Text.Fusion.Internal

3+-- Module : Data.Text.Internal.Fusion.Types

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

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

6-- (c) Duncan Coutts 2009,

@@ -14,7 +14,7 @@

14--

15-- Core stream fusion functionality for text.

16

17−module Data.Text.Fusion.Internal

17+module Data.Text.Internal.Fusion.Types

18 (

19 CC(..)

20 , M(..)

@@ -27,7 +27,7 @@ module Data.Text.Fusion.Internal

27 , empty

28 ) where

29

30−import Data.Text.Fusion.Size

30+import Data.Text.Internal.Fusion.Size

31import Data.Word (Word8)

32

33-- | Specialised tuple for case conversion.

Data/Text/Lazy.hs+2−2

@@ -208,10 +208,10 @@ import Data.Monoid (Monoid(..))

208import Data.String (IsString(..))

209import qualified Data.Text as T

210import qualified Data.Text.Internal as T

211−import qualified Data.Text.Fusion.Common as S

211+import qualified Data.Text.Internal.Fusion.Common as S

212import qualified Data.Text.Unsafe as T

213import qualified Data.Text.Lazy.Fusion as S

214−import Data.Text.Fusion.Internal (PairS(..))

214+import Data.Text.Internal.Fusion.Types (PairS(..))

215import Data.Text.Lazy.Fusion (stream, unstream)

216import Data.Text.Lazy.Internal (Text(..), chunk, empty, foldlChunks, foldrChunks)

217import Data.Text.Internal (firstf, safe, textP)

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

@@ -34,8 +34,8 @@ import qualified Data.ByteString as B

34import qualified Data.ByteString.Unsafe as B

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

36import Data.Text.Encoding.Error

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

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

38−import Data.Text.Fusion.Size

38+import Data.Text.Internal.Fusion.Size

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

40import Data.Text.UnsafeShift (shiftL)

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

Data/Text/Lazy/Fusion.hs+3−3

@@ -23,10 +23,10 @@ module Data.Text.Lazy.Fusion

23 ) where

24

25import Prelude hiding (length)

26−import qualified Data.Text.Fusion.Common as S

26+import qualified Data.Text.Internal.Fusion.Common as S

27import Control.Monad.ST (runST)

28−import Data.Text.Fusion.Internal

28+import Data.Text.Internal.Fusion.Types

29−import Data.Text.Fusion.Size (isEmpty, unknownSize)

29+import Data.Text.Internal.Fusion.Size (isEmpty, unknownSize)

30import Data.Text.Lazy.Internal

31import qualified Data.Text.Internal as I

32import qualified Data.Text.Array as A

Data/Text/Lazy/Search.hs+1−1

@@ -23,7 +23,7 @@ import qualified Data.Text.Array as A

23import Data.Int (Int64)

24import Data.Word (Word16, Word64)

25import qualified Data.Text.Internal as T

26−import Data.Text.Fusion.Internal (PairS(..))

26+import Data.Text.Internal.Fusion.Types (PairS(..))

27import Data.Text.Lazy.Internal (Text(..), foldlChunks)

28import Data.Bits ((.|.), (.&.))

29import Data.Text.UnsafeShift (shiftL)

scripts/CaseMapping.hs+1−1

@@ -29,7 +29,7 @@ main = do

29 [""

30 ,"module Data.Text.Fusion.CaseMapping where"

31 ,"import Data.Char"

32− ,"import Data.Text.Fusion.Internal"

32+ ,"import Data.Text.Internal.Fusion.Types"

33 ,""]

34 mapM_ (hPutStrLn h) (mapSC "upper" upper toUpper scs)

35 mapM_ (hPutStrLn h) (mapSC "lower" lower toLower scs)

text.cabal+5−5

@@ -98,11 +98,11 @@ library

98 Data.Text.Internal.Encoding.Utf16

99 Data.Text.Internal.Encoding.Utf32

100 Data.Text.Internal.Encoding.Utf8

101− Data.Text.Fusion

101+ Data.Text.Internal.Fusion

102− Data.Text.Fusion.CaseMapping

102+ Data.Text.Internal.Fusion.CaseMapping

103− Data.Text.Fusion.Common

103+ Data.Text.Internal.Fusion.Common

104− Data.Text.Fusion.Internal

104+ Data.Text.Internal.Fusion.Size

105− Data.Text.Fusion.Size

105+ Data.Text.Internal.Fusion.Types

106 Data.Text.IO.Internal

107 Data.Text.Lazy.Builder.Functions

108 Data.Text.Lazy.Builder.Int.Digits