From: simonmar <unknown>
Date: Tue, 12 Dec 2000 14:42:43 +0000 (+0000)
Subject: [project @ 2000-12-12 14:42:43 by simonmar]
X-Git-Tag: Approximately_9120_patches~3117
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f4a58991f551c1d91be720fe7ae30923afe8c210;p=ghc-hetmet.git

[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
--- 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