diff options
| author | simonmar <unknown> | 2000-11-27 10:48:10 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2000-11-27 10:48:10 +0000 |
| commit | 1da5ea2694d0ab7d7487b09b3f682e39ff816cae (patch) | |
| tree | 225c3ae5cd72a785e2c5d97a4ce2d457ea960d8d | |
| parent | e8470a28fb1d934b592341d55f69bc990fdf25c4 (diff) | |
| download | haskell-1da5ea2694d0ab7d7487b09b3f682e39ff816cae.tar.gz | |
[project @ 2000-11-27 10:48:10 by simonmar]
rename filterNameEnv-->filterNameMap to avoid clash with Name.filterNameEnv.
| -rw-r--r-- | ghc/compiler/compMan/CmLink.lhs | 4 | ||||
| -rw-r--r-- | ghc/compiler/ghci/StgInterp.lhs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ghc/compiler/compMan/CmLink.lhs b/ghc/compiler/compMan/CmLink.lhs index d3ed436224..efdc332efe 100644 --- a/ghc/compiler/compMan/CmLink.lhs +++ b/ghc/compiler/compMan/CmLink.lhs @@ -205,8 +205,8 @@ invalidLinkable = throwDyn (OtherError "linkable doesn't contain entirely object -- various environments any previous versions of these modules. linkFinish pls mods ul_trees = do resolveObjs - let itbl_env' = filterNameEnv mods (itbl_env pls) - closure_env' = filterNameEnv mods (closure_env pls) + let itbl_env' = filterNameMap mods (itbl_env pls) + closure_env' = filterNameMap mods (closure_env pls) stuff = [ (trees,itbls) | Trees trees itbls <- ul_trees ] (ibinds, new_itbl_env, new_closure_env) <- diff --git a/ghc/compiler/ghci/StgInterp.lhs b/ghc/compiler/ghci/StgInterp.lhs index f8deebaf2f..0fed83b353 100644 --- a/ghc/compiler/ghci/StgInterp.lhs +++ b/ghc/compiler/ghci/StgInterp.lhs @@ -8,7 +8,7 @@ module StgInterp ( ClosureEnv, ItblEnv, - filterNameEnv, -- :: [ModuleName] -> FiniteMap Name a + filterNameMap, -- :: [ModuleName] -> FiniteMap Name a -- -> FiniteMap Name a linkIModules, -- :: ItblEnv -> ClosureEnv @@ -103,8 +103,8 @@ type ClosureEnv = FiniteMap Name HValue emptyClosureEnv = emptyFM -- remove all entries for a given set of modules from the environment -filterNameEnv :: [ModuleName] -> FiniteMap Name a -> FiniteMap Name a -filterNameEnv mods env +filterNameMap :: [ModuleName] -> FiniteMap Name a -> FiniteMap Name a +filterNameMap mods env = filterFM (\n _ -> moduleName (nameModule n) `notElem` mods) env -- --------------------------------------------------------------------------- |