X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=157539eabad41735c11ebc09dddffe0b414e60c7;hb=e4db45612e3efa59251239e1e0b8a0440783b966;hp=ec62de5771a113d072a1f35e20e49d04c135070e;hpb=7eb5e29b4a7b6fef55512bc7bf3308e712ca3eba;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index ec62de5..157539e 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -248,7 +248,7 @@ import StaticFlags
 import SysTools     ( initSysTools, cleanTempFiles, cleanTempFilesExcept,
                       cleanTempDirs )
 import Module
-import UniqFM
+import LazyUniqFM
 import UniqSet
 import Unique
 import FiniteMap
@@ -266,6 +266,7 @@ import BasicTypes
 import Maybes		( expectJust, mapCatMaybes )
 import HaddockParse
 import HaddockLex       ( tokenise )
+import FastString
 
 import Control.Concurrent
 import System.Directory ( getModificationTime, doesFileExist,
@@ -1605,7 +1606,7 @@ warnUnnecessarySourceImports dflags sccs =
 	warn :: Located ModuleName -> WarnMsg
 	warn (L loc mod) = 
 	   mkPlainErrMsg loc
-		(ptext SLIT("Warning: {-# SOURCE #-} unnecessary in import of ")
+		(ptext (sLit "Warning: {-# SOURCE #-} unnecessary in import of ")
 		 <+> quotes (ppr mod))
 
 -----------------------------------------------------------------------------
@@ -1662,7 +1663,7 @@ downsweep hsc_env old_summaries excl_mods allow_dup_roots
 		   Nothing -> packageModErr modl
 		   Just s  -> return s
 
-	rootLoc = mkGeneralSrcSpan FSLIT("<command line>")
+	rootLoc = mkGeneralSrcSpan (fsLit "<command line>")
 
 	-- In a root module, the filename is allowed to diverge from the module
 	-- name, so we have to check that there aren't multiple root files
@@ -1897,8 +1898,9 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod) maybe_buf exc
 
 	when (mod_name /= wanted_mod) $
 		throwDyn $ mkPlainErrMsg mod_loc $ 
-			      text "file name does not match module name"
-			      <+> quotes (ppr mod_name)
+			      text "File name does not match module name:" 
+			      $$ text "Saw:" <+> quotes (ppr mod_name)
+                              $$ text "Expected:" <+> quotes (ppr wanted_mod)
 
 		-- Find the object timestamp, and return the summary
 	obj_timestamp <- getObjTimestamp location is_boot
@@ -1984,11 +1986,11 @@ multiRootsErr summs@(summ1:_)
 
 cyclicModuleErr :: [ModSummary] -> SDoc
 cyclicModuleErr ms
-  = hang (ptext SLIT("Module imports form a cycle for modules:"))
+  = hang (ptext (sLit "Module imports form a cycle for modules:"))
        2 (vcat (map show_one ms))
   where
     show_one ms = sep [ show_mod (ms_hsc_src ms) (ms_mod ms),
-			nest 2 $ ptext SLIT("imports:") <+> 
+			nest 2 $ ptext (sLit "imports:") <+> 
 				   (pp_imps HsBootFile (ms_srcimps ms)
 				   $$ pp_imps HsSrcFile  (ms_imps ms))]
     show_mod hsc_src mod = ppr mod <> text (hscSourceString hsc_src)