148a2d1 · text · git.iko.soy

git.iko.soy/text

Rename strict fusion-related modules

--HG-- rename : Data/Text/Fusion.hs => Data/Text/Internal/Fusion.hs rename : Data/Text/Fusion/CaseMapping.hs => Data/Text/Internal/Fusion/CaseMapping.hs rename : Data/Text/Fusion/Common.hs => Data/Text/Internal/Fusion/Common.hs rename : Data/Text/Fusion/Size.hs => Data/Text/Internal/Fusion/Size.hs rename : Data/Text/Fusion/Internal.hs => Data/Text/Internal/Fusion/Types.hs

commit148a2d165c2766e32602338b1248d77d0efe0b13 authorBryan O'Sullivan <bos@serpentine.com> dateWed 4 Dec 2013, 14:15 (13 years ago) parent3b30032

17 files changed+46−46

compare with master

unifiedsplit

Data/Text.hs+3−3 Data/Text/Encoding.hs+1−1 Data/Text/IO.hs+2−2 Data/Text/IO/Internal.hs+3−3 Data/Text/Internal/Encoding/Fusion.hs+2−2 Data/Text/Internal/Encoding/Fusion/Common.hs+2−2 Data/Text/Fusion.hs → Data/Text/Internal/Fusion.hs+5−5 Data/Text/Fusion/CaseMapping.hs → Data/Text/Internal/Fusion/CaseMapping.hs+2−2 Data/Text/Fusion/Common.hs → Data/Text/Internal/Fusion/Common.hs+6−6 Data/Text/Fusion/Size.hs → Data/Text/Internal/Fusion/Size.hs+3−3 Data/Text/Fusion/Internal.hs → Data/Text/Internal/Fusion/Types.hs+3−3 Data/Text/Lazy.hs+2−2 Data/Text/Lazy/Encoding/Fusion.hs+2−2 Data/Text/Lazy/Fusion.hs+3−3 Data/Text/Lazy/Search.hs+1−1 scripts/CaseMapping.hs+1−1 text.cabal+5−5

Data/Text.hs+3−3

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

208208import qualified Data.List as L

209209import Data.Monoid (Monoid(..))

210210import Data.String (IsString(..))

211−import qualified Data.Text.Fusion as S

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

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

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

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

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

214214import Data.Text.Private (span_)

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

216216import qualified Prelude as P

Data/Text/Encoding.hs+1−1

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

8383import qualified Data.Text.Array as A

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

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

8787import Data.Text.Unsafe (unsafeDupablePerformIO)

8888

8989#include "text_cbits.h"

Data/Text/IO.hs+2−2

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

5050import Control.Monad (liftM2, when)

5151import Data.IORef (readIORef, writeIORef)

5252import qualified Data.Text as T

53−import Data.Text.Fusion (stream)

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

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

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

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

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

5757 RawCharBuffer, emptyBuffer, isEmptyBuffer, newCharBuffer,

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

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

1919import qualified Control.Exception as E

2020import Data.IORef (readIORef, writeIORef)

2121import Data.Text (Text)

22−import Data.Text.Fusion (unstream)

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

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

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

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

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

2525import Data.Text.Unsafe (inlinePerformIO)

2626import Foreign.Storable (peekElemOff)

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

3535import Control.Exception (assert)

3636#endif

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

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

39−import Data.Text.Fusion.Size

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

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

4040import Data.Text.Encoding.Error

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

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

2828 ) where

2929

3030import Data.Bits ((.&.))

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

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

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

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

3333import Data.Text.UnsafeChar (ord)

3434import Data.Text.UnsafeShift (shiftR)

3535import Data.Word (Word8)

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

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

