X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcInstDcls.lhs;h=ac5c89667afc77bb522945b7ff5ef9c90972442e;hb=4287edeb7f329529149d8c95597d5e418388265f;hp=880a0eee075d212d4b59bb2128886cf164de8c48;hpb=e6d057711f4d6d6ff6342c39fa2b9e44d25447f1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs
index 880a0ee..ac5c896 100644
--- a/compiler/typecheck/TcInstDcls.lhs
+++ b/compiler/typecheck/TcInstDcls.lhs
@@ -1,7 +1,9 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[TcInstDecls]{Typechecking instance declarations}
+
+TcInstDecls: Typechecking instance declarations
 
 \begin{code}
 module TcInstDcls ( tcInstDecls1, tcInstDecls2 ) where
@@ -9,56 +11,43 @@ module TcInstDcls ( tcInstDecls1, tcInstDecls2 ) where
 #include "HsVersions.h"
 
 import HsSyn
-import TcBinds		( mkPragFun, tcPrags, badBootDeclErr )
-import TcTyClsDecls     ( tcIdxTyInstDecl )
-import TcClassDcl	( tcMethodBind, mkMethodBind, badMethodErr, badATErr,
-			  omittedATWarn, tcClassDecl2, getGenericInstances )
+import TcBinds
+import TcTyClsDecls
+import TcClassDcl
 import TcRnMonad       
-import TcMType		( tcSkolSigType, checkValidInstance,
-			  checkValidInstHead )
-import TcType		( TcType, mkClassPred, tcSplitSigmaTy,
-			  tcSplitDFunHead,  SkolemInfo(InstSkol),
-			  tcSplitTyConApp, 
-			  tcSplitDFunTy, mkFunTy ) 
-import Inst		( newDictBndr, newDictBndrs, instToId, showLIE, 
-			  getOverlapFlag, tcExtendLocalInstEnv )
-import InstEnv		( mkLocalInstance, instanceDFunId )
-import FamInst		( tcExtendLocalFamInstEnv )
-import FamInstEnv	( extractFamInsts )
-import TcDeriv		( tcDeriving )
-import TcEnv		( InstInfo(..), InstBindings(..), 
-			  newDFunName, tcExtendIdEnv, tcExtendGlobalEnv
-			)
-import TcHsType		( kcHsSigType, tcHsKindedType )
-import TcUnify		( checkSigTyVars )
-import TcSimplify	( tcSimplifySuperClasses )
-import Type		( zipOpenTvSubst, substTheta, mkTyConApp, mkTyVarTy,
-                          TyThing(ATyCon), isTyVarTy, tcEqType,
-                          substTys, emptyTvSubst, extendTvSubst )
-import Coercion         ( mkSymCoercion )
-import TyCon            ( TyCon, tyConName, newTyConCo_maybe, tyConTyVars,
-			  isTyConAssoc, tyConFamInst_maybe, tyConDataCons,
-			  assocTyConArgPoss_maybe )
-import DataCon		( classDataCon, dataConInstArgTys )
-import Class		( Class, classTyCon, classBigSig, classATs )
-import Var		( TyVar, Id, idName, idType, tyVarName )
-import MkId		( mkDictFunId )
-import Name		( Name, getSrcLoc, nameOccName )
-import NameSet		( addListToNameSet, emptyNameSet, minusNameSet,
-			  nameSetToList ) 
-import Maybe		( fromJust, catMaybes )
-import Monad		( when )
-import List		( find )
-import DynFlags		( DynFlag(Opt_WarnMissingMethods) )
-import SrcLoc		( srcLocSpan, unLoc, noLoc, Located(..), srcSpanStart,
-			  getLoc)
-import ListSetOps	( minusList )
-import Util		( snocView, dropList )
+import TcMType
+import TcType
+import Inst
+import InstEnv
+import FamInst
+import FamInstEnv
+import TcDeriv
+import TcEnv
+import TcHsType
+import TcUnify
+import TcSimplify
+import Type
+import Coercion
+import TyCon
+import DataCon
+import Class
+import Var
+import MkId
+import Name
+import NameSet
+import DynFlags
+import SrcLoc
+import ListSetOps
+import Util
 import Outputable
 import Bag
-import BasicTypes	( Activation( AlwaysActive ), InlineSpec(..) )
-import HscTypes		( implicitTyThings )
+import BasicTypes
+import HscTypes
 import FastString
+
+import Data.Maybe
+import Control.Monad hiding (zipWithM_, mapAndUnzipM)
+import Data.List
 \end{code}
 
 Typechecking instance declarations is done in two passes. The first
@@ -146,12 +135,13 @@ Gather up the instance declarations from their various sources
 tcInstDecls1	-- Deal with both source-code and imported instance decls
    :: [LTyClDecl Name]		-- For deriving stuff
    -> [LInstDecl Name]		-- Source code instance decls
+   -> [LDerivDecl Name]		-- Source code stand-alone deriving decls
    -> TcM (TcGblEnv,		-- The full inst env
 	   [InstInfo],		-- Source-code instance decls to process; 
 				-- contains all dfuns for this module
 	   HsValBinds Name)	-- Supporting bindings for derived instances
 
-tcInstDecls1 tycl_decls inst_decls
+tcInstDecls1 tycl_decls inst_decls deriv_decls
   = checkNoErrs $
     do {        -- Stop if addInstInfos etc discovers any errors
 		-- (they recover, so that we get more than one error each
@@ -190,7 +180,7 @@ tcInstDecls1 tycl_decls inst_decls
 	        -- (4) Compute instances from "deriving" clauses; 
 		-- This stuff computes a context for the derived instance
 		-- decl, so it needs to know about all the instances possible
-       ; (deriv_inst_info, deriv_binds) <- tcDeriving tycl_decls
+       ; (deriv_inst_info, deriv_binds) <- tcDeriving tycl_decls deriv_decls
        ; addInsts deriv_inst_info   $ do {
 
        ; gbl_env <- getGblEnv
@@ -226,7 +216,11 @@ addInsts infos thing_inside
 
 addFamInsts :: [TyThing] -> TcM a -> TcM a
 addFamInsts tycons thing_inside
-  = tcExtendLocalFamInstEnv (extractFamInsts tycons) thing_inside
+  = tcExtendLocalFamInstEnv (map mkLocalFamInstTyThing tycons) thing_inside
+  where
+    mkLocalFamInstTyThing (ATyCon tycon) = mkLocalFamInst tycon
+    mkLocalFamInstTyThing tything	 = pprPanic "TcInstDcls.addFamInsts"
+						    (ppr tything)
 \end{code} 
 
 \begin{code}