X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FLoadIface.lhs;h=1c8b410123d607458594776456bf874016b9a21c;hb=56acf24c6792ad5d6c0671b3ac534d685a4d37ca;hp=6b2660d9a41de54838e005a358da87257ece4e46;hpb=1e8ae3f05cd475454f086a51da845ac0318d40e8;p=ghc-hetmet.git

diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index 6b2660d..1c8b410 100644
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -19,7 +19,7 @@ module LoadIface (
 #include "HsVersions.h"
 
 import {-# SOURCE #-}	TcIface( tcIfaceDecl, tcIfaceRules, tcIfaceInst, 
-				 tcIfaceFamInst )
+				 tcIfaceFamInst, tcIfaceVectInfo )
 
 import DynFlags
 import IfaceSyn
@@ -38,6 +38,7 @@ import InstEnv
 import FamInstEnv
 import Name
 import NameEnv
+import NameSet
 import MkId
 import Module
 import OccName
@@ -225,7 +226,7 @@ loadInterface doc_str mod from
 	--
 	-- The main thing is to add the ModIface to the PIT, but
 	-- we also take the
-	--	IfaceDecls, IfaceInst, IfaceRules
+	--	IfaceDecls, IfaceInst, IfaceFamInst, IfaceRules, IfaceVectInfo
 	-- out of the ModIface and put them into the big EPS pools
 
 	-- NB: *first* we do loadDecl, so that the provenance of all the locally-defined
@@ -238,13 +239,16 @@ loadInterface doc_str mod from
 	; new_eps_insts     <- mapM tcIfaceInst (mi_insts iface)
 	; new_eps_fam_insts <- mapM tcIfaceFamInst (mi_fam_insts iface)
 	; new_eps_rules     <- tcIfaceRules ignore_prags (mi_rules iface)
+        ; new_eps_vect_info <- tcIfaceVectInfo mod (mkNameEnv new_eps_decls) 
+                                               (mi_vect_info iface)
 
 	; let {	final_iface = iface {	
 			        mi_decls     = panic "No mi_decls in PIT",
 				mi_insts     = panic "No mi_insts in PIT",
 				mi_fam_insts = panic "No mi_fam_insts in PIT",
 				mi_rules     = panic "No mi_rules in PIT"
-                              } }
+                              }
+               }
 
 	; updateEps_  $ \ eps -> 
 	    eps { 
@@ -256,6 +260,8 @@ loadInterface doc_str mod from
 						   new_eps_insts,
 	      eps_fam_inst_env = extendFamInstEnvList (eps_fam_inst_env eps)
 						      new_eps_fam_insts,
+              eps_vect_info    = plusVectInfo (eps_vect_info eps) 
+                                              new_eps_vect_info,
               eps_mod_fam_inst_env
 			       = let
 				   fam_inst_env = 
@@ -490,6 +496,7 @@ initExternalPackageState
 	-- Initialise the EPS rule pool with the built-in rules
       eps_mod_fam_inst_env
                        = emptyModuleEnv,
+      eps_vect_info    = noVectInfo,
       eps_stats = EpsStats { n_ifaces_in = 0, n_decls_in = 0, n_decls_out = 0
 			   , n_insts_in = 0, n_insts_out = 0
 			   , n_rules_in = length builtinRules, n_rules_out = 0 }
@@ -567,7 +574,7 @@ pprModIface iface
 		<+> ppr (mi_mod_vers iface) <+> pp_sub_vers
 		<+> (if mi_orphan iface then ptext SLIT("[orphan module]") else empty)
 		<+> (if mi_finsts iface then ptext SLIT("[family instance module]") else empty)
-		<+> int opt_HiVersion
+		<+> integer opt_HiVersion
 		<+> ptext SLIT("where")
 	, vcat (map pprExport (mi_exports iface))
 	, pprDeps (mi_deps iface)
@@ -577,6 +584,7 @@ pprModIface iface
 	, vcat (map ppr (mi_insts iface))
 	, vcat (map ppr (mi_fam_insts iface))
 	, vcat (map ppr (mi_rules iface))
+        , pprVectInfo (mi_vect_info iface)
 	, pprDeprecs (mi_deprecs iface)
 	]
   where
@@ -649,6 +657,10 @@ pprFixities fixes = ptext SLIT("fixities") <+> pprWithCommas pprFix fixes
 		  where
 		    pprFix (occ,fix) = ppr fix <+> ppr occ 
 
+pprVectInfo :: IfaceVectInfo -> SDoc
+pprVectInfo (IfaceVectInfo names) = 
+  ptext SLIT("Closured converted:") <+> hsep (map ppr names)
+
 pprDeprecs NoDeprecs	    = empty
 pprDeprecs (DeprecAll txt)  = ptext SLIT("Deprecate all") <+> doubleQuotes (ftext txt)
 pprDeprecs (DeprecSome prs) = ptext SLIT("Deprecate") <+> vcat (map pprDeprec prs)