From 272163f08c4392a5e0a40e31330c813e04da9061 Mon Sep 17 00:00:00 2001
From: simonpj <unknown>
Date: Wed, 21 Apr 2004 12:45:07 +0000
Subject: [PATCH] [project @ 2004-04-21 12:45:05 by simonpj] Import wibbles

---
 ghc/compiler/typecheck/TcDeriv.lhs    |    5 +----
 ghc/compiler/typecheck/TcGenDeriv.lhs |   10 +++-------
 ghc/compiler/typecheck/TcInstDcls.lhs |    7 ++-----
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs
index f1e72be..8254008 100644
--- a/ghc/compiler/typecheck/TcDeriv.lhs
+++ b/ghc/compiler/typecheck/TcDeriv.lhs
@@ -26,7 +26,6 @@ import TcSimplify	( tcSimplifyDeriv )
 
 import RnBinds		( rnMethodBinds, rnTopBinds )
 import RnEnv		( bindLocalNames )
-import TcRnMonad	( thenM, returnM, mapAndUnzipM )
 import HscTypes		( DFunId, FixityEnv )
 
 import Class		( className, classArity, classKey, classTyVars, classSCTheta, Class )
@@ -38,14 +37,12 @@ import Maybes		( catMaybes )
 import RdrName		( RdrName )
 import Name		( Name, getSrcLoc )
 import NameSet		( NameSet, emptyNameSet, duDefs )
-import Unique		( Unique, getUnique )
 import Kind		( splitKindFunTys )
 import TyCon		( tyConTyVars, tyConDataCons, tyConArity, tyConHasGenerics,
 			  tyConTheta, isProductTyCon, isDataTyCon, newTyConRhs,
 			  isEnumerationTyCon, isRecursiveTyCon, TyCon
 			)
-import TcType		( TcType, ThetaType, mkTyVarTys, mkTyConApp, 
-			  tcSplitForAllTys, tcSplitPredTy_maybe, getClassPredTys_maybe, tcTyConAppTyCon,
+import TcType		( TcType, ThetaType, mkTyVarTys, mkTyConApp, tcTyConAppTyCon,
 			  isUnLiftedType, mkClassPred, tyVarsOfTypes, isArgTypeKind,
 			  tcEqTypes, tcSplitAppTys, mkAppTys, tcSplitDFunTy )
 import Var		( TyVar, tyVarKind, idType, varName )
diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs
index 67cb7ee..05019c3 100644
--- a/ghc/compiler/typecheck/TcGenDeriv.lhs
+++ b/ghc/compiler/typecheck/TcGenDeriv.lhs
@@ -37,16 +37,11 @@ import DataCon		( isNullaryDataCon, dataConTag,
 			  dataConOrigArgTys, dataConSourceArity, fIRST_TAG,
 			  DataCon, dataConName,
 			  dataConFieldLabels )
-import Name		( getOccString, getOccName, getSrcLoc, occNameString, 
-			  occNameUserString, 
-			  Name, NamedThing(..), 
-			  isDataSymOcc, isSymOcc
-			)
+import Name		( getOccString, getSrcLoc, Name, NamedThing(..)	)
 
 import HscTypes		( FixityEnv, lookupFixity )
 import PrelInfo
 import PrelNames
-import TysWiredIn
 import MkId		( eRROR_ID )
 import PrimOp		( PrimOp(..) )
 import SrcLoc		( Located(..), noLoc, srcLocSpan )
@@ -56,7 +51,8 @@ import TyCon		( TyCon, isNewTyCon, tyConDataCons, isEnumerationTyCon, tyConArity
 import TcType		( isUnLiftedType, tcEqType, Type )
 import TysPrim		( charPrimTy, intPrimTy, wordPrimTy, addrPrimTy, floatPrimTy, doublePrimTy,
 			  intPrimTyCon )
-import TysWiredIn	( charDataCon, intDataCon, floatDataCon, doubleDataCon )
+import TysWiredIn	( charDataCon, intDataCon, floatDataCon, doubleDataCon,
+			  intDataCon_RDR, true_RDR, false_RDR )
 import Util		( zipWithEqual, isSingleton,
 			  zipWith3Equal, nOfThem, zipEqual )
 import Char		( isAlpha )
diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index 109fb30..2be8560 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -9,7 +9,6 @@ module TcInstDcls ( tcInstDecls1, tcInstDecls2 ) where
 #include "HsVersions.h"
 
 import HsSyn
-import TcHsSyn		( mkHsConApp )
 import TcBinds		( tcSpecSigs )
 import TcClassDcl	( tcMethodBind, mkMethodBind, badMethodErr, 
 			  tcClassDecl2, getGenericInstances )
@@ -19,8 +18,7 @@ import TcMType		( tcInstType, checkValidTheta, checkValidInstHead, instTypeErr,
 import TcType		( mkClassPred, tcSplitForAllTys, tyVarsOfType,
 			  tcSplitSigmaTy, getClassPredTys, tcSplitPredTy_maybe, mkTyVarTys,
 			  TyVarDetails(..), tcSplitDFunTy, pprClassPred )
-import Inst		( InstOrigin(..), tcInstClassOp, newDicts, instToId, 
-			  showLIE, tcExtendLocalInstEnv )
+import Inst		( tcInstClassOp, newDicts, instToId, showLIE, tcExtendLocalInstEnv )
 import TcDeriv		( tcDeriving )
 import TcEnv		( tcExtendGlobalValEnv, tcExtendTyVarEnv2,
  			  InstInfo(..), InstBindings(..), 
@@ -33,11 +31,10 @@ import Subst		( mkTyVarSubst, substTheta, substTy )
 import DataCon		( classDataCon )
 import Class		( classBigSig )
 import Var		( Id, idName, idType )
-import NameSet		
 import MkId		( mkDictFunId, rUNTIME_ERROR_ID )
 import FunDeps		( checkInstFDs )
 import Name		( Name, getSrcLoc )
-import NameSet		( unitNameSet, emptyNameSet, nameSetToList )
+import NameSet		( unitNameSet, emptyNameSet, nameSetToList, unionNameSets )
 import UnicodeUtil	( stringToUtf8 )
 import Maybe		( catMaybes )
 import SrcLoc		( srcLocSpan, unLoc, noLoc, Located(..), srcSpanStart )
-- 
1.7.10.4