X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FFinder.lhs;h=501dbd001c69fbc91f9b2d3608d9fe7b5d5c747a;hb=fd99cf4f7c390e4b1abc9a839a6f023d3b6c4757;hp=13c665b43c0f6c0a4eacd63e8e644b6fa4c962ba;hpb=212cb7d1ce7c473bb7b4d81ae88f0f1df27b450d;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Finder.lhs b/ghc/compiler/main/Finder.lhs index 13c665b..501dbd0 100644 --- a/ghc/compiler/main/Finder.lhs +++ b/ghc/compiler/main/Finder.lhs @@ -5,7 +5,7 @@ \begin{code} module Finder ( - newFinder, -- :: PackageConfigInfo -> IO (), + initFinder, -- :: PackageConfigInfo -> IO (), findModule, -- :: ModuleName -> IO (Maybe (Module, ModuleLocation)) ModuleLocation(..), mkHomeModuleLocn, @@ -43,8 +43,8 @@ GLOBAL_VAR(v_PkgDirCache, error "no pkg cache!", FiniteMap String (PackageNa GLOBAL_VAR(v_HomeDirCache, Nothing, Maybe (FiniteMap String FilePath)) -newFinder :: PackageConfigInfo -> IO () -newFinder (PackageConfigInfo pkgs) = do +initFinder :: PackageConfigInfo -> IO () +initFinder (PackageConfigInfo pkgs) = do -- expunge our home cache writeIORef v_HomeDirCache Nothing @@ -52,8 +52,8 @@ newFinder (PackageConfigInfo pkgs) = do writeIORef v_PkgDirCache (unsafePerformIO (newPkgCache pkgs)) -findModule :: [Package] -> ModuleName -> IO (Maybe (Module, ModuleLocation)) -findModule pkgs name = do +findModule :: ModuleName -> IO (Maybe (Module, ModuleLocation)) +findModule name = do j <- maybeHomeModule name case j of Just home_module -> return (Just home_module)