X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=e26c97d2c6ce9189e075f340d76c8e125e85938a;hb=00b6d2567426ec52a113b1d3687e1d61368cafda;hp=6934eb1d2f463259d45d209f86388b95c2b5f554;hpb=39dca31567349eb77b2d11a037dd09aae5a0630d;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 6934eb1..e26c97d 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -479,7 +479,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
@@ -866,11 +867,11 @@ solveDerivEqns overlap_flag orig_eqns
     gen_soln :: DerivEqn -> TcM [PredType]
     gen_soln (loc, orig, _, tyvars, clas, inst_ty, deriv_rhs)
       = setSrcSpan loc	$
+	addErrCtxt (derivInstCtxt clas [inst_ty]) $ 
 	do { theta <- tcSimplifyDeriv orig tyvars deriv_rhs
-	   ; addErrCtxt (derivInstCtxt theta clas [inst_ty]) $ 
-	do { checkNoErrs (checkValidInstance tyvars theta clas [inst_ty])
-	 	-- See Note [Deriving context]
-		-- If this fails, don't continue
+	   	-- checkValidInstance tyvars theta clas [inst_ty]
+		-- Not necessary; see Note [Exotic derived instance contexts]
+		-- 		  in TcSimplify
 
 		  -- Check for a bizarre corner case, when the derived instance decl should
 		  -- have form 	instance C a b => D (T a) where ...
@@ -884,7 +885,7 @@ solveDerivEqns overlap_flag orig_eqns
 		-- Claim: the result instance declaration is guaranteed valid
 		-- Hence no need to call:
 		--   checkValidInstance tyvars theta clas inst_tys
-	   ; return (sortLe (<=) theta) } }	-- Canonicalise before returning the solution
+	   ; return (sortLe (<=) theta) }	-- Canonicalise before returning the solution
 
     ------------------------------------------------------------------
     mk_inst_spec :: DerivEqn -> DerivSoln -> Instance
@@ -903,25 +904,6 @@ extendLocalInstEnv dfuns thing_inside
       ; setGblEnv env' thing_inside }
 \end{code}
 
-Note [Deriving context]
-~~~~~~~~~~~~~~~~~~~~~~~
-With -fglasgow-exts, we allow things like (C Int a) in the simplified
-context for a derived instance declaration, because at a use of this
-instance, we might know that a=Bool, and have an instance for (C Int
-Bool)
-
-We nevertheless insist that each predicate meets the termination
-conditions. If not, the deriving mechanism generates larger and larger
-constraints.  Example:
-  data Succ a = S a
-  data Seq a = Cons a (Seq (Succ a)) | Nil deriving Show
-
-Note the lack of a Show instance for Succ.  First we'll generate
-  instance (Show (Succ a), Show a) => Show (Seq a)
-and then
-  instance (Show (Succ (Succ a)), Show (Succ a), Show a) => Show (Seq a)
-and so on.  Instead we want to complain of no instance for (Show (Succ a)).
-  
 
 %************************************************************************
 %*									*
@@ -1137,10 +1119,8 @@ derivingThingErr clas tys ty why
 standaloneCtxt :: LHsType Name -> SDoc
 standaloneCtxt ty = ptext SLIT("In the stand-alone deriving instance for") <+> quotes (ppr ty)
 
-derivInstCtxt theta clas inst_tys
-  = hang (ptext SLIT("In the derived instance:"))
-	 2 (pprThetaArrow theta <+> pprClassPred clas inst_tys)
--- Used for the ...Thetas variants; all top level
+derivInstCtxt clas inst_tys
+  = ptext SLIT("When deriving the instance for") <+> parens (pprClassPred clas inst_tys)
 
 badDerivedPred pred
   = vcat [ptext SLIT("Can't derive instances where the instance context mentions"),