986cba2 · text · git.iko.soy

git.iko.soy/text

ghc 7.5 removed catch from Prelude

commit986cba2a837a82ffb41b5e6d93c1239ae92029e4 authorMark Wright <gienah@gentoo.org> dateThu 28 Jun 2012, 13:51 (14 years ago) parent6e29fac

4 files changed+17−3

compare with master

unifiedsplit

Data/Text/IO.hs+5−1 Data/Text/IO/Internal.hs+2 Data/Text/Lazy/IO.hs+5−1 tests/tests/src/Data/Text/Tests/Properties.hs+5−1

Data/Text/IO.hs+5−1

@@ -38,7 +38,11 @@ module Data.Text.IO

3838 ) where

3939

4040import Data.Text (Text)

41−import Prelude hiding (appendFile, catch, getContents, getLine, interact,

41+import Prelude hiding (appendFile,

42+#if !MIN_VERSION_base(4,6,0)

43+ catch,

44+#endif

45+ getContents, getLine, interact,

4246 putStr, putStrLn, readFile, writeFile)

4347import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

4448 withFile)

Data/Text/IO/Internal.hs+2

@@ -32,7 +32,9 @@ import GHC.IO.Buffer (Buffer(..), CharBuffer, RawCharBuffer, bufferAdjustL,

3232 withRawBuffer, writeCharBuf)

3333import GHC.IO.Handle.Internals (ioe_EOF, readTextDevice, wantReadableHandle_)

3434import GHC.IO.Handle.Types (Handle__(..), Newline(..))

35+#if !MIN_VERSION_base(4,6,0)

3536import Prelude hiding (catch)

37+#endif

3638import System.IO (Handle)

3739import System.IO.Error (isEOFError)

3840import qualified Data.Text as T

Data/Text/Lazy/IO.hs+5−1

@@ -38,7 +38,11 @@ module Data.Text.Lazy.IO

3838 ) where

3939

4040import Data.Text.Lazy (Text)

41−import Prelude hiding (appendFile, catch, getContents, getLine, interact,

41+import Prelude hiding (appendFile,

42+#if !MIN_VERSION_base(4,6,0)

43+ catch,

44+#endif

45+ getContents, getLine, interact,

4246 putStr, putStrLn, readFile, writeFile)

4347import System.IO (Handle, IOMode(..), hPutChar, openFile, stdin, stdout,

4448 withFile)

tests/tests/src/Data/Text/Tests/Properties.hs+5−1

@@ -26,7 +26,11 @@ import Data.Text.Read as T

2626import Data.Text.Search (indices)

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

2828import Numeric (showHex)

29−import Prelude hiding (catch, replicate)

29+import Prelude hiding (

30+#if !MIN_VERSION_base(4,6,0)

31+ catch,

32+#endif

33+ replicate)

3034import Test.Framework (Test, testGroup)

3135import Test.Framework.Providers.QuickCheck2 (testProperty)

3236import qualified Data.Bits as Bits (shiftL, shiftR)