X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2FGhciMonad.hs;h=e0653871b8d28506d0d74606689a21dd47b15790;hp=ff34963b6347c06e48a84abd551947a9603cd4d5;hb=d436c70d43fb905c63220040168295e473f4b90a;hpb=1c83695b5b9ae3175c18908c1d58aeadb1f225ae diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index ff34963..e065387 100644 --- a/ghc/GhciMonad.hs +++ b/ghc/GhciMonad.hs @@ -30,13 +30,13 @@ import qualified MonadUtils import qualified ErrUtils import Exception -import Data.Maybe +-- import Data.Maybe import Numeric import Data.Array -import Data.Char +-- import Data.Char import Data.Int ( Int64 ) import Data.IORef -import Data.List +-- import Data.List import System.CPUTime import System.Environment import System.IO @@ -262,7 +262,7 @@ setLogAction :: InputT GHCi () 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 @@ -369,9 +369,8 @@ initInterpBuffering = do -- make sure these are linked 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