projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 'GhcMonad' in ghci/InteractiveUI.
[ghc-hetmet.git]
/
compiler
/
ghci
/
LibFFI.hsc
diff --git
a/compiler/ghci/LibFFI.hsc
b/compiler/ghci/LibFFI.hsc
index
7f24d01
..
e73b023
100644
(file)
--- a/
compiler/ghci/LibFFI.hsc
+++ b/
compiler/ghci/LibFFI.hsc
@@
-22,7
+22,6
@@
import Constants
import Foreign
import Foreign.C
import Text.Printf
import Foreign
import Foreign.C
import Text.Printf
-import Control.Exception
----------------------------------------------------------------------------
----------------------------------------------------------------------------
@@
-45,7
+44,7
@@
prepForeignCall cconv arg_types result_type
let res_ty = primRepToFFIType result_type
r <- ffi_prep_cif cif abi (fromIntegral n_args) res_ty arg_arr
if (r /= fFI_OK)
let res_ty = primRepToFFIType result_type
r <- ffi_prep_cif cif abi (fromIntegral n_args) res_ty arg_arr
if (r /= fFI_OK)
- then throwDyn (InstallationError
+ then ghcError (InstallationError
(printf "prepForeignCallFailed: %d" (show r)))
else return cif
(printf "prepForeignCallFailed: %d" (show r)))
else return cif