X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fmain%2FHscTypes.lhs;h=a11c931b0150e3532bbb4b65ac23e12cfab2fb6e;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hp=85cf73e2e1f61bf8d6da074e38a935a69cdccdb2;hpb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 85cf73e..a11c931 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_GHC -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/WorkingConventions#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}
 
@@ -1302,6 +1312,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),     -- (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
@@ -1325,13 +1336,14 @@ data IfaceVectInfo
     }
 
 noVectInfo :: VectInfo
-noVectInfo = VectInfo emptyVarEnv emptyNameEnv emptyNameEnv emptyNameEnv
+noVectInfo = VectInfo emptyVarEnv emptyNameEnv emptyNameEnv emptyNameEnv emptyNameEnv
 
 plusVectInfo :: VectInfo -> VectInfo -> VectInfo
 plusVectInfo vi1 vi2 = 
   VectInfo (vectInfoVar     vi1 `plusVarEnv`  vectInfoVar     vi2)
            (vectInfoTyCon   vi1 `plusNameEnv` vectInfoTyCon   vi2)
            (vectInfoDataCon vi1 `plusNameEnv` vectInfoDataCon vi2)
+           (vectInfoPADFun  vi1 `plusNameEnv` vectInfoPADFun  vi2)
            (vectInfoIso     vi1 `plusNameEnv` vectInfoIso     vi2)
 
 noIfaceVectInfo :: IfaceVectInfo