X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=1f4c4768d85fdefda7e374c799e8ed6c27d37f84;hp=472ce6b94d3942ba706c186acbff3ea569ba2a05;hb=1dfd77341ec56e9d61f2d78cb7ff2b9900385dac;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 472ce6b..1f4c476 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -44,8 +44,8 @@ import TyCon		( tyConTyVars, tyConDataCons, tyConArity, tyConHasGenerics,
 			  isEnumerationTyCon, isRecursiveTyCon, TyCon
 			)
 import TcType		( TcType, ThetaType, mkTyVarTys, mkTyConApp, tcTyConAppTyCon,
-			  isUnLiftedType, mkClassPred, tyVarsOfTypes, isArgTypeKind,
-			  tcEqTypes, tcSplitAppTys, mkAppTys )
+			  isUnLiftedType, mkClassPred, tyVarsOfType,
+			  isArgTypeKind, tcEqTypes, tcSplitAppTys, mkAppTys )
 import Var		( TyVar, tyVarKind, varName )
 import VarSet		( mkVarSet, subVarSet )
 import PrelNames
@@ -419,7 +419,8 @@ makeDerivEqns overlap_flag tycl_decls
 	args_to_drop   = drop n_args_to_keep rep_ty_args
  	args_to_keep   = take n_args_to_keep rep_ty_args
 
-	rep_tys  = tys ++ [mkAppTys rep_fn args_to_keep]
+	rep_fn'  = mkAppTys rep_fn args_to_keep
+	rep_tys  = tys ++ [rep_fn']
 	rep_pred = mkClassPred clas rep_tys
 		-- rep_pred is the representation dictionary, from where
 		-- we are gong to get all the methods for the newtype dictionary
@@ -494,7 +495,7 @@ makeDerivEqns overlap_flag tycl_decls
 	--	(b) the remaining type args mention 
 	--	    only the remaining type variables
 	eta_ok = (args_to_drop `tcEqTypes` mkTyVarTys tyvars_to_drop)
-	      && (tyVarsOfTypes args_to_keep `subVarSet` mkVarSet tyvars_to_keep) 
+	      && (tyVarsOfType rep_fn' `subVarSet` mkVarSet tyvars_to_keep) 
 
 	cant_derive_err = derivingThingErr clas tys tycon tyvars_to_keep
 				(vcat [ptext SLIT("even with cunning newtype deriving:"),
@@ -827,7 +828,7 @@ genInst spec
 	-- *non-renamed* auxiliary bindings
 	; (rn_meth_binds, _fvs) <- discardWarnings $ 
 				   bindLocalNames (map varName tyvars)	$
-			 	   rnMethodBinds clas_nm [] meth_binds
+			 	   rnMethodBinds clas_nm (\n -> []) [] meth_binds
 
 	-- Build the InstInfo
 	; return (InstInfo { iSpec = spec,