From: Ross Paterson <ross@soi.city.ac.uk>
Date: Thu, 14 Aug 2008 14:36:50 +0000 (+0000)
Subject: simplify definition of Prelude.catch
X-Git-Tag: 6_10_branch_has_been_forked~46
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b205b53b0078599aa77d9afc759aa333c1f565a1;hp=d704979eea6b9a723af54958c8463319b578638a;p=ghc-base.git

simplify definition of Prelude.catch
---

diff --git a/Prelude.hs b/Prelude.hs
index 76bc847..050da04 100644
--- a/Prelude.hs
+++ b/Prelude.hs
@@ -165,7 +165,9 @@ import GHC.Show
 import GHC.Err   ( error, undefined )
 #endif
 
-import qualified Control.OldException as Old hiding ( throw )
+#ifndef __HUGS__
+import qualified Control.Exception.Base as New (catch)
+#endif
 
 #ifdef __HUGS__
 import Hugs.Prelude
@@ -190,6 +192,7 @@ seq :: a -> b -> b
 seq _ y = y
 #endif
 
+#ifndef __HUGS__
 -- | The 'catch' function establishes a handler that receives any 'IOError'
 -- raised in the action protected by 'catch'.  An 'IOError' is caught by
 -- the most recent handler established by 'catch'.  These handlers are
@@ -209,7 +212,5 @@ seq _ y = y
 -- Non-I\/O exceptions are not caught by this variant; to catch all
 -- exceptions, use 'Control.Exception.catch' from "Control.Exception".
 catch :: IO a -> (IOError -> IO a) -> IO a
-catch io handler = io `Old.catch` handler'
-    where handler' (Old.IOException ioe) = handler ioe
-          handler' e                     = throw e
-
+catch = New.catch
+#endif /* !__HUGS__ */