From a5b2186d9c14a9b018bf417cc902f96b4a06ad46 Mon Sep 17 00:00:00 2001 From: sof Date: Wed, 5 Dec 2001 19:24:53 +0000 Subject: [PATCH] [project @ 2001-12-05 19:24:53 by sof] oops, changes not tested with a stage2 build --- ghc/compiler/ghci/InteractiveUI.hs | 6 +++--- ghc/compiler/utils/Panic.lhs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/ghci/InteractiveUI.hs b/ghc/compiler/ghci/InteractiveUI.hs index 4f08243..06dc5e9 100644 --- a/ghc/compiler/ghci/InteractiveUI.hs +++ b/ghc/compiler/ghci/InteractiveUI.hs @@ -1,6 +1,6 @@ {-# OPTIONS -#include "Linker.h" -#include "SchedAPI.h" #-} ----------------------------------------------------------------------------- --- $Id: InteractiveUI.hs,v 1.102 2001/12/05 00:06:32 sof Exp $ +-- $Id: InteractiveUI.hs,v 1.103 2001/12/05 19:24:53 sof Exp $ -- -- GHC Interactive User Interface -- @@ -35,7 +35,7 @@ import OccName ( isSymOcc ) import BasicTypes ( defaultFixity ) import Outputable import CmdLineOpts ( DynFlag(..), getDynFlags, saveDynFlags, restoreDynFlags, dopt_unset ) -import Panic ( GhcException(..) ) +import Panic ( GhcException(..), showGhcException ) import Config #ifndef mingw32_TARGET_OS @@ -323,7 +323,7 @@ showException (DynException dyn) = Nothing -> io (putStrLn ("*** Exception: (unknown)")) Just Interrupted -> io (putStrLn "Interrupted.") Just (CmdLineError s) -> io (putStrLn s) -- omit the location for CmdLineError - Just ph@PhaseFailed{} -> io (putStrLn (showGhcException ph)) -- ditto + Just ph@PhaseFailed{} -> io (putStrLn (showGhcException ph "")) -- ditto Just other_ghc_ex -> io (print other_ghc_ex) showException other_exception diff --git a/ghc/compiler/utils/Panic.lhs b/ghc/compiler/utils/Panic.lhs index b6e1f0f..e4c8cda 100644 --- a/ghc/compiler/utils/Panic.lhs +++ b/ghc/compiler/utils/Panic.lhs @@ -12,7 +12,8 @@ some unnecessary loops in the module dependency graph. module Panic ( GhcException(..), ghcError, progName, - panic, panic#, assertPanic, trace + panic, panic#, assertPanic, trace, + showGhcException ) where import Config -- 1.7.10.4