82325d1 · text · git.iko.soy

Data/Text.hs+8−8

compare with master

unifiedsplit

@@ -5,21 +5,21 @@ module Data.Text where

5

6import Prelude (Char,Bool,Int,Maybe,String,

7 Eq,(==),

8− Show,showsPrec,show,not,

8+ Show,showsPrec,

9− Read,readsPrec,read,

9+ Read,readsPrec,

10 (&&),(||),(+),(-),($),(<),(>),(<=),(>=),(.),(>>=),

11− return,otherwise,seq,fromIntegral)

11+ return,otherwise,seq,

12+ IO, FilePath)

12

13

13import Data.Char (isSpace)

14import Data.Char (isSpace)

14−import Control.Monad.ST(ST(..))

15+import Control.Monad.ST(ST)

15import Data.Array.Base(unsafeNewArray_,unsafeWrite,unsafeAt)

16import Data.Array.Base(unsafeNewArray_,unsafeWrite,unsafeAt)

16−import Data.Array.ST(STUArray(..), runSTUArray)

17+import Data.Array.ST(STUArray, runSTUArray)

17import qualified Data.ByteString as B

18import qualified Data.ByteString as B

18−import Data.ByteString(ByteString(..))

19+import Data.ByteString(ByteString)

19import qualified Data.List as L

20import qualified Data.List as L

20import Data.Monoid(Monoid(..))

21import Data.Monoid(Monoid(..))

21−import Data.Word(Word16(..))

22+import Data.Word(Word16)

22−import System.IO hiding (readFile)

23

24import qualified Data.Text.Fusion as S

25import Data.Text.Fusion (Stream(..),Step(..),Encoding(..),

Data/Text/Fusion.hs+5−3

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

1{-# OPTIONS_GHC -fglasgow-exts #-}

2{-# LANGUAGE BangPatterns #-}

3+--TODO: eliminate the need to supress these warnings:

4+{-# OPTIONS_GHC -fno-warn-incomplete-patterns -fno-warn-unused-matches #-}

3

5

4module Data.Text.Fusion where

6module Data.Text.Fusion where

5

7

@@ -8,14 +10,14 @@ import Prelude hiding (map, tail, head, foldr, filter,concat)

8import Data.Char

10import Data.Char

9import Control.Exception(assert)

11import Control.Exception(assert)

10import Control.Monad(liftM2)

12import Control.Monad(liftM2)

11−import Control.Monad.ST(runST,ST(..))

13+import Control.Monad.ST(runST,ST)

12import Data.Array.Base

14import Data.Array.Base

13import Data.Bits

15import Data.Bits

14import qualified Data.ByteString as B

16import qualified Data.ByteString as B

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

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

16import qualified Data.List as L

18import qualified Data.List as L

17−import Data.Word(Word8(..),Word16(..),Word32(..))

19+import Data.Word(Word8, Word16, Word32)

18−import Foreign.ForeignPtr(withForeignPtr,ForeignPtr(..))

20+import Foreign.ForeignPtr(withForeignPtr,ForeignPtr)

19import Foreign.Storable(pokeByteOff)

21import Foreign.Storable(pokeByteOff)

20import GHC.Exts

22import GHC.Exts

21import System.IO.Unsafe(unsafePerformIO)

23import System.IO.Unsafe(unsafePerformIO)

Data/Text/Internal.hs+2−2

@@ -1,8 +1,8 @@

1module Data.Text.Internal where

2

3import Data.Array.ST(newArray_,runSTUArray)

4−import Data.Array.Unboxed(UArray(..))

4+import Data.Array.Unboxed(UArray)

5−import Data.Word(Word16(..))

5+import Data.Word(Word16)

6

7data Text = Text !(UArray Int Word16) {-# UNPACK #-}!Int {-# UNPACK #-}!Int

8

Data/Text/Utf32.hs+1−3

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

1module Data.Text.Utf32 where

2

3−import Data.Bits

3+import Data.Word (Word32)

4−import Data.Char

5−import Data.Word

6

4

7validate :: Word32 -> Bool

5validate :: Word32 -> Bool

8validate x1 = (x1 >= 0x0 && x1 < 0xD800) || (x1 > 0xDFFF && x1 <= 0x10FFFF)

6validate x1 = (x1 >= 0x0 && x1 < 0xD800) || (x1 > 0xDFFF && x1 <= 0x10FFFF)

Data/Text/Utf8.hs−1

@@ -3,7 +3,6 @@ module Data.Text.Utf8 where

3

4import Data.Char(ord)

5import Data.Bits

6−import Data.Word

7

6

8import GHC.Exts

7import GHC.Exts

9import GHC.Prim

8import GHC.Prim