projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement TH reification of instances (Trac #1835)
[ghc-hetmet.git]
/
compiler
/
ghci
/
ObjLink.lhs
diff --git
a/compiler/ghci/ObjLink.lhs
b/compiler/ghci/ObjLink.lhs
index
dad8d47
..
ec91616
100644
(file)
--- a/
compiler/ghci/ObjLink.lhs
+++ b/
compiler/ghci/ObjLink.lhs
@@
-9,8
+9,6
@@
Primarily, this module consists of an interface to the C-land dynamic linker.
\begin{code}
Primarily, this module consists of an interface to the C-land dynamic linker.
\begin{code}
-{-# OPTIONS -#include "Linker.h" #-}
-
module ObjLink (
initObjLinker, -- :: IO ()
loadDLL, -- :: String -> IO (Maybe String)
module ObjLink (
initObjLinker, -- :: IO ()
loadDLL, -- :: String -> IO (Maybe String)
@@
-21,15
+19,14
@@
module ObjLink (
resolveObjs -- :: IO SuccessFlag
) where
resolveObjs -- :: IO SuccessFlag
) where
-import Panic ( panic )
+import Panic
import BasicTypes ( SuccessFlag, successIf )
import Config ( cLeadingUnderscore )
import BasicTypes ( SuccessFlag, successIf )
import Config ( cLeadingUnderscore )
-import Outputable
import Control.Monad ( when )
import Foreign.C
import Foreign ( nullPtr )
import Control.Monad ( when )
import Foreign.C
import Foreign ( nullPtr )
-import GHC.Exts ( Ptr(..), unsafeCoerce# )
+import GHC.Exts ( Ptr(..) )
@@
-72,13
+69,13
@@
loadObj :: String -> IO ()
loadObj str = do
withCString str $ \c_str -> do
r <- c_loadObj c_str
loadObj str = do
withCString str $ \c_str -> do
r <- c_loadObj c_str
- when (r == 0) (panic "loadObj: failed")
+ when (r == 0) (panic ("loadObj " ++ show str ++ ": failed"))
unloadObj :: String -> IO ()
unloadObj str =
withCString str $ \c_str -> do
r <- c_unloadObj c_str
unloadObj :: String -> IO ()
unloadObj str =
withCString str $ \c_str -> do
r <- c_unloadObj c_str
- when (r == 0) (panic "unloadObj: failed")
+ when (r == 0) (panic ("unloadObj " ++ show str ++ ": failed"))
resolveObjs :: IO SuccessFlag
resolveObjs = do
resolveObjs :: IO SuccessFlag
resolveObjs = do