X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcEnv.lhs;h=0c299a5669d76c4626ef6b42061efed7e9691ad2;hp=7702e31d652ec61e903d4366a71c73c1f4bf8006;hb=e7498a3ee1d0484d02a9e86633cc179c76ebf36e;hpb=30cf375e0bc79a6b71074a5e0fd2ec393241a751

diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs
index 7702e31..0c299a5 100644
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/ghc/compiler/typecheck/TcEnv.lhs
@@ -21,18 +21,18 @@ module TcEnv(
   ) where
 
 
-import Ubiq
-import TcMLoop  -- for paranoia checking
+IMP_Ubiq()
+IMPORT_DELOOPER(TcMLoop)  -- for paranoia checking
 
 import Id	( Id(..), GenId, idType, mkUserLocal )
 import TcHsSyn	( TcIdBndr(..), TcIdOcc(..) )
 import TcKind	( TcKind, newKindVars, tcDefaultKind, kindToTcKind )
 import TcType	( TcType(..), TcMaybe, TcTyVar(..), TcTyVarSet(..),
-		  newTyVarTys, tcInstTyVars, tcInstType, zonkTcTyVars
+		  newTyVarTys, tcInstTyVars, zonkTcTyVars
 		)
 import TyVar	( mkTyVar, tyVarKind, unionTyVarSets, emptyTyVarSet )
 import Type	( tyVarsOfTypes )
-import TyCon	( TyCon, Arity(..), tyConKind, synTyConArity )
+import TyCon	( TyCon, tyConKind, synTyConArity )
 import Class	( Class(..), GenClass, classSig )
 
 import TcMonad		hiding ( rnMtoTcM )
@@ -294,7 +294,7 @@ newMonoIds names kind m
 
 	mk_id name uniq ty
 	  = let
-		name_str = case (getOccName name) of { Unqual n -> n }
+		name_str = case (getOccName name) of { Unqual n -> n; Qual m n -> n }
 	    in
 	    mkUserLocal name_str uniq ty (getSrcLoc name)
     in