X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=571ebf7031e35d20751f8240544cdbcbfa63e24b;hb=99073d876ea762016683fb0b22b9d343ff864eb4;hp=245e76200cbcbf3f22a3acb97eb98da449b16a2d;hpb=323fee1e8cbabe604496a1b92c6de0e98ca037e4;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index 245e762..571ebf7 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -11,15 +11,15 @@ module TcInstDcls ( tcInstDecls1, tcInstDecls2, tcAddDeclCtxt ) where
 
 import CmdLineOpts	( DynFlag(..), dopt )
 
-import HsSyn		( HsDecl(..), InstDecl(..), TyClDecl(..),
-			  MonoBinds(..), HsExpr(..),  HsLit(..), Sig(..),
+import HsSyn		( HsDecl(..), InstDecl(..), TyClDecl(..), InPat(..),
+			  MonoBinds(..), HsExpr(..),  HsLit(..), Sig(..), Match(..),
 			  andMonoBindList, collectMonoBinders, isClassDecl
 			)
 import HsTypes          ( HsType (..), HsTyVarBndr(..), toHsTyVar )
-import HsPat            ( InPat (..) )
-import HsMatches        ( Match (..) )
-import RnHsSyn		( RenamedHsBinds, RenamedInstDecl, RenamedHsDecl,
-			  extractHsTyVars )
+import RnHsSyn		( RenamedHsBinds, RenamedInstDecl, RenamedHsDecl, RenamedMonoBinds,
+			  RenamedTyClDecl, RenamedHsType, 
+			  extractHsTyVars, maybeGenericMatch
+			)
 import TcHsSyn		( TcMonoBinds, mkHsConApp )
 import TcBinds		( tcSpecSigs )
 import TcClassDcl	( tcMethodBind, badMethodErr )
@@ -70,11 +70,10 @@ import Name             ( Name, NameEnv, extendNameEnv_C, emptyNameEnv,
 			  plusNameEnv_C, nameEnvElts )
 import FiniteMap        ( mapFM )
 import SrcLoc           ( SrcLoc )
-import RnHsSyn          -- ( RenamedMonoBinds )
 import VarSet           ( varSetElems )
 import UniqFM           ( mapUFM )
 import Unique		( Uniquable(..) )
-import BasicTypes	( NewOrData(..) )
+import BasicTypes	( NewOrData(..), Fixity )
 import ErrUtils		( dumpIfSet_dyn )
 import ListSetOps	( Assoc, emptyAssoc, plusAssoc_C, mapAssoc, 
 			  assocElts, extendAssoc_C,