projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the lock around NameCache for readBinIface.
[ghc-hetmet.git]
/
ghc
/
GhciMonad.hs
diff --git
a/ghc/GhciMonad.hs
b/ghc/GhciMonad.hs
index
ff34963
..
e065387
100644
(file)
--- a/
ghc/GhciMonad.hs
+++ b/
ghc/GhciMonad.hs
@@
-30,13
+30,13
@@
import qualified MonadUtils
import qualified ErrUtils
import Exception
import qualified ErrUtils
import Exception
-import Data.Maybe
+-- import Data.Maybe
import Numeric
import Data.Array
import Numeric
import Data.Array
-import Data.Char
+-- import Data.Char
import Data.Int ( Int64 )
import Data.IORef
import Data.Int ( Int64 )
import Data.IORef
-import Data.List
+-- import Data.List
import System.CPUTime
import System.Environment
import System.IO
import System.CPUTime
import System.Environment
import System.IO
@@
-262,7
+262,7
@@
setLogAction :: InputT GHCi ()
setLogAction = do
encoder <- getEncoder
dflags <- GHC.getSessionDynFlags
setLogAction = do
encoder <- getEncoder
dflags <- GHC.getSessionDynFlags
- GHC.setSessionDynFlags dflags {log_action = logAction encoder}
+ _ <- GHC.setSessionDynFlags dflags {log_action = logAction encoder}
return ()
where
logAction encoder severity srcSpan style msg = case severity of
return ()
where
logAction encoder severity srcSpan style msg = case severity of
@@
-369,9
+369,8
@@
initInterpBuffering = do -- make sure these are linked
let f ref (Just ptr) = writeIORef ref ptr
f _ Nothing = panic "interactiveUI:setBuffering2"
let f ref (Just ptr) = writeIORef ref ptr
f _ Nothing = panic "interactiveUI:setBuffering2"
- zipWithM f [stdin_ptr,stdout_ptr,stderr_ptr]
- [mb_stdin_ptr,mb_stdout_ptr,mb_stderr_ptr]
- return ()
+ zipWithM_ f [stdin_ptr,stdout_ptr,stderr_ptr]
+ [mb_stdin_ptr,mb_stdout_ptr,mb_stderr_ptr]
flushInterpBuffers :: GHCi ()
flushInterpBuffers
flushInterpBuffers :: GHCi ()
flushInterpBuffers