X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FTcIface.lhs;h=92d39978985656770ea286d3fe1d2acdaf73e0e1;hb=c860699ce51ab92e85ee30c6afe555fc345f4c37;hp=0b4df3336eacd9df55d4f1639c730bc245127650;hpb=a73d6d950f6599d35f1e0aeb80d30112816a6928;p=ghc-hetmet.git

diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 0b4df33..92d3997 100644
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -53,7 +53,8 @@ import Name		( Name, nameModule, nameIsLocalOrFrom, isWiredInName,
 import NameEnv
 import OccName		( OccName, mkVarOccFS, mkTyVarOcc )
 import FastString       ( FastString )
-import Module		( Module, lookupModuleEnv )
+import Module		( Module, moduleName )
+import UniqFM		( lookupUFM )
 import UniqSupply	( initUs_ )
 import Outputable	
 import ErrUtils		( Message )
@@ -246,7 +247,7 @@ tcHiBootIface mod
 		-- And that's fine, because if M's ModInfo is in the HPT, then 
 		-- it's been compiled once, and we don't need to check the boot iface
 	  then do { hpt <- getHpt
-		  ; case lookupModuleEnv hpt mod of
+		  ; case lookupUFM hpt (moduleName mod) of
 		      Just info | mi_boot (hm_iface info) 
 				-> return (hm_details info)
 		      other -> return emptyModDetails }
@@ -257,17 +258,16 @@ tcHiBootIface mod
 	-- so eps_is_boot will record if any of our imports mention us by 
 	-- way of hi-boot file
 	{ eps <- getEps
-	; case lookupModuleEnv (eps_is_boot eps) mod of {
+	; case lookupUFM (eps_is_boot eps) (moduleName mod) of {
 	    Nothing -> return emptyModDetails ;	-- The typical case
 
 	    Just (_, False) -> failWithTc moduleLoop ;
  		-- Someone below us imported us!
 		-- This is a loop with no hi-boot in the way
 		
-	    Just (mod, True) -> 	-- There's a hi-boot interface below us
+	    Just (_mod, True) -> 	-- There's a hi-boot interface below us
 		
     do	{ read_result <- findAndReadIface 
-				True	-- Explicit import? 
 				need mod
 				True	-- Hi-boot file
 
@@ -376,6 +376,8 @@ tcIfaceDecl (IfaceSyn {ifName = occ_name, ifTyVars = tv_bndrs,
 tcIfaceDecl (IfaceClass {ifCtxt = rdr_ctxt, ifName = occ_name, ifTyVars = tv_bndrs, 
 			 ifFDs = rdr_fds, ifSigs = rdr_sigs, 
 			 ifVrcs = tc_vrcs, ifRec = tc_isrec })
+-- ToDo: in hs-boot files we should really treat abstract classes specially,
+--	 as we do abstract tycons
   = bindIfaceTyVars tv_bndrs $ \ tyvars -> do
     { cls_name <- lookupIfaceTop occ_name
     ; ctxt <- tcIfaceCtxt rdr_ctxt
@@ -843,7 +845,8 @@ tcIfaceGlobal name
 	-- and its RULES are loaded too
   | otherwise
   = do	{ (eps,hpt) <- getEpsAndHpt
-	; case lookupType hpt (eps_PTE eps) name of {
+ 	; dflags <- getDOpts
+	; case lookupType dflags hpt (eps_PTE eps) name of {
 	    Just thing -> return thing ;
 	    Nothing    -> do