[project @ 2000-12-12 14:42:43 by simonmar]

wibble: get the exception handlers round the right way

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 23d82e8..c925ede 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -fno-warn-incomplete-patterns #-}
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.38 2000/12/12 14:35:08 simonmar Exp $
+-- $Id: Main.hs,v 1.39 2000/12/12 14:42:43 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -91,6 +91,9 @@ import Maybe
 -- Main loop
 
 main =
+  -- top-level exception handler: any unrecognised exception is a compiler bug.
+  handle (\exception -> hPutStr stderr (show (Panic (show exception)))) $ do
+
   -- all error messages are propagated as exceptions
   handleDyn (\dyn -> case dyn of
                          PhaseFailed _phase code -> exitWith code
@@ -99,9 +102,6 @@ main =
                                  exitWith (ExitFailure 1)
              ) $ do
 
-  -- top-level exception handler: any unrecognised exception is a compiler bug.
-  handle (\exception -> panic (show exception)) $ do
-
    -- make sure we clean up after ourselves
    later (do  forget_it <- readIORef v_Keep_tmp_files
              unless forget_it $ do