X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnNames.lhs;h=6b98283afd63f7e92c413d42ae1a215270f097c3;hb=839a0880ea32b3ef2f0715957bfeec6e4bb3367b;hp=d1967c846491b1f3dc587a65b98d6cad917bd912;hpb=afef39736dcde6f4947a6f362f9e6b3586933db4;p=ghc-hetmet.git

diff --git a/compiler/rename/RnNames.lhs b/compiler/rename/RnNames.lhs
index d1967c8..6b98283 100644
--- a/compiler/rename/RnNames.lhs
+++ b/compiler/rename/RnNames.lhs
@@ -17,7 +17,7 @@ import DynFlags		( DynFlag(..), GhcMode(..), DynFlags(..) )
 import HsSyn		( IE(..), ieName, ImportDecl(..), LImportDecl,
 			  ForeignDecl(..), HsGroup(..), HsValBinds(..),
 			  Sig(..), collectHsBindLocatedBinders, tyClDeclNames,
-			  instDeclATs,
+			  instDeclATs, isIdxTyDecl,
 			  LIE )
 import RnEnv
 import IfaceEnv		( ifaceExportNames )
@@ -446,13 +446,14 @@ getLocalDeclBinders gbl_env (HsGroup {hs_valds = ValBindsIn val_decls val_sigs,
     new_tc tc_decl 
 	= do { main_name <- newTopSrcBinder mod Nothing main_rdr
 	     ; sub_names <- mappM (newTopSrcBinder mod (Just main_name)) sub_rdrs
-	     ; return (main_name : sub_names) }
+	     ; if isIdxTyDecl (unLoc tc_decl)	   -- index type definitions
+	       then return (            sub_names) -- are usage occurences
+	       else return (main_name : sub_names) }
 	where
 	  (main_rdr : sub_rdrs) = tyClDeclNames (unLoc tc_decl)
 
     inst_ats inst_decl 
-	= mappM (liftM tail . new_tc) (instDeclATs (unLoc inst_decl))
-		       -- drop main_rdr (already declared in class)
+	= mappM new_tc (instDeclATs (unLoc inst_decl))
 \end{code}