projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Just some alpha renaming
[ghc-hetmet.git]
/
compiler
/
main
/
Finder.lhs
diff --git
a/compiler/main/Finder.lhs
b/compiler/main/Finder.lhs
index
17299fb
..
29e1fb6
100644
(file)
--- a/
compiler/main/Finder.lhs
+++ b/
compiler/main/Finder.lhs
@@
-34,8
+34,7
@@
import Util
import PrelNames ( gHC_PRIM )
import DynFlags
import Outputable
import PrelNames ( gHC_PRIM )
import DynFlags
import Outputable
-import FiniteMap
-import LazyUniqFM
+import UniqFM
import Maybes ( expectJust )
import Exception ( evaluate )
import Maybes ( expectJust )
import Exception ( evaluate )
@@
-78,7
+77,7
@@
flushFinderCaches hsc_env = do
flushModLocationCache :: PackageId -> IORef ModLocationCache -> IO ()
flushModLocationCache this_pkg ref = do
flushModLocationCache :: PackageId -> IORef ModLocationCache -> IO ()
flushModLocationCache this_pkg ref = do
- atomicModifyIORef ref $ \fm -> (filterFM is_ext fm, ())
+ atomicModifyIORef ref $ \fm -> (filterModuleEnv is_ext fm, ())
_ <- evaluate =<< readIORef ref
return ()
where is_ext mod _ | modulePackageId mod /= this_pkg = True
_ <- evaluate =<< readIORef ref
return ()
where is_ext mod _ | modulePackageId mod /= this_pkg = True
@@
-90,7
+89,7
@@
addToFinderCache ref key val =
addToModLocationCache :: IORef ModLocationCache -> Module -> ModLocation -> IO ()
addToModLocationCache ref key val =
addToModLocationCache :: IORef ModLocationCache -> Module -> ModLocation -> IO ()
addToModLocationCache ref key val =
- atomicModifyIORef ref $ \c -> (addToFM c key val, ())
+ atomicModifyIORef ref $ \c -> (extendModuleEnv c key val, ())
removeFromFinderCache :: IORef FinderCache -> ModuleName -> IO ()
removeFromFinderCache ref key =
removeFromFinderCache :: IORef FinderCache -> ModuleName -> IO ()
removeFromFinderCache ref key =
@@
-98,7
+97,7
@@
removeFromFinderCache ref key =
removeFromModLocationCache :: IORef ModLocationCache -> Module -> IO ()
removeFromModLocationCache ref key =
removeFromModLocationCache :: IORef ModLocationCache -> Module -> IO ()
removeFromModLocationCache ref key =
- atomicModifyIORef ref $ \c -> (delFromFM c key, ())
+ atomicModifyIORef ref $ \c -> (delModuleEnv c key, ())
lookupFinderCache :: IORef FinderCache -> ModuleName -> IO (Maybe FindResult)
lookupFinderCache ref key = do
lookupFinderCache :: IORef FinderCache -> ModuleName -> IO (Maybe FindResult)
lookupFinderCache ref key = do
@@
-109,7
+108,7
@@
lookupModLocationCache :: IORef ModLocationCache -> Module
-> IO (Maybe ModLocation)
lookupModLocationCache ref key = do
c <- readIORef ref
-> IO (Maybe ModLocation)
lookupModLocationCache ref key = do
c <- readIORef ref
- return $! lookupFM c key
+ return $! lookupModuleEnv c key
-- -----------------------------------------------------------------------------
-- The two external entry points
-- -----------------------------------------------------------------------------
-- The two external entry points