X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=ba110790c099e311de80335de2a5bcd0add450e1;hb=ac5b9252d1513b32031d860bbd8a89397dc1b7b3;hp=b973ec4a2cef1d64a0070b1bc34120d4aebd10fb;hpb=f6a741fad12b14b102be1aca959b8d63cbb2734a;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index b973ec4..ba11079 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -205,16 +205,18 @@ And then translate it to:
 %************************************************************************
 
 \begin{code}
-tcDeriving  :: [LTyClDecl Name]	-- All type constructors
+tcDeriving  :: [LTyClDecl Name]  -- All type constructors
+            -> [LInstDecl Name]  -- All instance declarations
             -> [LDerivDecl Name] -- All stand-alone deriving declarations
 	    -> TcM ([InstInfo],		-- The generated "instance decls"
 		    HsValBinds Name)	-- Extra generated top-level bindings
 
-tcDeriving tycl_decls deriv_decls
+tcDeriving tycl_decls inst_decls deriv_decls
   = recoverM (returnM ([], emptyValBindsOut)) $
     do	{   	-- Fish the "deriving"-related information out of the TcEnv
 		-- and make the necessary "equations".
-	; (ordinary_eqns, newtype_inst_info) <- makeDerivEqns tycl_decls deriv_decls
+	; (ordinary_eqns, newtype_inst_info) 
+                <- makeDerivEqns tycl_decls inst_decls deriv_decls
 
 	; (ordinary_inst_info, deriv_binds) 
 		<- extendLocalInstEnv (map iSpec newtype_inst_info)  $
@@ -338,17 +340,24 @@ when the dict is constructed in TcInstDcls.tcInstDecl2
 
 \begin{code}
 makeDerivEqns :: [LTyClDecl Name] 
+              -> [LInstDecl Name]
 	      -> [LDerivDecl Name] 
 	      -> TcM ([DerivEqn],	-- Ordinary derivings
 		      [InstInfo])	-- Special newtype derivings
 
-makeDerivEqns tycl_decls deriv_decls
+makeDerivEqns tycl_decls inst_decls deriv_decls
   = do	{ eqns1 <- mapM deriveTyData $
-		   [ (p,d) | d@(L _ (TyData {tcdDerivs = Just preds})) <- tycl_decls
-			   , p <- preds ]
+                     extractTyDataPreds tycl_decls ++
+		     [ pd                        -- traverse assoc data families
+                     | L _ (InstDecl _ _ _ ats) <- inst_decls
+		     , pd <- extractTyDataPreds ats ]
 	; eqns2 <- mapM deriveStandalone deriv_decls
 	; return ([eqn  | (Just eqn, _)  <- eqns1 ++ eqns2],
 		  [inst | (_, Just inst) <- eqns1 ++ eqns2]) }
+  where
+    extractTyDataPreds decls = 		   
+      [(p, d) | d@(L _ (TyData {tcdDerivs = Just preds})) <- decls, p <- preds]
+
 
 ------------------------------------------------------------------
 deriveStandalone :: LDerivDecl Name -> TcM (Maybe DerivEqn, Maybe InstInfo)
@@ -479,7 +488,8 @@ mk_data_eqn loc orig tvs cls tycon tc_args rep_tc rep_tc_args
 	; let ordinary_constraints
 	        = [ mkClassPred cls [arg_ty] 
 	          | data_con <- tyConDataCons rep_tc,
-	            arg_ty   <- dataConInstOrigArgTys data_con rep_tc_args,
+	            arg_ty   <- ASSERT( isVanillaDataCon data_con )
+				dataConInstOrigArgTys data_con rep_tc_args,
 	            not (isUnLiftedType arg_ty) ] -- No constraints for unlifted types?
 
 	      tiresome_subst = zipTopTvSubst (tyConTyVars rep_tc) rep_tc_args