X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=48fb2b4554843f914be6ea6228437b6f2fe118c9;hb=8604da0136707cc14845d14a88c2272fe576b6d0;hp=7ad34ace635c4fc315e9a0e8302676d168e7f7dd;hpb=206b4dec78250efef3cd927d64dc6cbc54a16c3d;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 7ad34ac..48fb2b4 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -106,19 +106,21 @@ import BasicTypes	( Version, initialVersion, IPName,
 import IfaceSyn
 import FiniteMap	( FiniteMap )
 import CoreSyn		( CoreRule )
-import Maybes		( orElse, expectJust, catMaybes, seqMaybe )
+import Maybes		( orElse, expectJust, catMaybes )
 import Outputable
 import BreakArray
 import SrcLoc		( SrcSpan, Located )
-import UniqFM		( lookupUFM, eltsUFM, emptyUFM )
+import LazyUniqFM		( lookupUFM, eltsUFM, emptyUFM )
 import UniqSupply	( UniqSupply )
-import FastString	( FastString )
+import FastString
 import StringBuffer	( StringBuffer )
 
+import System.FilePath
 import System.Time	( ClockTime )
 import Data.IORef
 import Data.Array       ( Array, array )
 import Data.List
+import Control.Monad    ( mplus )
 \end{code}
 
 
@@ -276,7 +278,7 @@ lookupIfaceByModule dflags hpt pit mod
 	-- in the HPT.  If it's not from the home package it's wrong to look
 	-- in the HPT, because the HPT is indexed by *ModuleName* not Module
     fmap hm_iface (lookupUFM hpt (moduleName mod)) 
-    `seqMaybe` lookupModuleEnv pit mod
+    `mplus` lookupModuleEnv pit mod
 
   | otherwise = lookupModuleEnv pit mod		-- Look in PIT only 
 
@@ -328,8 +330,8 @@ hptRules hsc_env deps
     , let rules = case lookupUFM hpt mod of
 		    Just info -> md_rules (hm_details info)
 		    Nothing -> pprTrace "WARNING in hptRules" msg [] 
-	  msg = vcat [ptext SLIT("missing module") <+> ppr mod,
-		      ptext SLIT("Probable cause: out-of-date interface files")]
+	  msg = vcat [ptext (sLit "missing module") <+> ppr mod,
+		      ptext (sLit "Probable cause: out-of-date interface files")]
 			-- This really shouldn't happen, but see Trac #962
 
 	-- And get its dfuns
@@ -627,9 +629,6 @@ data ForeignStubs = NoStubs
                                       	-- 	"foreign exported" functions
 			SDoc 		-- C stubs to use when calling
                                         -- 	"foreign exported" functions
-			[FastString] 	-- Headers that need to be included
-				        -- 	into C code generated for this module
-
 \end{code}
 
 \begin{code}
@@ -1342,14 +1341,15 @@ instance Outputable ModSummary where
 
 showModMsg :: HscTarget -> Bool -> ModSummary -> String
 showModMsg target recomp mod_summary
-  = showSDoc (hsep [text (mod_str ++ replicate (max 0 (16 - length mod_str)) ' '),
-	            char '(', text (msHsFilePath mod_summary) <> comma,
-		    case target of
-                      HscInterpreted | recomp 
-                                 -> text "interpreted"
-                      HscNothing -> text "nothing"
-                      _other     -> text (msObjFilePath mod_summary),
-		    char ')'])
+  = showSDoc $
+        hsep [text (mod_str ++ replicate (max 0 (16 - length mod_str)) ' '),
+              char '(', text (normalise $ msHsFilePath mod_summary) <> comma,
+              case target of
+                  HscInterpreted | recomp 
+                             -> text "interpreted"
+                  HscNothing -> text "nothing"
+                  _          -> text (normalise $ msObjFilePath mod_summary),
+              char ')']
  where 
     mod     = moduleName (ms_mod mod_summary)
     mod_str = showSDoc (ppr mod) ++ hscSourceString (ms_hsc_src mod_summary)