@@ -1,6 +1,6 @@
1-- | General quicktest properties for the text library
1-- | General quicktest properties for the text library
3−{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, OverloadedStrings,
3+{-# LANGUAGE BangPatterns, FlexibleInstances, OverloadedStrings,
4 ScopedTypeVariables, TypeSynonymInstances #-}
4 ScopedTypeVariables, TypeSynonymInstances #-}
5{-# OPTIONS_GHC -fno-enable-rewrite-rules #-}
5{-# OPTIONS_GHC -fno-enable-rewrite-rules #-}
6{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
6{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
@@ -15,7 +15,6 @@ import Text.Show.Functions ()
16import Control.Applicative ((<$>), (<*>))
16import Control.Applicative ((<$>), (<*>))
17import Control.Arrow ((***), second)
17import Control.Arrow ((***), second)
18−import Control.Exception (catch)
19import Data.Bits ((.&.))
18import Data.Bits ((.&.))
20import Data.Char (chr, isDigit, isHexDigit, isLower, isSpace, isUpper, ord)
19import Data.Char (chr, isDigit, isHexDigit, isLower, isSpace, isUpper, ord)
21import Data.Int (Int8, Int16, Int32, Int64)
20import Data.Int (Int8, Int16, Int32, Int64)
@@ -32,6 +31,7 @@ import Data.Word (Word, Word8, Word16, Word32, Word64)
32import Numeric (showHex)
31import Numeric (showHex)
33import Test.Framework (Test, testGroup)
32import Test.Framework (Test, testGroup)
34import Test.Framework.Providers.QuickCheck2 (testProperty)
33import Test.Framework.Providers.QuickCheck2 (testProperty)
34+import qualified Control.Exception as Exception
35import qualified Data.Bits as Bits (shiftL, shiftR)
35import qualified Data.Bits as Bits (shiftL, shiftR)
36import qualified Data.ByteString as B
36import qualified Data.ByteString as B
37import qualified Data.ByteString.Lazy as BL
37import qualified Data.ByteString.Lazy as BL
@@ -56,11 +56,7 @@ import Tests.QuickCheckUtils
56import Tests.Utils
56import Tests.Utils
57import qualified Tests.SlowFunctions as Slow
57import qualified Tests.SlowFunctions as Slow
59−#if MIN_VERSION_base(4,6,0)
60import Prelude hiding (replicate)
59import Prelude hiding (replicate)
62−import Prelude hiding (catch, replicate)
65t_pack_unpack = (T.unpack . T.pack) `eq` id
61t_pack_unpack = (T.unpack . T.pack) `eq` id
66tl_pack_unpack = (TL.unpack . TL.pack) `eq` id
62tl_pack_unpack = (TL.unpack . TL.pack) `eq` id
@@ -130,7 +126,7 @@ t_utf8_err bad de = do
130 onErr <- genDecodeErr de
126 onErr <- genDecodeErr de
131 monadicIO $ do
127 monadicIO $ do
132 l <- run $ let len = T.length (E.decodeUtf8With onErr bs)
128 l <- run $ let len = T.length (E.decodeUtf8With onErr bs)
133− in (len `seq` return (Right len)) `catch`
129+ in (len `seq` return (Right len)) `Exception.catch`
134 (\(e::UnicodeException) -> return (Left e))
130 (\(e::UnicodeException) -> return (Left e))
135 assert $ case l of
131 assert $ case l of
136 Left err -> length (show err) >= 0
132 Left err -> length (show err) >= 0