[project @ 2003-05-19 12:11:14 by simonmar]

tryM again: make it work with GHC 5.02.x (I hope).  Seems we changed
the representation of UserErrors several times in the last few
releases...

diff --git a/ghc/compiler/typecheck/TcRnTypes.lhs b/ghc/compiler/typecheck/TcRnTypes.lhs
index 5f032a5..6140efd 100644 (file)
--- a/ghc/compiler/typecheck/TcRnTypes.lhs
+++ b/ghc/compiler/typecheck/TcRnTypes.lhs
@@ -163,7 +163,9 @@ tryM (TcRn thing) = TcRn (\ env -> tryJust tc_errors (thing env))
   where 
 #if __GLASGOW_HASKELL__ > 504 || __GLASGOW_HASKELL__ < 500
        tc_errors e@(IOException ioe) | isUserError ioe = Just e
-#else
+#elif __GLASGOW_HASKELL__ == 502
+       tc_errors (UserError _) = Just e
+#else 
        tc_errors e@(IOException ioe) | isUserError e = Just e
 #endif
        tc_errors _other = Nothing