87fef79 · text · git.iko.soy

git.iko.soy/text

Fix up the tests a bit

--HG-- extra : convert_revision : dc72fdc07506fb9c188c3d6f8effb1d40d2ee961

commit87fef79b4917c7d5d46d9e5c481c4fce711ba214 authorDuncan Coutts <duncan@haskell.org> dateSun 18 Jan 2009, 18:07 (18 years ago) parent24b94cc

10 files changed+39−44

compare with master

unifiedsplit

Data/Text/Utf32/Fusion.hs+5−5 Data/Text/Utf32/Internal.hs+2−4 Data/Text/Utf8/Fusion.hs+7−7 Data/Text/Utf8/Internal.hs+2−2 tests/Bench.hs+6−8 tests/BenchUtils.hs+2−3 tests/EncodingBench.hs+2−2 tests/FusionBench.hs+4−4 tests/Properties.hs+5−5 tests/QuickCheckUtils.hs+4−4

Data/Text/Utf32/Fusion.hs+5−5

@@ -1,10 +1,10 @@

1−{-# OPTIONS_GHC -fbang-patterns #-}

1+{-# LANGUAGE BangPatterns #-}

3−module Text.Utf32.Fusion where

3+module Data.Text.Utf32.Fusion where

5−import Text.Fusion hiding (stream, unstream)

6−import Text.Utf32.Internal

7−import Text.UnsafeChar

5+import Data.Text.Fusion hiding (stream, unstream)

6+import Data.Text.Utf32.Internal

7+import Data.Text.UnsafeChar

88import Data.Array.Base

99import Data.Word

1010import Data.Array.ST

Data/Text/Utf32/Internal.hs+2−4

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

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

2−

3−module Text.Utf32.Internal where

1+module Data.Text.Utf32.Internal where

53import Data.Array.Unboxed

64import Data.Word

8−data Text = Text !(UArray Int Word32) !Int !Int

6+data Text = Text !(UArray Int Word32) !Int !Int

Data/Text/Utf8/Fusion.hs+7−7

@@ -1,17 +1,17 @@

1−{-# OPTIONS_GHC -fbang-patterns -fglasgow-exts #-}

1+{-# LANGUAGE BangPatterns #-}

3−module Text.Utf8.Fusion where

3+module Data.Text.Utf8.Fusion where

55import Data.Array.Base

66import Data.Word

77import Control.Monad.ST

88import Data.Text.UnsafeChar

99import Control.Monad

10−import Char

10+import Data.Char

1111

12−import Text.Utf8

13−import Text.Utf8.Internal

14−import Text.Fusion hiding (stream,unstream)

12+import Data.Text.Utf8

13+import Data.Text.Utf8.Internal

14+import Data.Text.Fusion hiding (stream,unstream)

1515

1616stream :: Text -> Stream Char

1717stream (Text arr off len) = Stream next off len

@@ -81,4 +81,4 @@ unstream (Stream next0 s0 len) = x `seq` (Text (fst x) 0 (snd x))

8181{-# RULES

8282"STREAM stream/unstream fusion" forall s.

8383 stream (unstream s) = s

84− #-}

84+ #-}

Data/Text/Utf8/Internal.hs+2−2

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

1−module Text.Utf8.Internal where

1+module Data.Text.Utf8.Internal where

33import Data.Array.Unboxed

44import Data.Word

6−data Text = Text !(UArray Int Word8) !Int !Int

6+data Text = Text !(UArray Int Word8) !Int !Int

tests/Bench.hs+6−8

@@ -1,11 +1,9 @@

1−{-# OPTIONS_GHC -fglasgow-exts -fbang-patterns #-}

2−

31--module Bench where

53import BenchUtils

64import System.Mem

75import Control.Concurrent

8−import Char

6+import Data.Char

97import Data.Array.IArray

108import System.CPUTime

119import System.IO

@@ -13,10 +11,10 @@ import System.IO.Unsafe

1311import Text.Printf

1412import Control.Exception

1513

16−import qualified Text as T

17−import Text.Internal

18−import qualified Text.Fusion as S

19−import Text.Fusion (Encoding(..))

14+import qualified Data.Text as T

15+import Data.Text.Internal

16+import qualified Data.Text.Fusion as S

17+import Data.Text.Fusion (Encoding(..))

2018

2119import qualified Data.List as L

2220import qualified Data.ByteString as B

@@ -183,4 +181,4 @@ smp_sip_tests = [

183181 ("take",

184182 [F (app1 $ T.take 30000000),

185183 Flist (app2 $ L.take 30000000)])

186− ]

184+ ]

tests/BenchUtils.hs+2−3

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

1−{-# OPTIONS_GHC -fglasgow-exts -fbang-patterns #-}

2−

1+{-# LANGUAGE ExistentialQuantification #-}

32module BenchUtils where

54import qualified Data.List as L

@@ -7,7 +6,7 @@ import Data.ByteString (ByteString(..))

76import Data.Word

87import Text.Printf

98import System.IO

10−import Text.Internal (Text(..))

9+import Data.Text.Internal (Text(..))

1110import System.Mem

1211import System.CPUTime

1312import Control.Exception

tests/EncodingBench.hs+2−2

@@ -1,4 +1,4 @@

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

1+{-# LANGUAGE ExistentialQuantification #-}

33import BenchUtils

44import qualified Data.Text.Utf8.Fusion as U8

@@ -103,4 +103,4 @@ smp_sip_tests = [

103103 [F $ app1 $ S.foldl' (\a w -> a+1::Int) 0 . U8.stream,

104104 F $ app2 $ S.foldl' (\a w -> a+1::Int) 0 . S.stream,

105105 F $ app3 $ S.foldl' (\a w -> a+1::Int) 0 . U32.stream])

106− ]

106+ ]

tests/FusionBench.hs+4−4

@@ -1,12 +1,12 @@

11import Prelude hiding (zip,zip3,fst,snd)

33import BenchUtils

4−import Char

4+import Data.Char

55import qualified Data.List as L

66import qualified Data.ByteString as B

7−import qualified Text as T

8−import Text.Fusion (Encoding(..))

9−import qualified Text.Fusion as S

7+import qualified Data.Text as T

8+import Data.Text.Fusion (Encoding(..))

9+import qualified Data.Text.Fusion as S

1010import Text.Printf

1111import System.IO

1212import System.Mem

tests/Properties.hs+5−5

@@ -1,13 +1,13 @@

1−{-# OPTIONS_GHC -fno-rewrite-rules #-}

1+{-# OPTIONS_GHC -fno-enable-rewrite-rules #-}

33import Test.QuickCheck

44import Text.Show.Functions

66import Prelude

7−import qualified Text as T

8−import Text (pack,unpack)

9−import qualified Text.Fusion as S

10−import Text.Fusion (unstream,stream)

7+import qualified Data.Text as T

8+import Data.Text (pack,unpack)

9+import qualified Data.Text.Fusion as S

10+import Data.Text.Fusion (unstream,stream)

1111import qualified Data.List as L

1212

1313

tests/QuickCheckUtils.hs+4−4

@@ -3,10 +3,10 @@ module QuickCheckUtils where

33import Test.QuickCheck

44import Test.QuickCheck.Batch

6−import Char

6+import Data.Char

8−import Text

9−import Text.Internal

8+import Data.Text

9+import Data.Text.Internal

1010

1111instance Arbitrary Char where

1212 arbitrary = oneof [choose ('\0','\55295'), choose ('\57334','\1114111')]

@@ -14,4 +14,4 @@ instance Arbitrary Char where

1414

1515instance Arbitrary Text where

1616 arbitrary = pack `fmap` arbitrary

17− coarbitrary s = coarbitrary (unpack s)

17+ coarbitrary s = coarbitrary (unpack s)