Fix up the tests a bit

--HG-- extra : convert_revision : dc72fdc07506fb9c188c3d6f8effb1d40d2ee961
kindaro · Jan 18, 2009 · 87fef79 · 87fef79
1 parent 24b94cc
commit 87fef79
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 44 deletions.
diff --git a/Data/Text/Utf32/Fusion.hs b/Data/Text/Utf32/Fusion.hs
@@ -1,10 +1,10 @@
-{-# OPTIONS_GHC -fbang-patterns #-}
+{-# LANGUAGE BangPatterns #-}
 
-module Text.Utf32.Fusion where
+module Data.Text.Utf32.Fusion where
 
-import Text.Fusion hiding (stream, unstream)
-import Text.Utf32.Internal
-import Text.UnsafeChar
+import Data.Text.Fusion hiding (stream, unstream)
+import Data.Text.Utf32.Internal
+import Data.Text.UnsafeChar
 import Data.Array.Base
 import Data.Word
 import Data.Array.ST

diff --git a/Data/Text/Utf32/Internal.hs b/Data/Text/Utf32/Internal.hs
@@ -1,8 +1,6 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
-module Text.Utf32.Internal where
+module Data.Text.Utf32.Internal where
 
 import Data.Array.Unboxed
 import Data.Word
 
-data Text = Text !(UArray Int Word32) !Int !Int
+data Text = Text !(UArray Int Word32) !Int !Int
diff --git a/Data/Text/Utf8/Fusion.hs b/Data/Text/Utf8/Fusion.hs
@@ -1,17 +1,17 @@
-{-# OPTIONS_GHC -fbang-patterns -fglasgow-exts #-}
+{-# LANGUAGE BangPatterns #-}
 
-module Text.Utf8.Fusion where
+module Data.Text.Utf8.Fusion where
 
 import Data.Array.Base
 import Data.Word
 import Control.Monad.ST
 import Data.Text.UnsafeChar
 import Control.Monad
-import Char
+import Data.Char
 
-import Text.Utf8
-import Text.Utf8.Internal
-import Text.Fusion hiding (stream,unstream)
+import Data.Text.Utf8
+import Data.Text.Utf8.Internal
+import Data.Text.Fusion hiding (stream,unstream)
 
 stream :: Text -> Stream Char
 stream (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))
 {-# RULES 
 "STREAM stream/unstream fusion" forall s. 
    stream (unstream s) = s 
- #-}
+ #-}
diff --git a/Data/Text/Utf8/Internal.hs b/Data/Text/Utf8/Internal.hs
@@ -1,6 +1,6 @@
-module Text.Utf8.Internal where
+module Data.Text.Utf8.Internal where
 
 import Data.Array.Unboxed
 import Data.Word
 
-data Text = Text !(UArray Int Word8) !Int !Int
+data Text = Text !(UArray Int Word8) !Int !Int
diff --git a/tests/Bench.hs b/tests/Bench.hs
@@ -1,22 +1,20 @@
-{-# OPTIONS_GHC -fglasgow-exts -fbang-patterns #-}
-
 --module Bench where
 
 import BenchUtils
 import System.Mem 
 import Control.Concurrent
-import Char 
+import Data.Char
 import Data.Array.IArray
 import System.CPUTime
 import System.IO
 import System.IO.Unsafe
 import Text.Printf
 import Control.Exception
 
-import qualified Text as T
-import Text.Internal
-import qualified Text.Fusion as S
-import Text.Fusion (Encoding(..))
+import qualified Data.Text as T
+import Data.Text.Internal
+import qualified Data.Text.Fusion as S
+import Data.Text.Fusion (Encoding(..))
 
 import qualified Data.List as L
 import qualified Data.ByteString as B
@@ -183,4 +181,4 @@ smp_sip_tests = [
                  ("take",
                   [F (app1 $ T.take 30000000),
                    Flist (app2 $ L.take 30000000)])
-                ]
+                ]
diff --git a/tests/BenchUtils.hs b/tests/BenchUtils.hs
@@ -1,13 +1,12 @@
-{-# OPTIONS_GHC -fglasgow-exts -fbang-patterns #-}
-
+{-# LANGUAGE ExistentialQuantification #-}
 module BenchUtils where
 
 import qualified Data.List as L
 import Data.ByteString (ByteString(..))
 import Data.Word
 import Text.Printf
 import System.IO
-import Text.Internal (Text(..))
+import Data.Text.Internal (Text(..))
 import System.Mem
 import System.CPUTime
 import Control.Exception

diff --git a/tests/EncodingBench.hs b/tests/EncodingBench.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# LANGUAGE ExistentialQuantification #-}
 
 import BenchUtils
 import qualified Data.Text.Utf8.Fusion as U8
@@ -103,4 +103,4 @@ smp_sip_tests = [
      [F $ app1 $ S.foldl' (\a w -> a+1::Int) 0 . U8.stream,
       F $ app2 $ S.foldl' (\a w -> a+1::Int) 0 . S.stream,
       F $ app3 $ S.foldl' (\a w -> a+1::Int) 0 . U32.stream])
- ]
+ ]
diff --git a/tests/FusionBench.hs b/tests/FusionBench.hs
@@ -1,12 +1,12 @@
 import Prelude hiding (zip,zip3,fst,snd)
 
 import BenchUtils
-import Char
+import Data.Char
 import qualified Data.List as L
 import qualified Data.ByteString as B
-import qualified Text as T
-import Text.Fusion (Encoding(..))
-import qualified Text.Fusion as S
+import qualified Data.Text as T
+import Data.Text.Fusion (Encoding(..))
+import qualified Data.Text.Fusion as S
 import Text.Printf
 import System.IO
 import System.Mem

diff --git a/tests/Properties.hs b/tests/Properties.hs
@@ -1,13 +1,13 @@
-{-# OPTIONS_GHC -fno-rewrite-rules #-}
+{-# OPTIONS_GHC -fno-enable-rewrite-rules #-}
 
 import Test.QuickCheck
 import Text.Show.Functions
 
 import Prelude 
-import qualified Text as T
-import Text (pack,unpack)
-import qualified Text.Fusion as S
-import Text.Fusion (unstream,stream)
+import qualified Data.Text as T
+import Data.Text (pack,unpack)
+import qualified Data.Text.Fusion as S
+import Data.Text.Fusion (unstream,stream)
 import qualified Data.List as L
 
 

diff --git a/tests/QuickCheckUtils.hs b/tests/QuickCheckUtils.hs
@@ -3,15 +3,15 @@ module QuickCheckUtils where
 import Test.QuickCheck
 import Test.QuickCheck.Batch
 
-import Char
+import Data.Char
 
-import Text
-import Text.Internal
+import Data.Text
+import Data.Text.Internal
 
 instance Arbitrary Char where
     arbitrary    = oneof [choose ('\0','\55295'), choose ('\57334','\1114111')]
     coarbitrary c = variant (ord c `rem` 4)
 
 instance Arbitrary Text where
     arbitrary     = pack `fmap` arbitrary
-    coarbitrary s = coarbitrary (unpack s)
+    coarbitrary s = coarbitrary (unpack s)