X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=591ea5e2c16d97240f620b29ba0294dc73ee5f97;hb=aedb94f5f220b5e442b23ecc445fd38c8d9b6ba0;hp=789ffbcb83e40c18fbdf9002a482c3c8363e89b9;hpb=08a9d7341402232672fcff9062454e6ba1ae8bd1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 789ffbc..591ea5e 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -45,6 +45,7 @@ import Inst
 import FamInst
 import InstEnv
 import FamInstEnv
+import TcAnnotations
 import TcBinds
 import TcDefaults
 import TcEnv
@@ -319,7 +320,8 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 	my_exports = map (Avail . idName) bndrs ;
 		-- ToDo: export the data types also?
 
-	final_type_env = extendTypeEnvWithIds (tcg_type_env tcg_env) bndrs ;
+	final_type_env = 
+             extendTypeEnvWithIds (tcg_type_env tcg_env) bndrs ;
 
 	mod_guts = ModGuts {	mg_module    = this_mod,
 				mg_boot	     = False,
@@ -390,8 +392,10 @@ tcRnSrcDecls boot_iface decls
 	    -- Even tcSimplifyTop may do some unification.
         traceTc (text "Tc9") ;
 	let { (tcg_env, _) = tc_envs
-	    ; TcGblEnv { tcg_type_env = type_env, tcg_binds = binds, 
-		         tcg_rules = rules, tcg_fords = fords } = tcg_env
+	    ; TcGblEnv { tcg_type_env = type_env,
+		         tcg_binds = binds,
+		         tcg_rules = rules,
+		         tcg_fords = fords } = tcg_env
 	    ; all_binds = binds `unionBags` inst_binds } ;
 
 	failIfErrsM ;	-- Don't zonk if there have been errors
@@ -468,26 +472,32 @@ tcRnHsBootDecls decls
 	     Nothing    -> return ()
 
 		-- Rename the declarations
-	; (tcg_env, rn_group) <- rnTopSrcDecls first_group
+	; (tcg_env, HsGroup { 
+		   hs_tyclds = tycl_decls, 
+		   hs_instds = inst_decls,
+		   hs_derivds = deriv_decls,
+		   hs_fords  = _,
+		   hs_defds  = _, -- Todo: check no foreign decls, no rules,
+		   hs_ruleds = _, -- no default decls and no annotation decls
+		   hs_annds  = _,
+		   hs_valds  = val_binds }) <- rnTopSrcDecls first_group
 	; setGblEnv tcg_env $ do {
 
-	-- Todo: check no foreign decls, no rules, no default decls
 
 		-- Typecheck type/class decls
 	; traceTc (text "Tc2")
-	; let tycl_decls = hs_tyclds rn_group
 	; tcg_env <- tcTyAndClassDecls emptyModDetails tycl_decls
 	; setGblEnv tcg_env	$ do {
 
 		-- Typecheck instance decls
 	; traceTc (text "Tc3")
 	; (tcg_env, inst_infos, _deriv_binds) 
-            <- tcInstDecls1 tycl_decls (hs_instds rn_group) (hs_derivds rn_group)
+            <- tcInstDecls1 tycl_decls inst_decls deriv_decls
 	; setGblEnv tcg_env	$ do {
 
 		-- Typecheck value declarations
 	; traceTc (text "Tc5") 
-	; val_ids <- tcHsBootSigs (hs_valds rn_group)
+	; val_ids <- tcHsBootSigs val_binds
 
 		-- Wrap up
 		-- No simplification or zonking to do
@@ -537,6 +547,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 " ++
@@ -551,7 +570,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
@@ -770,6 +789,7 @@ tcTopSrcDecls boot_details
                    hs_derivds = deriv_decls,
 		   hs_fords  = foreign_decls,
 		   hs_defds  = default_decls,
+		   hs_annds  = annotation_decls,
 		   hs_ruleds = rule_decls,
 		   hs_valds  = val_binds })
  = do {		-- Type-check the type and class decls, and all imported decls
@@ -820,6 +840,9 @@ tcTopSrcDecls boot_details
         traceTc (text "Tc7") ;
 	(foe_binds, foe_decls) <- tcForeignExports foreign_decls ;
 
+                -- Annotations
+	annotations <- tcAnnotations annotation_decls ;
+
 		-- Rules
 	rules <- tcRules rule_decls ;
 
@@ -829,12 +852,13 @@ tcTopSrcDecls boot_details
 	let { all_binds = tc_val_binds	 `unionBags`
 			  tc_deriv_binds `unionBags`
 			  inst_binds	 `unionBags`
-			  foe_binds  ;
+			  foe_binds;
 
 		-- Extend the GblEnv with the (as yet un-zonked) 
 		-- bindings, rules, foreign decls
 	      tcg_env' = tcg_env {  tcg_binds = tcg_binds tcg_env `unionBags` all_binds,
 				    tcg_rules = tcg_rules tcg_env ++ rules,
+				    tcg_anns  = tcg_anns tcg_env ++ annotations,
 				    tcg_fords = tcg_fords tcg_env ++ foe_decls ++ fi_decls } } ;
   	return (tcg_env', tcl_env)
     }}}}}}
@@ -890,7 +914,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,