Adapt to removal of catch from Prelude

4 files changed, 15 insertions, 3 deletions

diff --git a/libraries/base/tests/enum01.hs b/libraries/base/tests/enum01.hs
index d8178667eb..8b490bb549 100644
--- a/libraries/base/tests/enum01.hs
+++ b/libraries/base/tests/enum01.hs
@@ -1,8 +1,11 @@
 -- !!! Testing the Prelude's Enum instances.
+{-# LANGUAGE CPP #-}
 module Main(main) where
 
 import Control.Exception
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 import Data.Char
 import Data.Ratio
 
diff --git a/libraries/base/tests/enum02.hs b/libraries/base/tests/enum02.hs
index 3ba9d4912d..95812e592d 100644
--- a/libraries/base/tests/enum02.hs
+++ b/libraries/base/tests/enum02.hs
@@ -1,8 +1,11 @@
 -- !!! Testing the Int Enum instances.
+{-# LANGUAGE CPP #-}
 module Main(main) where
 
 import Control.Exception
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 import Data.Int
 
 main = do
diff --git a/libraries/base/tests/enum03.hs b/libraries/base/tests/enum03.hs
index 908f3dd1a0..9f730a9aa1 100644
--- a/libraries/base/tests/enum03.hs
+++ b/libraries/base/tests/enum03.hs
@@ -1,7 +1,10 @@
 -- !!! Testing the Word Enum instances.
+{-# LANGUAGE CPP #-}
 module Main(main) where
 
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 import Control.Exception
 import Data.Word
 import Data.Int
diff --git a/libraries/base/tests/list001.hs b/libraries/base/tests/list001.hs
index c0a1eced27..cec5f9940e 100644
--- a/libraries/base/tests/list001.hs
+++ b/libraries/base/tests/list001.hs
@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
 import Data.List
 import Control.Exception
+#if __GLASGOW_HASKELL__ < 705
 import Prelude hiding (catch)
+#endif
 
 -- This module briefly tests all the functions in PrelList and a few
 -- from List.
@@ -146,7 +149,7 @@ main = do
   print [delete 1 [0,1,1,2,3,4], 
 	 delete (error "delete") []]
   
-  -- \\
-  print [ [0,1,1,2,3,4] \\ [3,2,1],  
-	  [1,2,3,4] \\ [],  
+  -- (\\)
+  print [ [0,1,1,2,3,4] \\ [3,2,1],
+          [1,2,3,4] \\ [],
 	  [] \\ [error "\\\\"] ]