X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcBinds.lhs;h=0ec1c66657c97a2354bc9ff2c7e3b4975bd35afa;hb=0d1fca153fa5426d793a4b16acdf57e409b9193f;hp=a3b17a600ce1f278676154dd45b18e67ac2ad775;hpb=9da4639011348fb6c318e3cba4b08622f811d9c4;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcBinds.lhs b/compiler/typecheck/TcBinds.lhs
index a3b17a6..0ec1c66 100644
--- a/compiler/typecheck/TcBinds.lhs
+++ b/compiler/typecheck/TcBinds.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 \section[TcBinds]{TcBinds}
@@ -15,56 +16,36 @@ module TcBinds ( tcLocalBinds, tcTopBinds,
 import {-# SOURCE #-} TcMatches ( tcGRHSsPat, tcMatchesFun )
 import {-# SOURCE #-} TcExpr  ( tcMonoExpr )
 
-import DynFlags		( dopt, DynFlags,
-			  DynFlag(Opt_MonomorphismRestriction, Opt_MonoPatBinds, Opt_GlasgowExts) )
-import HsSyn		( HsExpr(..), HsBind(..), LHsBinds, LHsBind, Sig(..),
-			  HsLocalBinds(..), HsValBinds(..), HsIPBinds(..),
-			  LSig, Match(..), IPBind(..), Prag(..), LHsType,
-			  isVanillaLSig, sigName, placeHolderNames, isPragLSig,
-			  LPat, GRHSs, MatchGroup(..), pprLHsBinds, mkHsWrap, hsExplicitTvs,
-			  collectHsBindBinders, collectPatBinders, pprPatBind, isBangHsBind
-			)
-import TcHsSyn		( zonkId )
+import DynFlags
+import HsSyn
+import TcHsSyn
 
 import TcRnMonad
-import Inst		( newDictBndrs, newIPDict, instToId )
-import TcEnv		( tcExtendIdEnv, tcExtendIdEnv2, tcExtendTyVarEnv2, 
-			  pprBinders, tcLookupId,
-			  tcGetGlobalTyVars )
-import TcUnify		( tcInfer, tcSubExp, unifyTheta, 
-			  bleatEscapedTvs, sigCtxt )
-import TcSimplify	( tcSimplifyInfer, tcSimplifyInferCheck, 
-			  tcSimplifyRestricted, tcSimplifyIPs )
-import TcHsType		( tcHsSigType, UserTypeCtxt(..) )
-import TcPat		( tcLetPat )
-import TcSimplify	( bindInstsOfLocalFuns )
-import TcMType		( newFlexiTyVarTy, zonkQuantifiedTyVar, zonkSigTyVar,
-			  tcInstSigTyVars, tcInstSkolTyVars, tcInstType, 
-			  zonkTcType, zonkTcTypes, zonkTcTyVar )
-import TcType		( TcType, TcTyVar, TcThetaType, 
-			  SkolemInfo(SigSkol), UserTypeCtxt(FunSigCtxt), 
-			  TcTauType, TcSigmaType, isUnboxedTupleType,
-			  mkTyVarTy, mkForAllTys, mkFunTys, exactTyVarsOfType, 
-			  mkForAllTy, isUnLiftedType, tcGetTyVar, 
-			  mkTyVarTys, tidyOpenTyVar )
-import {- Kind parts of -} Type		( argTypeKind )
-import VarEnv		( TyVarEnv, emptyVarEnv, lookupVarEnv, extendVarEnv ) 
-import TysPrim		( alphaTyVar )
-import Id		( Id, mkLocalId, mkVanillaGlobal )
-import IdInfo		( vanillaIdInfo )
-import Var		( TyVar, idType, idName )
-import Name		( Name )
+import Inst
+import TcEnv
+import TcUnify
+import TcSimplify
+import TcHsType
+import TcPat
+import TcMType
+import TcType
+import {- Kind parts of -} Type
+import VarEnv
+import TysPrim
+import Id
+import IdInfo
+import Var ( TyVar )
+import Name
 import NameSet
 import NameEnv
 import VarSet
-import SrcLoc		( Located(..), unLoc, getLoc )
+import SrcLoc
 import Bag
-import ErrUtils		( Message )
-import Digraph		( SCC(..), stronglyConnComp )
-import Maybes		( expectJust, isJust, isNothing, orElse )
-import Util		( singleton )
-import BasicTypes	( TopLevelFlag(..), isTopLevel, isNotTopLevel,
-			  RecFlag(..), isNonRec, InlineSpec, defaultInlineSpec )
+import ErrUtils
+import Digraph
+import Maybes
+import Util
+import BasicTypes
 import Outputable
 \end{code}
 
@@ -753,7 +734,8 @@ generalise dflags top_lvl bind_list sig_fn mono_infos lie_req
 
     mkMethInst (TcSigInfo { sig_id = poly_id, sig_tvs = tvs, 
 		            sig_theta = theta, sig_loc = loc }) mono_id
-      = Method mono_id poly_id (mkTyVarTys tvs) theta loc
+      = Method {tci_id = mono_id, tci_oid = poly_id, tci_tys = mkTyVarTys tvs,
+		tci_theta = theta, tci_loc = loc}
 \end{code}
 
 unifyCtxts checks that all the signature contexts are the same