X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=83dda3f81b8ec908c32af0cbde8e1a9f09fd0b30;hp=6d43ea84e68b6ea1477948c0b088550d97aa8d41;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hpb=decbb181cf7a06c6135ca451307a7e7214385f2e

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 6d43ea8..83dda3f 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -105,7 +105,7 @@ import {-# SOURCE #-}  InteractiveEval ( Resume )
 #endif
 
 import RdrName
-import Name		( Name, NamedThing, getName, nameOccName, nameModule )
+import Name
 import NameEnv
 import NameSet	
 import OccName		( OccName, OccEnv, lookupOccEnv, mkOccEnv, emptyOccEnv, 
@@ -1160,7 +1160,7 @@ mkPrintUnqualified dflags env = (qual_name, qual_mod)
 
 	| otherwise = panic "mkPrintUnqualified"
       where
-	right_name gre = nameModule (gre_name gre) == mod
+	right_name gre = nameModule_maybe (gre_name gre) == Just mod
 
         unqual_gres = lookupGRE_RdrName (mkRdrUnqual occ) env
         qual_gres   = filter right_name (lookupGlobalRdrEnv env occ)
@@ -1330,7 +1330,7 @@ lookupType dflags hpt pte name
        lookupNameEnv (md_types (hm_details hm)) name
   | otherwise
   = lookupNameEnv pte name
-  where mod = nameModule name
+  where mod = ASSERT( isExternalName name ) nameModule name
 	this_pkg = thisPackage dflags
 
 -- | As 'lookupType', but with a marginally easier-to-use interface