11{-# LANGUAGE BangPatterns, MagicHash #-}

33-- |

4−-- Module : Data.Text.Fusion

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

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

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

77-- (c) Duncan Coutts 2009

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

1414--

1515-- Text manipulation functions represented as fusible operations over

1616-- streams.

17−module Data.Text.Fusion

17+module Data.Text.Internal.Fusion

1818 (

1919 -- * Types

2020 Stream(..)

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

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

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

5757import qualified Data.Text.Array as A

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

59−import Data.Text.Fusion.Internal

60−import Data.Text.Fusion.Size

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

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

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

6161import qualified Data.Text.Internal as I

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

6363

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

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

66-- SpecialCasing-6.3.0.txt

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

9−module Data.Text.Fusion.CaseMapping where

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

1010import Data.Char

11−import Data.Text.Fusion.Internal

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

1212

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

1414{-# INLINE upperMapping #-}

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

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

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

22-- |

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

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

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

55--

66-- License : BSD-style

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

1111--

1212-- Common stream fusion functionality for text.

1313

14−module Data.Text.Fusion.Common

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

1515 (

1616 -- * Creation and elimination

1717 singleton

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

109109import Data.Bits (shiftL)

110110import Data.Char (isLetter)

111111import Data.Int (Int64)

112−import Data.Text.Fusion.Internal

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

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

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

114114 upperMapping)

115−import Data.Text.Fusion.Size

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

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

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

118118

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

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

939939

940940streamError :: 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

942942

943943emptyError :: String -> a

944944emptyError func = internalError func "Empty input"

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

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

11{-# LANGUAGE CPP #-}

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

33-- |

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

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

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

66-- (c) Bryan O'Sullivan 2009

77--

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

1313--

1414-- Size hints.

1515

16−module Data.Text.Fusion.Size

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

1717 (

1818 Size

1919 , exactly

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

143143{-# INLINE isEmpty #-}

144144

145145overflowError :: 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 @@

11{-# LANGUAGE BangPatterns, ExistentialQuantification #-}

22-- |

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

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

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

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

66-- (c) Duncan Coutts 2009,

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

1414--

1515-- Core stream fusion functionality for text.

1616

17−module Data.Text.Fusion.Internal

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

1818 (

1919 CC(..)

2020 , M(..)

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

2727 , empty

2828 ) where

2929

30−import Data.Text.Fusion.Size

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

3131import Data.Word (Word8)

3232

3333-- | Specialised tuple for case conversion.

Data/Text/Lazy.hs+2−2

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

208208import Data.String (IsString(..))

209209import qualified Data.Text as T

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

212212import qualified Data.Text.Unsafe as T

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

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

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

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

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

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

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

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

3434import qualified Data.ByteString.Unsafe as B

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

3636import Data.Text.Encoding.Error

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

38−import Data.Text.Fusion.Size

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

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

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

4040import Data.Text.UnsafeShift (shiftL)

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

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

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

2323 ) where

2424

2525import Prelude hiding (length)

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

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

2727import Control.Monad.ST (runST)

28−import Data.Text.Fusion.Internal

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

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

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

3030import Data.Text.Lazy.Internal

3131import qualified Data.Text.Internal as I

3232import qualified Data.Text.Array as A

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

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

2323import Data.Int (Int64)

2424import Data.Word (Word16, Word64)

2525import qualified Data.Text.Internal as T

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

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

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

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

2929import Data.Text.UnsafeShift (shiftL)

scripts/CaseMapping.hs+1−1

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

2929 [""

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

3131 ,"import Data.Char"

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

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

3333 ,""]

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

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

text.cabal+5−5

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

9898 Data.Text.Internal.Encoding.Utf16

9999 Data.Text.Internal.Encoding.Utf32

100100 Data.Text.Internal.Encoding.Utf8

101− Data.Text.Fusion

102− Data.Text.Fusion.CaseMapping

103− Data.Text.Fusion.Common

104− Data.Text.Fusion.Internal

105− Data.Text.Fusion.Size

101+ Data.Text.Internal.Fusion

102+ Data.Text.Internal.Fusion.CaseMapping

103+ Data.Text.Internal.Fusion.Common

104+ Data.Text.Internal.Fusion.Size

105+ Data.Text.Internal.Fusion.Types

106106 Data.Text.IO.Internal

107107 Data.Text.Lazy.Builder.Functions

108108 Data.Text.Lazy.Builder.Int.Digits