X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FLoadIface.lhs;h=710b68ce007bffa33838e931bbf4337e4714165c;hp=ba72c25d528ce559bd5ded296ad8e9e416261bae;hb=a835e9faf19400aa6b7999b6f64e60cb1c7737dd;hpb=24bb49b71bce13faa263386e68d49fc0b05557b7

diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index ba72c25..710b68c 100644
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -20,8 +20,9 @@ import {-# SOURCE #-}	TcIface( tcIfaceDecl, tcIfaceRule, tcIfaceInst )
 
 import DynFlags		( DynFlags(..), DynFlag( Opt_IgnoreInterfacePragmas ) )
 import IfaceSyn		( IfaceDecl(..), IfaceConDecl(..), IfaceClassOp(..),
-			  IfaceConDecls(..), IfaceIdInfo(..) )
-import IfaceEnv		( newGlobalBinder )
+			  IfaceConDecls(..), IfaceFamInst(..), 
+			  IfaceIdInfo(..) )
+import IfaceEnv		( newGlobalBinder, lookupIfaceTc )
 import HscTypes		( ModIface(..), TyThing, IfaceExport, Usage(..), 
 			  Deprecs(..), Dependencies(..),
 			  emptyModIface, EpsStats(..), GenAvailInfo(..),
@@ -290,16 +291,19 @@ loadDecls ignore_prags ver_decls
 	; return (concat thingss)
 	}
 
-loadDecl :: Bool			-- Don't load pragmas into the decl pool
+loadDecl :: Bool		    -- Don't load pragmas into the decl pool
 	 -> Module
 	  -> (Version, IfaceDecl)
-	  -> IfL [(Name,TyThing)]	-- The list can be poked eagerly, but the
-					-- TyThings are forkM'd thunks
+	  -> IfL [(Name,TyThing)]   -- The list can be poked eagerly, but the
+				    -- TyThings are forkM'd thunks
 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 Nothing (ifName decl)
-	; implicit_names <- mapM (mk_new_bndr mod (Just main_name)) 
+	; parent_name    <- case ifFamily decl of  -- make family the parent
+			      Just famTyCon -> lookupIfaceTc famTyCon
+			      _             -> return main_name
+	; implicit_names <- mapM (mk_new_bndr mod (Just parent_name)) 
 				 (ifaceDeclSubBndrs decl)
 
 	-- Typecheck the thing, lazily
@@ -335,6 +339,11 @@ loadDecl ignore_prags mod (_version, decl)
 			  (importedSrcLoc (showSDoc (ppr (moduleName mod))))
 			-- ToDo: qualify with the package name if necessary
 
+    ifFamily (IfaceData {
+	        ifFamInst = Just (IfaceFamInst {ifFamInstTyCon = famTyCon})})
+               = Just famTyCon
+    ifFamily _ = Nothing
+
     doc = ptext SLIT("Declaration for") <+> ppr (ifName decl)
 
 discardDeclPrags :: IfaceDecl -> IfaceDecl