From: simonmar <unknown>
Date: Tue, 15 Oct 2002 11:00:37 +0000 (+0000)
Subject: [project @ 2002-10-15 11:00:37 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1547
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2df806a590e3bdb8c6ab8d3c3b342c6414b87a8d;p=ghc-hetmet.git

[project @ 2002-10-15 11:00:37 by simonmar]
Use Panic.tryMost rather than Exception.try, since we don't want to
catch ^C and panic exceptions.
---

diff --git a/ghc/compiler/typecheck/TcRnTypes.lhs b/ghc/compiler/typecheck/TcRnTypes.lhs
index aa8e8b1..ef32d2e 100644
--- a/ghc/compiler/typecheck/TcRnTypes.lhs
+++ b/ghc/compiler/typecheck/TcRnTypes.lhs
@@ -72,9 +72,10 @@ import Outputable
 import DATA_IOREF	( IORef, newIORef, readIORef, writeIORef )
 import UNSAFE_IO	( unsafeInterleaveIO )
 import FIX_IO		( fixIO )
+import EXCEPTION	( Exception )
 import Maybe		( mapMaybe )
 import List		( nub )
-import Panic		( Exception, try )	-- Get try from Panic to avoid compiler-version troubles
+import Panic		( tryMost )
 \end{code}
 
 
@@ -154,7 +155,7 @@ Error recovery
 \begin{code}
 tryM :: TcRn m r -> TcRn m (Either Exception r)
 -- Reflect exception into TcRn monad
-tryM (TcRn thing) = TcRn (\ env -> try (thing env))
+tryM (TcRn thing) = TcRn (\ env -> tryMost (thing env))
 \end{code}
 
 Lazy interleave