[commit: ghc] master: Change a few throwGhcException uses to throwGhcExceptionIO (e66b09e)

Ian Lynagh igloo at earth.li
Thu Jan 31 01:29:39 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e66b09ee73e7589c8b16a4e5f0bdef72c8bcd62d

>---------------------------------------------------------------

commit e66b09ee73e7589c8b16a4e5f0bdef72c8bcd62d
Author: Ian Lynagh <ian at well-typed.com>
Date:   Wed Jan 30 13:16:25 2013 +0000

    Change a few throwGhcException uses to throwGhcExceptionIO

>---------------------------------------------------------------

 compiler/ghci/ByteCodeLink.lhs  |    2 +-
 compiler/ghci/LibFFI.hsc        |    4 ++--
 compiler/main/DynamicLoading.hs |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/ghci/ByteCodeLink.lhs b/compiler/ghci/ByteCodeLink.lhs
index 6fcb7f4..06421dc 100644
--- a/compiler/ghci/ByteCodeLink.lhs
+++ b/compiler/ghci/ByteCodeLink.lhs
@@ -240,7 +240,7 @@ lookupIE dflags ie con_nm
 
 linkFail :: String -> String -> IO a
 linkFail who what
-   = throwGhcException (ProgramError $
+   = throwGhcExceptionIO (ProgramError $
         unlines [ "",who
                 , "During interactive linking, GHCi couldn't find the following symbol:"
                 , ' ' : ' ' : what
diff --git a/compiler/ghci/LibFFI.hsc b/compiler/ghci/LibFFI.hsc
index c939801..d3759f3 100644
--- a/compiler/ghci/LibFFI.hsc
+++ b/compiler/ghci/LibFFI.hsc
@@ -44,8 +44,8 @@ prepForeignCall dflags cconv arg_types result_type
     let res_ty = primRepToFFIType dflags result_type
     r <- ffi_prep_cif cif abi (fromIntegral n_args) res_ty arg_arr
     if (r /= fFI_OK)
-       then throwGhcException (InstallationError
-                                   ("prepForeignCallFailed: " ++ show r))
+       then throwGhcExceptionIO (InstallationError
+                                     ("prepForeignCallFailed: " ++ show r))
        else return cif
 
 convToABI :: CCallConv -> C_ffi_abi
diff --git a/compiler/main/DynamicLoading.hs b/compiler/main/DynamicLoading.hs
index adcb0eb..889a09d 100644
--- a/compiler/main/DynamicLoading.hs
+++ b/compiler/main/DynamicLoading.hs
@@ -35,7 +35,7 @@ import TyCon            ( TyCon )
 import Name             ( Name, nameModule_maybe )
 import Id               ( idType )
 import Module           ( Module, ModuleName )
-import Panic            ( GhcException(..), throwGhcException )
+import Panic
 import FastString
 import ErrUtils
 import Outputable
@@ -165,5 +165,5 @@ throwCmdLineErrorS :: DynFlags -> SDoc -> IO a
 throwCmdLineErrorS dflags = throwCmdLineError . showSDoc dflags
 
 throwCmdLineError :: String -> IO a
-throwCmdLineError = throwGhcException . CmdLineError
+throwCmdLineError = throwGhcExceptionIO . CmdLineError
 #endif





More information about the ghc-commits mailing list