From: ross <unknown>
Date: Wed, 6 Nov 2002 20:30:26 +0000 (+0000)
Subject: [project @ 2002-11-06 20:30:26 by ross]
X-Git-Tag: nhc98-1-18-release~802
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4a23897f8c70e20c27c61e48ac9db94c39bdb6e3;p=ghc-base.git

[project @ 2002-11-06 20:30:26 by ross]
Hugs only: move the dummy implementation of evaluate here, to avoid ambiguity.
---

diff --git a/Control/Exception.hs b/Control/Exception.hs
index 8086b22..5b653e2 100644
--- a/Control/Exception.hs
+++ b/Control/Exception.hs
@@ -118,8 +118,7 @@ import GHC.IOBase	( IO(..) )
 #endif
 
 #ifdef __HUGS__
-import Hugs.Exception	hiding ( evaluate )
-import qualified Hugs.Exception as ExceptionBase
+import Hugs.Exception	as ExceptionBase
 #endif
 
 import Prelude 		hiding ( catch )
@@ -241,7 +240,7 @@ evaluate a = IO $ \s -> case a `seq` () of () -> (# s, a #)
 	-- 	a `seq` (# s, a #)
 	-- because we can't have an unboxed tuple as a function argument
 #elif defined(__HUGS__)
-evaluate = ExceptionBase.evaluate
+evaluate a = a `seq` return a	-- dummy implementation: to be fixed
 #endif
 
 -----------------------------------------------------------------------------