[project @ 2000-11-27 10:48:10 by simonmar]

rename filterNameEnv-->filterNameMap to avoid clash with Name.filterNameEnv.

diff --git a/ghc/compiler/compMan/CmLink.lhs b/ghc/compiler/compMan/CmLink.lhs
index d3ed436..efdc332 100644 (file)
--- 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 f8deeba..0fed83b 100644 (file)
--- 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
 
 -- ---------------------------------------------------------------------------