X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;h=4fb3f870ef199a347f2e66b31bd7f129bf02f086;hb=ac80e0dececb68ed6385e3b34765fd8f9c019767;hp=2835c8522107c63ee04c7d6faf2bc17b0e7db624;hpb=43d5a248f604acf6ad4d743ed7c002580c44aa8f;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs
index 2835c85..4fb3f87 100644
--- a/ghc/compiler/typecheck/Inst.lhs
+++ b/ghc/compiler/typecheck/Inst.lhs
@@ -23,7 +23,7 @@ module Inst (
 	instLoc, getDictClassTys, dictPred,
 
 	lookupInst, LookupInstResult(..),
-	tcExtendLocalInstEnv, tcGetInstEnvs,
+	tcExtendLocalInstEnv, tcGetInstEnvs, 
 
 	isDict, isClassDict, isMethod, 
 	isLinearInst, linearInstType, isIPDict, isInheritableInst,
@@ -71,7 +71,8 @@ import Type	( TvSubst, substTy, substTyVar, substTyWith, substTheta, zipTopTvSub
 import Unify	( tcMatchTys )
 import Kind	( isSubKind )
 import Packages	( isHomeModule )
-import HscTypes	( ExternalPackageState(..) )
+import HscTypes	( HscEnv( hsc_HPT ), ExternalPackageState(..), 
+		  ModDetails( md_insts ), HomeModInfo( hm_details )  )
 import CoreFVs	( idFreeTyVars )
 import DataCon	( DataCon, dataConTyVars, dataConStupidTheta, dataConName )
 import Id	( Id, idName, idType, mkUserLocal, mkLocalId )
@@ -83,13 +84,14 @@ import Literal	( inIntRange )
 import Var	( TyVar, tyVarKind, setIdType )
 import VarEnv	( TidyEnv, emptyTidyEnv )
 import VarSet	( elemVarSet, emptyVarSet, unionVarSet, mkVarSet )
+import Module	( moduleEnvElts, elemModuleEnv, lookupModuleEnv )
 import TysWiredIn ( floatDataCon, doubleDataCon )
 import PrelNames	( integerTyConName, fromIntegerName, fromRationalName, rationalTyConName )
 import BasicTypes( IPName(..), mapIPName, ipNameName )
 import UniqSupply( uniqsFromSupply )
 import SrcLoc	( mkSrcSpan, noLoc, unLoc, Located(..) )
 import CmdLineOpts( DynFlags )
-import Maybes	( isJust )
+import Maybes	( isJust, fromJust )
 import Outputable
 \end{code}
 
@@ -615,6 +617,7 @@ addDictLoc dfun thing_inside
   where
    loc = getSrcLoc dfun
 \end{code}
+    
 
 %************************************************************************
 %*									*