X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FLoadIface.lhs;h=e4ac07506a1fb3ddd079e2038480e03370ee3e9e;hb=9636f8cd435e598132687fc1e007c181f2f221e6;hp=1c8b410123d607458594776456bf874016b9a21c;hpb=098f818b622e5095fbd3f6318a463fcb2ce14fc6;p=ghc-hetmet.git

diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index 1c8b410..e4ac075 100644
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -6,6 +6,13 @@
 Loading interface files
 
 \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 LoadIface (
 	loadInterface, loadInterfaceForName, loadWiredInHomeIface, 
 	loadSrcInterface, loadSysInterface, loadOrphanModules, 
@@ -38,7 +45,6 @@ import InstEnv
 import FamInstEnv
 import Name
 import NameEnv
-import NameSet
 import MkId
 import Module
 import OccName
@@ -52,7 +58,6 @@ import Outputable
 import BinIface
 import Panic
 
-import Control.Monad (when)
 import Data.List
 import Data.Maybe
 import Data.IORef
@@ -120,6 +125,7 @@ loadInterfaceForName doc name
 
 -- | An 'IfM' function to load the home interface for a wired-in thing,
 -- so that we're sure that we see its instance declarations and rules
+-- See Note [Loading instances]
 loadWiredInHomeIface :: Name -> IfM lcl ()
 loadWiredInHomeIface name
   = ASSERT( isWiredInName name )
@@ -136,6 +142,27 @@ loadSysInterface doc mod_name
 	    Succeeded iface -> return iface }
 \end{code}
 
+Note [Loading instances]
+~~~~~~~~~~~~~~~~~~~~~~~~
+We need to make sure that we have at least *read* the interface files
+for any module with an instance decl or RULE that we might want.  
+
+* If the instance decl is an orphan, we have a whole separate mechanism
+  (loadOprhanModules)
+
+* If the instance decl not an orphan, then the act of looking at the
+  TyCon or Class will force in the defining module for the
+  TyCon/Class, and hence the instance decl
+
+* BUT, if the TyCon is a wired-in TyCon, we don't really need its interface;
+  but we must make sure we read its interface in case it has instances or
+  rules.  That is what LoadIface.loadWiredInHomeInterface does.  It's called
+  from TcIface.{tcImportDecl, checkWiredInTyCon, ifCHeckWiredInThing}
+
+All of this is done by the type checker. The renamer plays no role.
+(It used to, but no longer.)
+
+
 
 %*********************************************************
 %*							*
@@ -280,8 +307,8 @@ loadInterface doc_str mod from
 
 badDepMsg mod 
   = hang (ptext SLIT("Interface file inconsistency:"))
-       2 (sep [ptext SLIT("home-package module") <+> quotes (ppr mod) <+> ptext SLIT("is mentioned is needed,"), 
-	       ptext SLIT("but is not among the dependencies of interfaces directly imported by the module being compiled")])
+       2 (sep [ptext SLIT("home-package module") <+> quotes (ppr mod) <+> ptext SLIT("is needed,"), 
+	       ptext SLIT("but is not listed in the dependencies of the interfaces directly imported by the module being compiled")])
 
 -----------------------------------------------------
 --	Loading type/class/value decls
@@ -316,9 +343,9 @@ loadDecl :: Bool		    -- Don't load pragmas into the decl pool
 loadDecl ignore_prags mod (_version, decl)
   = do 	{ 	-- Populate the name cache with final versions of all 
 		-- the names associated with the decl
-	  main_name      <- mk_new_bndr mod (ifName decl)
+	  main_name      <- lookupOrig mod (ifName decl)
 --        ; traceIf (text "Loading decl for " <> ppr main_name)
-	; implicit_names <- mapM (mk_new_bndr mod) (ifaceDeclSubBndrs decl)
+	; implicit_names <- mapM (lookupOrig mod) (ifaceDeclSubBndrs decl)
 
 	-- Typecheck the thing, lazily
 	-- NB. Firstly, the laziness is there in case we never need the
@@ -363,16 +390,6 @@ loadDecl ignore_prags mod (_version, decl)
 		-- as the TyThings.  That way we can extend the PTE without poking the
 		-- thunks
   where
-	-- mk_new_bndr allocates in the name cache the final canonical
-	-- name for the thing, with the correct 
-	--	* parent
-	--	* location
-	-- imported name, to fix the module correctly in the cache
-    mk_new_bndr mod occ 
-	= newGlobalBinder mod occ 
-			  (importedSrcLoc (showSDoc (ppr (moduleName mod))))
-			-- ToDo: qualify with the package name if necessary
-
     doc = ptext SLIT("Declaration for") <+> ppr (ifName decl)
 
 bumpDeclStats :: Name -> IfL ()		-- Record that one more declaration has actually been used
@@ -574,6 +591,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)
+		<+> (if mi_hpc    iface then ptext SLIT("[hpc]") else empty)
 		<+> integer opt_HiVersion
 		<+> ptext SLIT("where")
 	, vcat (map pprExport (mi_exports iface))
@@ -586,7 +604,7 @@ pprModIface iface
 	, vcat (map ppr (mi_rules iface))
         , pprVectInfo (mi_vect_info iface)
 	, pprDeprecs (mi_deprecs iface)
-	]
+ 	]
   where
     pp_boot | mi_boot iface = ptext SLIT("[boot]")
 	    | otherwise     = empty
@@ -658,8 +676,15 @@ pprFixities fixes = ptext SLIT("fixities") <+> pprWithCommas pprFix fixes
 		    pprFix (occ,fix) = ppr fix <+> ppr occ 
 
 pprVectInfo :: IfaceVectInfo -> SDoc
-pprVectInfo (IfaceVectInfo names) = 
-  ptext SLIT("Closured converted:") <+> hsep (map ppr names)
+pprVectInfo (IfaceVectInfo { ifaceVectInfoVar        = vars
+                           , ifaceVectInfoTyCon      = tycons
+                           , ifaceVectInfoTyConReuse = tyconsReuse
+                           }) = 
+  vcat 
+  [ ptext SLIT("vectorised variables:") <+> hsep (map ppr vars)
+  , ptext SLIT("vectorised tycons:") <+> hsep (map ppr tycons)
+  , ptext SLIT("vectorised reused tycons:") <+> hsep (map ppr tyconsReuse)
+  ]
 
 pprDeprecs NoDeprecs	    = empty
 pprDeprecs (DeprecAll txt)  = ptext SLIT("Deprecate all") <+> doubleQuotes (ftext txt)