X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=10f00fda8bff9bdce47bad4f964ce15cb5da2a28;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hp=c1882d6a7832d0434e80269e375fada6f23c4b6f;hpb=596cacfe4e9463d1fd66c3292bef7432cfb1b17a;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index c1882d6..10f00fd 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -4,6 +4,13 @@
 \section[HscTypes]{Types for the per-module compiler}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- 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 HscTypes ( 
 	-- * Sessions and compilation state
 	Session(..), withSession, modifySession, 
@@ -522,16 +529,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 +541,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 +615,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}
 
@@ -1427,8 +1437,6 @@ 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
@@ -1437,6 +1445,5 @@ emptyModBreaks = ModBreaks
          -- Todo: can we avoid this? 
    , modBreaks_locs = array (0,-1) []
    , modBreaks_vars = array (0,-1) []
-   , modBreaks_decls= array (0,-1) []
    }
 \end{code}