X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FFinder.lhs;h=f9e3aa48139606fea7fe61068a0b95d0a5b47280;hp=fd0982da197dba8a7fb19ff9a46df5e9f85654fe;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index fd0982d..f9e3aa4 100644
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -4,6 +4,13 @@
 \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/CodingStyle#Warnings
+-- for details
+
 module Finder (
     flushFinderCaches,
     FindResult(..),
@@ -19,7 +26,8 @@ module Finder (
     findObjectLinkableMaybe,
     findObjectLinkable,
 
-    cantFindError,
+    cannotFindModule,
+    cannotFindInterface,
   ) where
 
 #include "HsVersions.h"
@@ -36,13 +44,12 @@ import FiniteMap
 import UniqFM
 import Maybes		( expectJust )
 
-import DATA_IOREF	( IORef, writeIORef, readIORef, modifyIORef )
-
+import Data.IORef	( IORef, writeIORef, readIORef, modifyIORef )
 import Data.List
 import System.Directory
 import System.IO
 import Control.Monad
-import Time		( ClockTime )
+import System.Time	( ClockTime )
 
 
 type FileExt = String	-- Filename extension
@@ -144,10 +151,10 @@ findExactModule hsc_env mod =
 this `orIfNotFound` or_this = do
   res <- this
   case res of
-    NotFound here -> do
+    NotFound here _ -> do
 	res2 <- or_this
 	case res2 of
-	   NotFound or_here -> return (NotFound (here ++ or_here))
+	   NotFound or_here pkg -> return (NotFound (here ++ or_here) pkg)
 	   _other -> return res2
     _other -> return res
 
@@ -168,7 +175,7 @@ homeSearchCache hsc_env mod_name do_this = do
 findExposedPackageModule :: HscEnv -> ModuleName -> IO FindResult
 findExposedPackageModule hsc_env mod_name
         -- not found in any package:
-  | null found = return (NotFound [])
+  | null found = return (NotFound [] Nothing)
         -- found in just one exposed package:
   | [(pkg_conf, _)] <- found_exposed
         = let pkgid = mkPackageId (package pkg_conf) in      
@@ -243,6 +250,14 @@ findHomeModule hsc_env mod_name =
      exts | isOneShot (ghcMode dflags) = hi_exts
           | otherwise      	       = source_exts
    in
+
+  -- special case for GHC.Prim; we won't find it in the filesystem.
+  -- This is important only when compiling the base package (where GHC.Prim
+  -- is a home module).
+  if mod == gHC_PRIM 
+        then return (Found (error "GHC.Prim ModLocation") mod)
+        else 
+
    searchPathExts home_path mod exts
 
 
@@ -329,7 +344,7 @@ searchPathExts paths mod exts
 	              file = base `joinFileExt` ext
 		]
 
-    search [] = return (NotFound (map fst to_search))
+    search [] = return (NotFound (map fst to_search) (Just (modulePackageId mod)))
     search ((file, mk_result) : rest) = do
       b <- doesFileExist file
       if b 
@@ -505,14 +520,19 @@ dots_to_slashes = map (\c -> if c == '.' then '/' else c)
 -- -----------------------------------------------------------------------------
 -- Error messages
 
-cantFindError :: DynFlags -> ModuleName -> FindResult -> SDoc
-cantFindError dflags mod_name (FoundMultiple pkgs)
-  = hang (ptext SLIT("Cannot import") <+> quotes (ppr mod_name) <> colon) 2 (
+cannotFindModule :: DynFlags -> ModuleName -> FindResult -> SDoc
+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)
+  = hang (ptext cannot_find <+> quotes (ppr mod_name) <> colon) 2 (
        sep [ptext SLIT("it was found in multiple packages:"),
 		hsep (map (text.packageIdString) pkgs)]
     )
-cantFindError dflags mod_name find_result
-  = hang (ptext SLIT("Could not find module") <+> quotes (ppr mod_name) <> colon)
+cantFindErr cannot_find dflags mod_name find_result
+  = hang (ptext cannot_find <+> quotes (ppr mod_name) <> colon)
        2 more_info
   where
     more_info
@@ -529,17 +549,31 @@ cantFindError dflags mod_name find_result
 		-> ptext SLIT("no package matching") <+> ppr pkg <+>
 		   ptext SLIT("was found")
 
-	    NotFound files
+	    NotFound files mb_pkg
 		| null files
 		-> ptext SLIT("it is not a module in the current program, or in any known package.")
-		| verbosity dflags < 3 
-		-> ptext SLIT("use -v to see a list of the files searched for")
-		| otherwise 
-		-> hang (ptext SLIT("locations searched:")) 
-		      2 (vcat (map text files))
+		| 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 '?' $$
+		   not_found files
+
+		| otherwise
+		-> not_found files
 
 	    NotFoundInPackage pkg
 		-> ptext SLIT("it is not in package") <+> ppr pkg
 
 	    _ -> panic "cantFindErr"
+
+    build_tag = buildTag dflags
+
+    not_found files
+	| verbosity dflags < 3
+	= ptext SLIT("Use -v to see a list of the files searched for.")
+	| otherwise 
+	= hang (ptext SLIT("locations searched:")) 2 (vcat (map text files))
 \end{code}