X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=be1ce9b96440208f4f62719b38df2da3c2f01ccd;hb=1525a5819aa3a6eae8d8b05cfe348a2384da0c84;hp=388828ee4b051946af8920347eeb43d61289e5ae;hpb=658e99a85870d02c734d78e488e963da107133ff;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs index 388828e..be1ce9b 100644 --- a/compiler/typecheck/TcEnv.lhs +++ b/compiler/typecheck/TcEnv.lhs @@ -64,14 +64,11 @@ import InstEnv ( Instance, DFunId, instanceDFunId, instanceHead ) import DataCon ( DataCon ) import TyCon ( TyCon ) import Class ( Class ) -import Name ( Name, NamedThing(..), getSrcLoc, nameModule, isExternalName ) +import Name ( Name, NamedThing(..), getSrcLoc, nameModule ) import PrelNames ( thFAKE ) import NameEnv import OccName ( mkDFunOcc, occNameString ) -import HscTypes ( extendTypeEnvList, lookupType, - TyThing(..), tyThingId, tyThingDataCon, - ExternalPackageState(..) ) - +import HscTypes ( extendTypeEnvList, lookupType, TyThing(..), ExternalPackageState(..) ) import SrcLoc ( SrcLoc, Located(..) ) import Outputable \end{code} @@ -107,7 +104,8 @@ tcLookupGlobal name -- Try global envt { (eps,hpt) <- getEpsAndHpt - ; case lookupType hpt (eps_PTE eps) name of { + ; dflags <- getDOpts + ; case lookupType dflags hpt (eps_PTE eps) name of { Just thing -> return thing ; Nothing -> do @@ -390,6 +388,8 @@ find_thing ignore_it tidy_env (ATyVar tv ty) bound_at = parens $ ptext SLIT("bound at:") <+> ppr (getSrcLoc tv) in returnM (tidy_env1, Just msg) + +find_thing _ _ thing = pprPanic "find_thing" (ppr thing) \end{code} \begin{code}