diff options
| author | simonpj <unknown> | 2005-03-08 10:14:34 +0000 |
|---|---|---|
| committer | simonpj <unknown> | 2005-03-08 10:14:34 +0000 |
| commit | 2f17466f56b1f3e0aef92aed1aa7e307a3227515 (patch) | |
| tree | fc05fbaeb90b5bcfd3596482eb1ecd146e74f12f /ghc/compiler/iface/LoadIface.lhs | |
| parent | a271ad7e6d2b92779a63ab1cc88bc95dc17d6981 (diff) | |
| download | haskell-2f17466f56b1f3e0aef92aed1aa7e307a3227515.tar.gz | |
[project @ 2005-03-08 10:14:32 by simonpj]
Avoid losing location info for ghci; please merge
Diffstat (limited to 'ghc/compiler/iface/LoadIface.lhs')
| -rw-r--r-- | ghc/compiler/iface/LoadIface.lhs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ghc/compiler/iface/LoadIface.lhs b/ghc/compiler/iface/LoadIface.lhs index e5e7a5a895..a760b83bfd 100644 --- a/ghc/compiler/iface/LoadIface.lhs +++ b/ghc/compiler/iface/LoadIface.lhs @@ -24,15 +24,13 @@ import IfaceSyn ( IfaceDecl(..), IfaceConDecl(..), IfaceClassOp(..), IfaceExpr(..), IfaceTyCon(..), IfaceIdInfo(..), IfaceType(..), IfacePredType(..), IfaceExtName, mkIfaceExtName ) -import IfaceEnv ( newGlobalBinder, lookupIfaceExt, lookupIfaceTc, - lookupOrig ) +import IfaceEnv ( newGlobalBinder, lookupIfaceExt, lookupIfaceTc, lookupAvail ) import HscTypes ( ModIface(..), TyThing, emptyModIface, EpsStats(..), addEpsInStats, ExternalPackageState(..), PackageTypeEnv, emptyTypeEnv, lookupIfaceByModule, emptyPackageIfaceTable, IsBootInterface, mkIfaceFixCache, Gated, - implicitTyThings, addRulesToPool, addInstsToPool, - availNames + implicitTyThings, addRulesToPool, addInstsToPool ) import BasicTypes ( Version, Fixity(..), FixityDirection(..), @@ -120,9 +118,10 @@ loadHiBootInterface do { -- Load it (into the PTE), and return the exported names iface <- loadSrcInterface (mk_doc mod_nm) mod_nm True - ; sequenceM [ lookupOrig mod_nm occ - | (mod,avails) <- mi_exports iface, - avail <- avails, occ <- availNames avail] + ; ns_s <- sequenceM [ lookupAvail mod_nm avail + | (mod,avails) <- mi_exports iface, + avail <- avails ] + ; return (concat ns_s) }}} where mk_doc mod = ptext SLIT("Need the hi-boot interface for") <+> ppr mod |