From 6a35ffaf70347d9e10b5c009c2f296e2717520f3 Mon Sep 17 00:00:00 2001 From: simonpj Date: Fri, 8 Apr 2005 16:48:49 +0000 Subject: [PATCH] [project @ 2005-04-08 16:48:49 by simonpj] Wibble to ghci --- ghc/compiler/typecheck/TcRnDriver.lhs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs index ea800bf..fbd13d8 100644 --- a/ghc/compiler/typecheck/TcRnDriver.lhs +++ b/ghc/compiler/typecheck/TcRnDriver.lhs @@ -81,8 +81,8 @@ import Outputable #ifdef GHCI import HsSyn ( HsStmtContext(..), Stmt(..), HsExpr(..), HsBindGroup(..), LStmt, LHsExpr, LHsType, mkMatchGroup, - collectLStmtsBinders, mkSimpleMatch, - mkExprStmt, mkBindStmt, nlVarPat ) + collectLStmtsBinders, mkSimpleMatch, nlVarPat, + placeHolderType, noSyntaxExpr ) import RdrName ( GlobalRdrEnv, mkGlobalRdrEnv, GlobalRdrElt(..), Provenance(..), ImportSpec(..), lookupLocalRdrEnv, extendLocalRdrEnv ) @@ -121,7 +121,8 @@ import Var ( globaliseId ) import Name ( nameOccName ) import OccName ( occNameUserString ) import NameEnv ( delListFromNameEnv ) -import PrelNames ( iNTERACTIVE, ioTyConName, printName, itName, returnIOName ) +import PrelNames ( iNTERACTIVE, ioTyConName, printName, itName, + bindIOName, thenIOName, returnIOName ) import HscTypes ( InteractiveContext(..), HomeModInfo(..), typeEnvElts, typeEnvClasses, availNames, availName, ModIface(..), icPrintUnqual, ModDetails(..), Dependencies(..) ) @@ -891,11 +892,13 @@ tcUserStmt (L loc (ExprStmt expr _ _)) traceTc (text "tcs 1b") ; tc_stmts (map (L loc) [ LetStmt [HsBindGroup (unitBag the_bind) [] NonRecursive], - mkExprStmt (nlHsApp (nlHsVar printName) (nlHsVar fresh_it)) + ExprStmt (nlHsApp (nlHsVar printName) (nlHsVar fresh_it)) + (HsVar thenIOName) placeHolderType ]) }) (do { -- Try this first traceTc (text "tcs 1a") ; - tc_stmts [L loc (mkBindStmt (nlVarPat fresh_it) expr)] }) + tc_stmts [L loc (BindStmt (nlVarPat fresh_it) expr + (HsVar bindIOName) noSyntaxExpr) ] }) tcUserStmt stmt = tc_stmts [stmt] -- 1.7.10.4