refactoring only: use the parameterised InstalledPackageInfo

[ghc-hetmet.git] / compiler / main / Finder.lhs

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index 56929ce..6e2b11d 100644 (file)
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -80,16 +80,25 @@ flushModLocationCache this_pkg ref = do
   where is_ext mod _ | modulePackageId mod /= this_pkg = True
                     | otherwise = False
 
+addToFinderCache :: IORef FinderCache -> ModuleName -> FindResult -> IO ()
 addToFinderCache       ref key val = modifyIORef ref $ \c -> addToUFM c key val
+
+addToModLocationCache :: IORef ModLocationCache -> Module -> ModLocation -> IO ()
 addToModLocationCache  ref key val = modifyIORef ref $ \c -> addToFM c key val
 
+removeFromFinderCache :: IORef FinderCache -> ModuleName -> IO ()
 removeFromFinderCache      ref key = modifyIORef ref $ \c -> delFromUFM c key
+
+removeFromModLocationCache :: IORef ModLocationCache -> Module -> IO ()
 removeFromModLocationCache ref key = modifyIORef ref $ \c -> delFromFM c key
 
+lookupFinderCache :: IORef FinderCache -> ModuleName -> IO (Maybe FindResult)
 lookupFinderCache ref key = do 
    c <- readIORef ref
    return $! lookupUFM c key
 
+lookupModLocationCache :: IORef ModLocationCache -> Module
+                       -> IO (Maybe ModLocation)
 lookupModLocationCache ref key = do
    c <- readIORef ref
    return $! lookupFM c key
@@ -141,6 +150,7 @@ findExactModule hsc_env mod =
 -- -----------------------------------------------------------------------------
 -- Helpers
 
+orIfNotFound :: IO FindResult -> IO FindResult -> IO FindResult
 this `orIfNotFound` or_this = do
   res <- this
   case res of
@@ -266,6 +276,7 @@ findPackageModule hsc_env mod = do
      Nothing -> return (NoPackage pkg_id)
      Just pkg_conf -> findPackageModule_ hsc_env mod pkg_conf
       
+findPackageModule_ :: HscEnv -> Module -> PackageConfig -> IO FindResult
 findPackageModule_ hsc_env mod pkg_conf = 
   modLocationCache hsc_env mod $
 
@@ -461,7 +472,7 @@ mkStubPaths
   :: DynFlags
   -> ModuleName
   -> ModLocation
-  -> (FilePath,FilePath)
+  -> (FilePath,FilePath,FilePath)
 
 mkStubPaths dflags mod location
   = let
@@ -476,9 +487,23 @@ mkStubPaths dflags mod location
                        | otherwise           = src_basename
 
                stub_basename = stub_basename0 ++ "_stub"
+
+                -- this is the filename we're going to use when
+                -- #including the stub_h file from the .hc file.
+                -- Without -stubdir, we just #include the basename
+                -- (eg. for a module A.B, we #include "B_stub.h"),
+                -- relying on the fact that we add an implicit -I flag
+                -- for the directory in which the source file resides
+                -- (see DriverPipeline.hs).  With -stubdir, we
+                -- #include "A/B.h", assuming that the user has added
+                -- -I<dir> along with -stubdir <dir>.
+                include_basename
+                        | Just _ <- stubdir = mod_basename 
+                        | otherwise         = filenameOf src_basename
      in
         (stub_basename `joinFileExt` "c",
-        stub_basename `joinFileExt` "h")
+        stub_basename `joinFileExt` "h",
+         (include_basename ++ "_stub") `joinFileExt` "h")
        -- the _stub.o filename is derived from the ml_obj_file.
 
 -- -----------------------------------------------------------------------------
@@ -498,7 +523,7 @@ findObjectLinkableMaybe mod locn
 findObjectLinkable :: Module -> FilePath -> ClockTime -> IO Linkable
 findObjectLinkable mod obj_fn obj_time = do
   let stub_fn = case splitFilename3 obj_fn of
-                       (dir, base, ext) -> dir ++ "/" ++ base ++ "_stub.o"
+                       (dir, base, _ext) -> dir ++ "/" ++ base ++ "_stub.o"
   stub_exist <- doesFileExist stub_fn
   if stub_exist
        then return (LM obj_time mod [DotO obj_fn, DotO stub_fn])
@@ -507,9 +532,9 @@ findObjectLinkable mod obj_fn obj_time = do
 -- -----------------------------------------------------------------------------
 -- Utils
 
+dots_to_slashes :: String -> String
 dots_to_slashes = map (\c -> if c == '.' then '/' else c)
 
-
 -- -----------------------------------------------------------------------------
 -- Error messages
 
@@ -519,7 +544,8 @@ cannotFindModule = cantFindErr SLIT("Could not find module")
 cannotFindInterface  :: DynFlags -> ModuleName -> FindResult -> SDoc
 cannotFindInterface = cantFindErr SLIT("Failed to load interface for")
 
-cantFindErr cannot_find dflags mod_name (FoundMultiple pkgs)
+cantFindErr :: LitString -> DynFlags -> ModuleName -> FindResult -> SDoc
+cantFindErr cannot_find _dflags mod_name (FoundMultiple pkgs)
   = hang (ptext cannot_find <+> quotes (ppr mod_name) <> colon) 2 (
        sep [ptext SLIT("it was found in multiple packages:"),
                hsep (map (text.packageIdString) pkgs)]