projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix :print reconstructing too many types in environment bindings
[ghc-hetmet.git]
/
compiler
/
ghci
/
GhciMonad.hs
diff --git
a/compiler/ghci/GhciMonad.hs
b/compiler/ghci/GhciMonad.hs
index
d56a581
..
d63dfb1
100644
(file)
--- a/
compiler/ghci/GhciMonad.hs
+++ b/
compiler/ghci/GhciMonad.hs
@@
-11,8
+11,9
@@
module GhciMonad where
#include "HsVersions.h"
import qualified GHC
#include "HsVersions.h"
import qualified GHC
-import Outputable
-import Panic hiding (showException)
+import Outputable hiding (printForUser)
+import qualified Outputable
+import Panic hiding (showException)
import Util
import DynFlags
import HscTypes
import Util
import DynFlags
import HscTypes
@@
-42,6
+43,7
@@
data GHCiState = GHCiState
args :: [String],
prompt :: String,
editor :: String,
args :: [String],
prompt :: String,
editor :: String,
+ stop :: String,
session :: GHC.Session,
options :: [GHCiOption],
prelude :: GHC.Module,
session :: GHC.Session,
options :: [GHCiOption],
prelude :: GHC.Module,
@@
-197,11
+199,11
@@
discardResumeContext = do
st <- getGHCiState
setGHCiState st { resume = [] }
st <- getGHCiState
setGHCiState st { resume = [] }
-showForUser :: SDoc -> GHCi String
-showForUser doc = do
+printForUser :: SDoc -> GHCi ()
+printForUser doc = do
session <- getSession
unqual <- io (GHC.getPrintUnqual session)
session <- getSession
unqual <- io (GHC.getPrintUnqual session)
- return $! showSDocForUser unqual doc
+ io $ Outputable.printForUser stdout unqual doc
-- --------------------------------------------------------------------------
-- timing & statistics
-- --------------------------------------------------------------------------
-- timing & statistics