X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fmain%2FHscTypes.lhs;h=8e064bc57e24830a924a40fe6e42af192601d641;hb=53f50b718b9c6abcf4d61c95f1e4d355934a2550;hp=d3c5f7f74ffa0218067fabd3659cfb8c19ddf621;hpb=b00b5bc04ff36a551552470060064f0b7d84ca30;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index d3c5f7f..8e064bc 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -103,10 +103,11 @@ import UniqFM		( lookupUFM, eltsUFM, emptyUFM )
 import UniqSupply	( UniqSupply )
 import FastString	( FastString )
 
-import DATA_IOREF	( IORef, readIORef )
 import StringBuffer	( StringBuffer )
 import Maybes           ( catMaybes, seqMaybe )
-import Time		( ClockTime )
+
+import System.Time	( ClockTime )
+import Data.IORef	( IORef, readIORef )
 \end{code}
 
 
@@ -366,6 +367,7 @@ data ModIface
         mi_mod_vers :: !Version,	    -- Module version: changes when anything changes
 
         mi_orphan   :: !WhetherHasOrphans,  -- Whether this module has orphans
+        mi_finsts   :: !WhetherHasFamInst,  -- Whether module has family insts
 	mi_boot	    :: !IsBootInterface,    -- Read from an hi-boot file?
 
 	mi_deps	    :: Dependencies,
@@ -419,7 +421,8 @@ data ModIface
 	mi_fam_insts :: [IfaceFamInst],			-- Sorted
 	mi_rules     :: [IfaceRule],			-- Sorted
 	mi_rule_vers :: !Version,	-- Version number for rules and 
-					-- instances combined
+					-- instances (for classes and families)
+					-- combined
 
 		-- Cached environments for easy lookup
 		-- These are computed (lazily) from other fields
@@ -549,6 +552,7 @@ emptyModIface mod
   = ModIface { mi_module   = mod,
 	       mi_mod_vers = initialVersion,
 	       mi_orphan   = False,
+	       mi_finsts   = False,
 	       mi_boot	   = False,
 	       mi_deps     = noDependencies,
 	       mi_usages   = [],
@@ -853,11 +857,8 @@ instance Outputable n => Outputable (GenAvailInfo n) where
    ppr = pprAvail
 
 pprAvail :: Outputable n => GenAvailInfo n -> SDoc
-pprAvail (AvailTC n ns) = ppr n <> case {- filter (/= n) -} ns of
-					[]  -> empty
-					ns' -> braces (hsep (punctuate comma (map ppr ns')))
-
-pprAvail (Avail n) = ppr n
+pprAvail (Avail n)      = ppr n
+pprAvail (AvailTC n ns) = ppr n <> braces (hsep (punctuate comma (map ppr ns)))
 \end{code}
 
 \begin{code}
@@ -903,22 +904,32 @@ type WhetherHasOrphans   = Bool
 	--	* a transformation rule in a module other than the one defining
 	--		the function in the head of the rule.
 
+type WhetherHasFamInst = Bool	     -- This module defines family instances?
+
 type IsBootInterface = Bool
 
 -- Dependency info about modules and packages below this one
 -- in the import hierarchy.  See TcRnTypes.ImportAvails for details.
+-- The orphan modules in `dep_orphs' do *not* include family instance orphans,
+-- as they are anyway included in `dep_finsts'.
 --
 -- Invariant: the dependencies of a module M never includes M
 -- Invariant: the lists are unordered, with no duplicates
 data Dependencies
-  = Deps { dep_mods  :: [(ModuleName,IsBootInterface)],	-- Home-package module dependencies
-	   dep_pkgs  :: [PackageId], 			-- External package dependencies
-	   dep_orphs :: [Module] }			-- Orphan modules (whether home or external pkg)
+  = Deps { dep_mods   :: [(ModuleName,      -- Home-package module dependencies
+			   IsBootInterface)]
+	 , dep_pkgs   :: [PackageId] 	    -- External package dependencies
+	 , dep_orphs  :: [Module]	    -- Orphan modules (whether home or
+					    -- external pkg)
+         , dep_finsts :: [Module]	    -- Modules that contain family
+					    -- instances (whether home or
+					    -- external pkg)
+         }
   deriving( Eq )
 	-- Equality used only for old/new comparison in MkIface.addVersionInfo
 
 noDependencies :: Dependencies
-noDependencies = Deps [] [] []
+noDependencies = Deps [] [] [] []
  	  
 data Usage
   = Usage { usg_name     :: ModuleName,			-- Name of the module