X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FFinder.lhs;h=f50e12a53919295dd98310880592f23d4b637e52;hb=d04e338c3b78fb76341e374bf776b14cbca78bd1;hp=61bf196e19063cd47564fa5ed020471d5a49021f;hpb=7eb5e29b4a7b6fef55512bc7bf3308e712ca3eba;p=ghc-hetmet.git diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs index 61bf196..f50e12a 100644 --- a/compiler/main/Finder.lhs +++ b/compiler/main/Finder.lhs @@ -481,9 +481,9 @@ mkStubPaths dflags mod location = let stubdir = stubDir dflags - mod_basename = dots_to_slashes (moduleNameString mod) - src_basename = basenameOf (expectJust "mkStubPaths" - (ml_hs_file location)) + mod_basename = moduleNameSlashes mod + src_basename = dropExtension $ expectJust "mkStubPaths" + (ml_hs_file location) stub_basename0 | Just dir <- stubdir = dir mod_basename @@ -532,12 +532,6 @@ findObjectLinkable mod obj_fn obj_time = do 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