X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=5a669b4b749ca392a004b07208c989ee12ab904a;hb=fb6d198f498d4e325a540f28aaa6e1d1530839c3;hp=4d9055fa8a533f1f42b45dc3021bf8e5816c3d2b;hpb=a0d2e0fb1a6b717ad5ecf7bfaa208863af4378ab;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 4d9055f..5a669b4 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -111,8 +111,6 @@ import Data.Maybe	( isJust )
 #include "HsVersions.h"
 \end{code}
 
-
-
 %************************************************************************
 %*									*
 	Typecheck and rename a module
@@ -130,7 +128,7 @@ tcRnModule :: HscEnv
 tcRnModule hsc_env hsc_src save_rn_syntax
 	 (L loc (HsModule maybe_mod export_ies 
 			  import_decls local_decls mod_deprec
-			  module_info maybe_doc))
+			  maybe_doc_hdr))
  = do { showPass (hsc_dflags hsc_env) "Renamer/typechecker" ;
 
    let { this_pkg = thisPackage (hsc_dflags hsc_env) ;
@@ -188,8 +186,9 @@ tcRnModule hsc_env hsc_src save_rn_syntax
 	-- because the latter might add new bindings for boot_dfuns, 
 	-- which may be mentioned in imported unfoldings
 
-		-- Rename the Haddock documentation 
-	tcg_env <- rnHaddock module_info maybe_doc tcg_env ;
+		-- Don't need to rename the Haddock documentation,
+		-- it's not parsed by GHC anymore.
+	tcg_env <- return (tcg_env { tcg_doc_hdr = maybe_doc_hdr }) ;
 
 		-- Report unused names
  	reportUnusedNames export_ies tcg_env ;
@@ -556,6 +555,15 @@ checkHiBootIface
 		-- Check the exports of the boot module, one by one
 	; mapM_ check_export boot_exports
 
+		-- 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 ]
+
 		-- Check for no family instances
 	; unless (null boot_fam_insts) $
 	    panic ("TcRnDriver.checkHiBootIface: Cannot handle family " ++
@@ -570,7 +578,7 @@ checkHiBootIface
 	      final_type_env = extendTypeEnvWithIds local_type_env boot_dfuns
 	      dfun_prs   = catMaybes mb_dfun_prs
 	      boot_dfuns = map fst dfun_prs
-	      dfun_binds = listToBag [ noLoc $ VarBind boot_dfun (nlHsVar dfun)
+	      dfun_binds = listToBag [ mkVarBind boot_dfun (nlHsVar dfun)
 				     | (boot_dfun, dfun) <- dfun_prs ]
 
         ; failIfErrsM
@@ -930,7 +938,7 @@ check_main dflags tcg_env
 						    (mkTyConApp ioTyCon [res_ty])
 	      ; co  = mkWpTyApps [res_ty]
 	      ; rhs = nlHsApp (mkLHsWrap co (nlHsVar run_main_id)) main_expr
-	      ; main_bind = noLoc (VarBind root_main_id rhs) }
+	      ; main_bind = mkVarBind root_main_id rhs }
 
 	; return (tcg_env { tcg_binds = tcg_binds tcg_env 
 					`snocBag` main_bind,
@@ -1393,7 +1401,7 @@ tcRnGetInfo :: HscEnv
 	    -> Name
 	    -> IO (Messages, Maybe (TyThing, Fixity, [Instance]))
 
--- Used to implemnent :info in GHCi
+-- Used to implement :info in GHCi
 --
 -- Look up a RdrName and return all the TyThings it might be
 -- A capitalised RdrName is given to us in the DataName namespace,