X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=68c5173be2ea3f4d65eab197b7421ea57e748f72;hb=311b1cdfc9b1c311cc53482c461c18cba8885b2a;hp=033e3990590e57d8ea0710d6096dbed0610cd2d8;hpb=8611d7d952b4a5bb0046898b386ded8fb287fdfa;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 033e399..68c5173 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -1,7 +1,7 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[TcDeriv]{Deriving}
 
 Handles @deriving@ clauses on @data@ declarations.
 
@@ -11,49 +11,39 @@ module TcDeriv ( tcDeriving ) where
 #include "HsVersions.h"
 
 import HsSyn
-import DynFlags	( DynFlag(..) )
+import DynFlags
 
-import Generics		( mkTyConGenericBinds )
+import Generics
 import TcRnMonad
-import TcMType		( checkValidInstance )
-import TcEnv		( newDFunName, pprInstInfoDetails, 
-			  InstInfo(..), InstBindings(..), simpleInstInfoClsTy,
-			  tcLookupClass, tcLookupTyCon, tcLookupLocatedTyCon, tcExtendTyVarEnv
-			)
+import TcMType
+import TcEnv
 import TcGenDeriv	-- Deriv stuff
-import InstEnv		( Instance, OverlapFlag, mkLocalInstance, instanceHead, extendInstEnvList )
-import Inst		( getOverlapFlag )
-import TcHsType		( tcHsDeriv )
-import TcSimplify	( tcSimplifyDeriv )
-import TypeRep          ( PredType )
-
-import RnBinds		( rnMethodBinds, rnTopBinds )
-import RnEnv		( bindLocalNames )
-import HscTypes		( FixityEnv )
-
-import Class		( className, classArity, classKey, classTyVars, classSCTheta, Class )
-import Type		( zipOpenTvSubst, substTheta, pprThetaArrow, pprClassPred, mkTyVarTy )
-import ErrUtils		( dumpIfSet_dyn )
-import MkId		( mkDictFunId )
-import DataCon		( isNullarySrcDataCon, isVanillaDataCon, dataConInstOrigArgTys )
-import Maybes		( catMaybes )
-import RdrName		( RdrName )
-import Name		( Name, getSrcLoc )
-import NameSet		( duDefs )
-import Type		( splitKindFunTys )
-import TyCon		( tyConTyVars, tyConDataCons, tyConArity, tyConHasGenerics,
-			  tyConStupidTheta, isProductTyCon, isDataTyCon, isNewTyCon, newTyConRhs,
-			  isEnumerationTyCon, isRecursiveTyCon, TyCon
-			)
-import TcType		( TcType, ThetaType, mkTyVarTys, mkTyConApp, tcTyConAppTyCon,
-			  isUnLiftedType, mkClassPred, tyVarsOfType, tyVarsOfTypes,
-			  isSubArgTypeKind, tcEqTypes, tcSplitAppTys, mkAppTys )
-import Var		( TyVar, tyVarKind, varName )
-import VarSet		( mkVarSet, disjointVarSet )
+import InstEnv
+import Inst
+import TcHsType
+import TcSimplify
+
+import RnBinds
+import RnEnv
+import HscTypes
+
+import Class
+import Type
+import ErrUtils
+import MkId
+import DataCon
+import Maybes
+import RdrName
+import Name
+import NameSet
+import TyCon
+import TcType
+import Var
+import VarSet
 import PrelNames
-import SrcLoc		( SrcSpan, srcLocSpan, Located(..), unLoc )
-import Util		( zipWithEqual, sortLe, notNull )
-import ListSetOps	( removeDups,  assocMaybe )
+import SrcLoc
+import Util
+import ListSetOps
 import Outputable
 import Bag
 \end{code}
@@ -386,7 +376,11 @@ makeDerivEqns overlap_flag tycl_decls deriv_decls
         mk_eqn_help loc orig gla_exts new_or_data tycon deriv_tvs clas tys
 
     ------------------------------------------------------------------
-    mk_eqn_help gla_exts DataType tycon deriv_tvs clas tys
+    -- data/newtype T a = ... deriving( C t1 t2 )
+    --   leads to a call to mk_eqn_help with
+    --		tycon = T, deriv_tvs = ftv(t1,t2), clas = C, tys = [t1,t2]
+
+    mk_eqn_help loc orig gla_exts DataType tycon deriv_tvs clas tys
       | Just err <- checkSideConditions gla_exts tycon deriv_tvs clas tys
       = bale_out (derivingThingErr clas tys tycon (tyConTyVars tycon) err)
       | otherwise 
@@ -872,7 +866,7 @@ genInst spec
 	-- It's a bit yukky that we return *renamed* InstInfo, but
 	-- *non-renamed* auxiliary bindings
 	; (rn_meth_binds, _fvs) <- discardWarnings $ 
-				   bindLocalNames (map varName tyvars)	$
+				   bindLocalNames (map Var.varName tyvars) $
 			 	   rnMethodBinds clas_nm (\n -> []) [] meth_binds
 
 	-- Build the InstInfo