X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnIfaces.lhs;fp=ghc%2Fcompiler%2Frename%2FRnIfaces.lhs;h=8a1100625d9698da9967a978806bfa2354cab49e;hb=42b63073fb5e71fcd539ab80289cf6cf2a5b9641;hp=309ab65457f860c749eb7c0378f954e2c5180ca7;hpb=87bfa396ca8cea3296e8a715766062dc4d2c1d9b;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index 309ab65..8a11006 100644
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -31,7 +31,7 @@ import Id		( idType, idName, globalIdDetails )
 import IdInfo		( GlobalIdDetails(..) )
 import TcType		( tyClsNamesOfType, classNamesOfTheta )
 import FieldLabel	( fieldLabelTyCon )
-import DataCon		( dataConTyCon )
+import DataCon		( dataConTyCon, dataConWrapId )
 import TyCon		( visibleDataCons, isSynTyCon, getSynTyConDefn, tyConClass_maybe, tyConName )
 import Class		( className, classSCTheta )
 import Name		( Name {-instance NamedThing-}, isWiredInName, nameIsLocalOrFrom, 
@@ -189,13 +189,14 @@ rnIfaceDecl rn (mod, decl) = initRn (InterfaceMode mod) (rn decl)
 	-- Tiresomely, we must get the "main" name for the 
 	-- thing, because that's what VSlurp contains, and what
 	-- is recorded in the usage information
-get_main_name (AClass cl) = className cl
+get_main_name (AClass cl)   = className cl
+get_main_name (ADataCon dc) = tyConName (dataConTyCon dc)
 get_main_name (ATyCon tc)
   | Just clas <- tyConClass_maybe tc = get_main_name (AClass clas)
   | otherwise			     = tyConName tc
 get_main_name (AnId id)
   = case globalIdDetails id of
-	DataConId     dc -> get_main_name (ATyCon (dataConTyCon dc))
+	DataConWorkId dc -> get_main_name (ATyCon (dataConTyCon dc))
 	DataConWrapId dc -> get_main_name (ATyCon (dataConTyCon dc))
 	RecordSelId lbl  -> get_main_name (ATyCon (fieldLabelTyCon lbl))
 	other	         -> idName id
@@ -477,6 +478,7 @@ getWiredInGates (AClass cl)
     super_classes = classNamesOfTheta (classSCTheta cl)
 
 getWiredInGates (AnId the_id) = tyClsNamesOfType (idType the_id)
+getWiredInGates (ADataCon dc) = tyClsNamesOfType (idType (dataConWrapId dc))
 getWiredInGates (ATyCon tc)
   | isSynTyCon tc = tyClsNamesOfType ty
   | otherwise	  = unitFV (getName tc)