X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FFinder.lhs;h=63beae4e6a63e20c0e9c3d38d5070c2e67e7cddc;hb=601414c1ef664e0b9e4e45db46e115b3a9e8632d;hp=b76bd972e7bbcf4dd67b99f39f75c827f2cc3242;hpb=d51f42f602bf9a6d1b356c41228a534c88723f65;p=ghc-hetmet.git diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs index b76bd97..63beae4 100644 --- a/compiler/main/Finder.lhs +++ b/compiler/main/Finder.lhs @@ -25,8 +25,6 @@ module Finder ( ) where -#include "HsVersions.h" - import Module import HscTypes import Packages @@ -492,13 +490,13 @@ mkStubPaths dflags mod location stub_basename = stub_basename0 ++ "_stub" -- this is the filename we're going to use when - -- #including the stub_h file from the .hc file. + -- \#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 + -- \#include "A/B.h", assuming that the user has added -- -I along with -stubdir . include_basename | Just _ <- stubdir = mod_basename @@ -535,15 +533,15 @@ findObjectLinkable mod obj_fn obj_time = do -- Error messages cannotFindModule :: DynFlags -> ModuleName -> FindResult -> SDoc -cannotFindModule = cantFindErr SLIT("Could not find module") +cannotFindModule = cantFindErr (sLit "Could not find module") cannotFindInterface :: DynFlags -> ModuleName -> FindResult -> SDoc -cannotFindInterface = cantFindErr SLIT("Failed to load interface for") +cannotFindInterface = cantFindErr (sLit "Failed to load interface for") 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:"), + sep [ptext (sLit "it was found in multiple packages:"), hsep (map (text.packageIdString) pkgs)] ) cantFindErr cannot_find dflags mod_name find_result @@ -553,34 +551,34 @@ cantFindErr cannot_find dflags mod_name find_result more_info = case find_result of PackageHidden pkg - -> ptext SLIT("it is a member of package") <+> ppr pkg <> comma - <+> ptext SLIT("which is hidden") + -> ptext (sLit "it is a member of package") <+> ppr pkg <> comma + <+> ptext (sLit "which is hidden") ModuleHidden pkg - -> ptext SLIT("it is hidden") <+> parens (ptext SLIT("in package") + -> ptext (sLit "it is hidden") <+> parens (ptext (sLit "in package") <+> ppr pkg) NoPackage pkg - -> ptext SLIT("no package matching") <+> ppr pkg <+> - ptext SLIT("was found") + -> ptext (sLit "no package matching") <+> ppr pkg <+> + ptext (sLit "was found") NotFound files mb_pkg | null files - -> ptext SLIT("it is not a module in the current program, or in any known package.") + -> ptext (sLit "it is not a module in the current program, or in any known package.") | Just pkg <- mb_pkg, pkg /= thisPackage dflags, build_tag /= "" -> let build = if build_tag == "p" then "profiling" else "\"" ++ build_tag ++ "\"" in - ptext SLIT("Perhaps you haven't installed the ") <> text build <> - ptext SLIT(" libraries for package ") <> ppr pkg <> char '?' $$ + ptext (sLit "Perhaps you haven't installed the ") <> text build <> + ptext (sLit " libraries for package ") <> ppr pkg <> char '?' $$ not_found files | otherwise -> not_found files NotFoundInPackage pkg - -> ptext SLIT("it is not in package") <+> ppr pkg + -> ptext (sLit "it is not in package") <+> ppr pkg _ -> panic "cantFindErr" @@ -588,7 +586,7 @@ cantFindErr cannot_find dflags mod_name find_result not_found files | verbosity dflags < 3 - = ptext SLIT("Use -v to see a list of the files searched for.") + = ptext (sLit "Use -v to see a list of the files searched for.") | otherwise - = hang (ptext SLIT("locations searched:")) 2 (vcat (map text files)) + = hang (ptext (sLit "locations searched:")) 2 (vcat (map text files)) \end{code}