diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-01-30 13:16:25 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-01-30 17:43:44 +0000 |
| commit | e66b09ee73e7589c8b16a4e5f0bdef72c8bcd62d (patch) | |
| tree | 2140131bd8bdfcc98470ef2226a73afdbf0a2c83 | |
| parent | 7a6aa9116d0e0518302ea443256b747e9070bed2 (diff) | |
| download | haskell-e66b09ee73e7589c8b16a4e5f0bdef72c8bcd62d.tar.gz | |
Change a few throwGhcException uses to throwGhcExceptionIO
| -rw-r--r-- | compiler/ghci/ByteCodeLink.lhs | 2 | ||||
| -rw-r--r-- | compiler/ghci/LibFFI.hsc | 4 | ||||
| -rw-r--r-- | 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 6fcb7f4f66..06421dc1db 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 c939801f97..d3759f3c09 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 adcb0eb3b3..889a09de20 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 |