X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=df32170f2bcc104b95fee0535bc6c85315c9afe9;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=cef6f6ad4319c7f4e75f7575cfb0f3c94a5848de;hpb=26741ec416bae2c502ef00a2ba0e79050a32cb67;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index cef6f6a..df32170 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -21,31 +21,32 @@ import HsSyn		( InstDecl(..), FixityDecl, Sig(..),
 			  InPat(..), OutPat(..), HsExpr(..), HsLit(..),
 			  Stmt, Qualifier, ArithSeqInfo, Fake,
 			  PolyType(..), MonoType )
-import RnHsSyn		( RenamedHsBinds(..), RenamedMonoBinds(..),
+import RnHsSyn		( SYN_IE(RenamedHsBinds), SYN_IE(RenamedMonoBinds),
 			  RenamedInstDecl(..), RenamedFixityDecl(..),
 			  RenamedSig(..), RenamedSpecInstSig(..),
 			  RnName(..){-incl instance Outputable-}
 			)
-import TcHsSyn		( TcIdOcc(..), TcHsBinds(..),
-			  TcMonoBinds(..), TcExpr(..), tcIdType,
+import TcHsSyn		( TcIdOcc(..), SYN_IE(TcHsBinds),
+			  SYN_IE(TcMonoBinds), SYN_IE(TcExpr), tcIdType,
 			  mkHsTyLam, mkHsTyApp,
 			  mkHsDictLam, mkHsDictApp )
 
 
 import TcMonad		hiding ( rnMtoTcM )
 import GenSpecEtc	( checkSigTyVars )
-import Inst		( Inst, InstOrigin(..), InstanceMapper(..),
-			  newDicts, newMethod, LIE(..), emptyLIE, plusLIE )
+import Inst		( Inst, InstOrigin(..), SYN_IE(InstanceMapper),
+			  newDicts, newMethod, SYN_IE(LIE), emptyLIE, plusLIE )
 import TcBinds		( tcPragmaSigs )
 import TcDeriv		( tcDeriving )
 import TcEnv		( tcLookupClass, tcTyVarScope, newLocalId, tcExtendGlobalTyVars )
+import SpecEnv		( SpecEnv )
 import TcGRHSs		( tcGRHSsAndBinds )
 import TcInstUtil	( InstInfo(..), mkInstanceRelatedIds, buildInstanceEnvs )
 import TcKind		( TcKind, unifyKind )
 import TcMatches	( tcMatchesFun )
 import TcMonoType	( tcContext, tcMonoTypeKind )
 import TcSimplify	( tcSimplifyAndCheck )
-import TcType		( TcType(..), TcTyVar(..), TcTyVarSet(..), 
+import TcType		( SYN_IE(TcType), SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), 
 			  tcInstSigTyVars, tcInstType, tcInstTheta, tcInstTcType
 			)
 import Unify		( unifyTauTy, unifyTauTyLists )
@@ -79,7 +80,7 @@ import Type		( GenType(..), SYN_IE(ThetaType), mkTyVarTys,
 			  splitSigmaTy, splitAppTy, isTyVarTy, matchTy, mkSigmaTy,
 			  getTyCon_maybe, maybeBoxedPrimType, splitRhoTy, eqTy
 			)
-import TyVar		( GenTyVar, GenTyVarSet(..), mkTyVarSet, unionTyVarSets )
+import TyVar		( GenTyVar, SYN_IE(GenTyVarSet), mkTyVarSet, unionTyVarSets )
 import TysWiredIn	( stringTy )
 import Unique		( Unique )
 import Util		( zipEqual, panic )
@@ -631,7 +632,7 @@ processInstBinds1 clas avail_insts method_ids mbind
 		-- Make the method_tyvars into signature tyvars so they
 		-- won't get unified with anything.
 	tcInstSigTyVars method_tyvars		`thenNF_Tc` \ (sig_tyvars, sig_tyvar_tys, _) ->
-	unifyTauTyLists (mkTyVarTys method_tyvars) sig_tyvar_tys	`thenTc_`
+	unifyTauTyLists sig_tyvar_tys (mkTyVarTys method_tyvars)	`thenTc_`
 
 	newLocalId occ method_tau		`thenNF_Tc` \ local_id ->
 	newLocalId occ method_ty		`thenNF_Tc` \ copy_id ->