X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=cb5022e36876152bb155587c6b44934becf49a10;hb=663b391470a783e8f23414c07c18a020850d2fb8;hp=a7b9f97f55c9a3f50ed7dfa87cc8f0e22cd8564b;hpb=bb6a7d1a735618d7f71e503c14d50d591277c083;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index a7b9f97..cb5022e 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -522,16 +522,9 @@ data ModGuts
 	mg_usages    :: ![Usage],	 -- Version info for what it needed
 
         mg_rdr_env   :: !GlobalRdrEnv,	 -- Top-level lexical environment
-	mg_fix_env   :: !FixityEnv,	 -- Fixity env, for things declared in
-					 --   this module 
-
-	mg_inst_env     :: InstEnv,	 -- Class instance enviroment fro
-					 -- *home-package* modules (including
-					 -- this one); c.f. tcg_inst_env
-	mg_fam_inst_env :: FamInstEnv,	 -- Type-family instance enviroment
-					 -- for *home-package* modules (including
-					 -- this one); c.f. tcg_fam_inst_env
 
+	-- These fields all describe the things **declared in this module**
+	mg_fix_env   :: !FixityEnv,	 -- Fixities
 	mg_types     :: !TypeEnv,
 	mg_insts     :: ![Instance],	 -- Instances 
 	mg_fam_insts :: ![FamInst],	 -- Instances 
@@ -541,7 +534,19 @@ data ModGuts
 	mg_deprecs   :: !Deprecations,	 -- Deprecations declared in the module
 	mg_hpc_info  :: !HpcInfo,        -- info about coverage tick boxes
         mg_modBreaks :: !ModBreaks,
-        mg_vect_info :: !VectInfo        -- Pool of vectorised declarations
+        mg_vect_info :: !VectInfo,        -- Pool of vectorised declarations
+
+	-- The next two fields are unusual, because they give instance
+	-- environments for *all* modules in the home package, including
+	-- this module, rather than for *just* this module.  
+	-- Reason: when looking up an instance we don't want to have to
+	--	  look at each module in the home package in turn
+	mg_inst_env     :: InstEnv,	 -- Class instance enviroment fro
+					 -- *home-package* modules (including
+					 -- this one); c.f. tcg_inst_env
+	mg_fam_inst_env :: FamInstEnv	 -- Type-family instance enviroment
+					 -- for *home-package* modules (including
+					 -- this one); c.f. tcg_fam_inst_env
     }
 
 -- The ModGuts takes on several slightly different forms:
@@ -603,8 +608,6 @@ data ForeignStubs = NoStubs
                                         -- 	"foreign exported" functions
 			[FastString] 	-- Headers that need to be included
 				        -- 	into C code generated for this module
-			[Id]		-- Foreign-exported binders
-					-- 	we have to generate code to register these
 
 \end{code}
 
@@ -1302,7 +1305,7 @@ data VectInfo
       vectInfoVar     :: VarEnv  (Var    , Var  ),   -- (f, f_v) keyed on f
       vectInfoTyCon   :: NameEnv (TyCon  , TyCon),   -- (T, T_v) keyed on T
       vectInfoDataCon :: NameEnv (DataCon, DataCon), -- (C, C_v) keyed on C
-      vectInfoPADFun  :: NameEnv (TyCon  , Var),     -- (C, paT) keyed on T
+      vectInfoPADFun  :: NameEnv (TyCon  , Var),     -- (T_v, paT) keyed on T_v
       vectInfoIso     :: NameEnv (TyCon  , Var)      -- (T, isoT) keyed on T
     }
     -- all of this is always tidy, even in ModGuts
@@ -1427,6 +1430,8 @@ data ModBreaks
         -- An array giving the source span of each breakpoint.
    , modBreaks_vars :: !(Array BreakIndex [OccName])
         -- An array giving the names of the free variables at each breakpoint.
+   , modBreaks_decls:: !(Array BreakIndex SrcSpan)
+        -- An array giving the span of the enclosing expression
    }
 
 emptyModBreaks :: ModBreaks
@@ -1435,5 +1440,6 @@ emptyModBreaks = ModBreaks
          -- Todo: can we avoid this? 
    , modBreaks_locs = array (0,-1) []
    , modBreaks_vars = array (0,-1) []
+   , modBreaks_decls= array (0,-1) []
    }
 \end{code}