X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=0eff0ad51c5bf9ba73d099aaeaa86ed5b200df60;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=47649c76bbeb88c254dc4f4701f624493b73bb9a;hpb=e7498a3ee1d0484d02a9e86633cc179c76ebf36e;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs
index 47649c7..0eff0ad 100644
--- a/ghc/compiler/typecheck/TcTyDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyDecls.lhs
@@ -16,7 +16,7 @@ IMP_Ubiq(){-uitous-}
 
 import HsSyn		( TyDecl(..), ConDecl(..), BangType(..), HsExpr(..), 
 			  Match(..), GRHSsAndBinds(..), GRHS(..), OutPat(..), 
-			  HsBinds(..), HsLit, Stmt, Qual, ArithSeqInfo,
+			  HsBinds(..), HsLit, Stmt, Qualifier, ArithSeqInfo,
 			  PolyType, Fake, InPat,
 			  Bind(..), MonoBinds(..), Sig, 
 			  MonoType )
@@ -24,7 +24,7 @@ import RnHsSyn		( RenamedTyDecl(..), RenamedConDecl(..),
 			  RnName{-instance Outputable-}
 			)
 import TcHsSyn		( mkHsTyLam, mkHsDictLam, tcIdType,
-			  TcHsBinds(..), TcIdOcc(..)
+			  SYN_IE(TcHsBinds), TcIdOcc(..)
 			)
 import Inst		( newDicts, InstOrigin(..), Inst )
 import TcMonoType	( tcMonoTypeKind, tcMonoType, tcPolyType, tcContext )
@@ -36,7 +36,9 @@ import TcEnv		( tcLookupTyCon, tcLookupTyVar, tcLookupClass,
 import TcMonad		hiding ( rnMtoTcM )
 import TcKind		( TcKind, unifyKind, mkTcArrowKind, mkTcTypeKind )
 
-import PprType		( GenClass, GenType{-instance Outputable-} )
+import PprType		( GenClass, GenType{-instance Outputable-},
+			  GenTyVar{-instance Outputable-}{-ToDo:possibly rm-}
+			)
 import Class		( GenClass{-instance Eq-}, classInstEnv )
 import Id		( mkDataCon, dataConSig, mkRecordSelId, idType,
 			  dataConFieldLabels, dataConStrictMarks,
@@ -45,7 +47,7 @@ import Id		( mkDataCon, dataConSig, mkRecordSelId, idType,
 			)
 import FieldLabel
 import Kind		( Kind, mkArrowKind, mkBoxedTypeKind )
-import SpecEnv		( SpecEnv(..), nullSpecEnv )
+import SpecEnv		( SpecEnv, nullSpecEnv )
 import Name		( nameSrcLoc, isLocallyDefinedName, getSrcLoc,
 			  Name{-instance Ord3-}
 			)
@@ -59,10 +61,9 @@ import Type		( GenType, -- instances
 			  applyTyCon, mkTyVarTys, mkForAllTys, mkFunTy,
 			  splitFunTy, mkTyVarTy, getTyVar_maybe
 			)
-import PprType		( GenTyVar{-instance Outputable-}{-ToDo:possibly rm-} )
 import TyVar		( tyVarKind, elementOfTyVarSet, GenTyVar{-instance Eq-} )
 import Unique		( Unique {- instance Eq -}, evalClassKey )
-import UniqSet		( emptyUniqSet, mkUniqSet, uniqSetToList, unionManyUniqSets, UniqSet(..) )
+import UniqSet		( emptyUniqSet, mkUniqSet, uniqSetToList, unionManyUniqSets, SYN_IE(UniqSet) )
 import Util		( equivClasses, zipEqual, nOfThem, panic, assertPanic )
 \end{code}