X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FFinder.lhs;h=206d118d6e92aabf31f98cc32abe09e1d5d6ad0b;hb=97c186be0bd51ebe0fb4c28df8836f03e3dbd06d;hp=678966fee170fd7818bd2a189ed3bf5d8a11cb1f;hpb=f4480b33bac2f992d0c05153248f36c55e4b0820;p=ghc-hetmet.git

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index 678966f..206d118 100644
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -4,13 +4,6 @@
 \section[Finder]{Module Finder}
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module Finder (
     flushFinderCaches,
     FindResult(..),
@@ -19,6 +12,7 @@ module Finder (
     findHomeModule,
     mkHomeModLocation,
     mkHomeModLocation2,
+    mkHiOnlyModLocation,
     addHomeModuleToFinder,
     uncacheModule,
     mkStubPaths,
@@ -28,6 +22,7 @@ module Finder (
 
     cannotFindModule,
     cannotFindInterface,
+
   ) where
 
 #include "HsVersions.h"
@@ -344,7 +339,7 @@ searchPathExts paths mod exts
 	return result
 
   where
-    basename = dots_to_slashes (moduleNameString (moduleName mod))
+    basename = moduleNameSlashes (moduleName mod)
 
     to_search :: [(FilePath, IO ModLocation)]
     to_search = [ (file, fn path basename)
@@ -394,7 +389,7 @@ mkHomeModLocationSearched dflags mod suff path basename = do
 --      (b) and (c): "."
 --
 -- src_basename
---      (a): dots_to_slashes (moduleNameUserString mod)
+--      (a): (moduleNameSlashes mod)
 --      (b) and (c): The filename of the source file, minus its extension
 --
 -- ext
@@ -411,7 +406,7 @@ mkHomeModLocation2 :: DynFlags
 		   -> String 	-- Suffix
 		   -> IO ModLocation
 mkHomeModLocation2 dflags mod src_basename ext = do
-   let mod_basename = dots_to_slashes (moduleNameString mod)
+   let mod_basename = moduleNameSlashes mod
 
    obj_fn  <- mkObjPath  dflags src_basename mod_basename
    hi_fn   <- mkHiPath   dflags src_basename mod_basename
@@ -485,7 +480,7 @@ mkStubPaths dflags mod location
   = let
 		stubdir = stubDir dflags
 
-		mod_basename = dots_to_slashes (moduleNameString mod)
+		mod_basename = moduleNameSlashes mod
 		src_basename = basenameOf (expectJust "mkStubPaths" 
 						(ml_hs_file location))
 
@@ -530,19 +525,13 @@ 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])
 	else return (LM obj_time mod [DotO obj_fn])
 
 -- -----------------------------------------------------------------------------
--- Utils
-
-dots_to_slashes :: String -> String
-dots_to_slashes = map (\c -> if c == '.' then '/' else c)
-
--- -----------------------------------------------------------------------------
 -- Error messages
 
 cannotFindModule :: DynFlags -> ModuleName -> FindResult -> SDoc