projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-06-13 15:50:25 by rrt]
[ghc-hetmet.git]
/
ghc
/
compiler
/
main
/
Finder.lhs
diff --git
a/ghc/compiler/main/Finder.lhs
b/ghc/compiler/main/Finder.lhs
index
b208867
..
6cb1fc9
100644
(file)
--- a/
ghc/compiler/main/Finder.lhs
+++ b/
ghc/compiler/main/Finder.lhs
@@
-160,7
+160,7
@@
maybePackageModule mod_name = do
found <- findOnPackagePath pkgs hi
case found of
Nothing -> return Nothing
found <- findOnPackagePath pkgs hi
case found of
Nothing -> return Nothing
- Just (pkg_name,path) ->
+ Just (pkg_name,path) ->
return (Just (mkModule mod_name pkg_name,
ModuleLocation{
ml_hspp_file = Nothing,
return (Just (mkModule mod_name pkg_name,
ModuleLocation{
ml_hspp_file = Nothing,
@@
-178,8
+178,8
@@
findOnPackagePath pkgs file = loop pkgs
loop (p:ps) = do
found <- findOnPath (import_dirs p) file
case found of
loop (p:ps) = do
found <- findOnPath (import_dirs p) file
case found of
- Nothing -> loop ps
- Just f -> return (Just (mkFastString (name p), f))
+ Nothing -> loop ps
+ Just path -> return (Just (mkFastString (name p), path ++ '/':file))
findOnPath :: [String] -> String -> IO (Maybe FilePath)
findOnPath path s = loop path
findOnPath :: [String] -> String -> IO (Maybe FilePath)
findOnPath path s = loop path