X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=069446fb43504d6abbef56ae027840e745d729bb;hb=de1a1f9f882cf1a5c81c4a152edc001aafd3f8a3;hp=f8c6c4c4d38e3a72d3c3ddd2b297940f62a7cc07;hpb=85f969a6585c06168645114d9524e7169dbc6e32;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index f8c6c4c..069446f 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -5,12 +5,6 @@
 \section[TcModule]{Typechecking a whole module}
 
 \begin{code}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module TcRnDriver (
 #ifdef GHCI
 	tcRnStmt, tcRnExpr, tcRnType,
@@ -31,7 +25,6 @@ import {-# SOURCE #-} TcSplice ( tcSpliceDecls )
 import DynFlags
 import StaticFlags
 import HsSyn
-import RdrHsSyn
 import PrelNames
 import RdrName
 import TcHsSyn
@@ -66,7 +59,7 @@ import Id
 import VarEnv
 import Var
 import Module
-import LazyUniqFM
+import UniqFM
 import Name
 import NameEnv
 import NameSet
@@ -417,7 +410,7 @@ tc_rn_src_decls :: ModDetails -> [LHsDecl RdrName] -> TcM (TcGblEnv, TcLclEnv)
 -- Loops around dealing with each top level inter-splice group 
 -- in turn, until it's dealt with the entire module
 tc_rn_src_decls boot_details ds
- = do { let { (first_group, group_tail) = findSplice ds } ;
+ = do { (first_group, group_tail) <- findSplice ds  ;
 		-- If ds is [] we get ([], Nothing)
 
 	-- Deal with decls up to, but not including, the first splice
@@ -440,7 +433,7 @@ tc_rn_src_decls boot_details ds
 	failWithTc (text "Can't do a top-level splice; need a bootstrapped compiler")
 #else
 	-- If there's a splice, we must carry on
-	   Just (SpliceDecl splice_expr, rest_ds) -> do {
+	   Just (SpliceDecl splice_expr _, rest_ds) -> do {
 
 	-- Rename the splice expression, and get its supporting decls
 	(rn_splice_expr, splice_fvs) <- checkNoErrs (rnLExpr splice_expr) ;
@@ -467,7 +460,7 @@ tc_rn_src_decls boot_details ds
 \begin{code}
 tcRnHsBootDecls :: [LHsDecl RdrName] -> TcM TcGblEnv
 tcRnHsBootDecls decls
-   = do { let { (first_group, group_tail) = findSplice decls }
+   = do { (first_group, group_tail) <- findSplice decls
 
 		-- Rename the declarations
 	; (tcg_env, HsGroup { 
@@ -484,8 +477,8 @@ tcRnHsBootDecls decls
 
 		-- Check for illegal declarations
 	; case group_tail of
-	     Just (SpliceDecl d, _) -> badBootDecl "splice" d
-	     Nothing                -> return ()
+	     Just (SpliceDecl d _, _) -> badBootDecl "splice" d
+	     Nothing                  -> return ()
 	; mapM_ (badBootDecl "foreign") for_decls
 	; mapM_ (badBootDecl "default") def_decls
 	; mapM_ (badBootDecl "rule")    rule_decls
@@ -573,15 +566,19 @@ checkHiBootIface
 
 		-- Check instance declarations
 	; mb_dfun_prs <- mapM check_inst boot_insts
-	; let tcg_env' = tcg_env { tcg_binds    = binds `unionBags` dfun_binds,
-				   tcg_type_env = extendTypeEnvWithIds local_type_env boot_dfuns }
-	      dfun_prs   = catMaybes mb_dfun_prs
-	      boot_dfuns = map fst dfun_prs
-	      dfun_binds = listToBag [ mkVarBind boot_dfun (nlHsVar dfun)
-				     | (boot_dfun, dfun) <- dfun_prs ]
+        ; let dfun_prs   = catMaybes mb_dfun_prs
+              boot_dfuns = map fst dfun_prs
+              dfun_binds = listToBag [ mkVarBind boot_dfun (nlHsVar dfun)
+                                     | (boot_dfun, dfun) <- dfun_prs ]
+              type_env'  = extendTypeEnvWithIds local_type_env boot_dfuns
+              tcg_env'   = tcg_env { tcg_binds = binds `unionBags` dfun_binds }
 
         ; failIfErrsM
-	; return tcg_env' }
+	; setGlobalTypeEnv tcg_env' type_env' }
+	     -- Update the global type env *including* the knot-tied one
+             -- so that if the source module reads in an interface unfolding
+             -- mentioning one of the dfuns from the boot module, then it
+             -- can "see" that boot dfun.   See Trac #4003
   where
     check_export boot_avail	-- boot_avail is exported by the boot iface
       | name `elem` dfun_names = return ()	
@@ -1205,7 +1202,7 @@ mkPlan (L loc (ExprStmt expr _ _))	-- An expression typed at the prompt
 	  ]}
 
 mkPlan stmt@(L loc (BindStmt {}))
-  | [L _ v] <- collectLStmtBinders stmt		-- One binder, for a bind stmt 
+  | [v] <- collectLStmtBinders stmt		-- One binder, for a bind stmt 
   = do	{ let print_v  = L loc $ ExprStmt (nlHsApp (nlHsVar printName) (nlHsVar v))
 			          	   (HsVar thenIOName) placeHolderType
 
@@ -1236,7 +1233,7 @@ tcGhciStmts stmts
 	    io_ret_ty = mkTyConApp ioTyCon [ret_ty] ;
 	    tc_io_stmts stmts = tcStmts GhciStmt tcDoStmt stmts io_ret_ty ;
 
-	    names = map unLoc (collectLStmtsBinders stmts) ;
+	    names = collectLStmtsBinders stmts ;
 
 		-- mk_return builds the expression
 		--	returnIO @ [()] [coerce () x, ..,  coerce () z]
@@ -1344,7 +1341,7 @@ getModuleExports :: HscEnv -> Module -> IO (Messages, Maybe [AvailInfo])
 getModuleExports hsc_env mod
   = let
       ic        = hsc_IC hsc_env
-      checkMods = ic_toplev_scope ic ++ ic_exports ic
+      checkMods = ic_toplev_scope ic ++ map fst (ic_exports ic)
     in
     initTc hsc_env HsSrcFile False iNTERACTIVE (tcGetModuleExports mod checkMods)