X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fiface%2FMkIface.lhs;h=cafb6b6692d2e50b60d7a48a895688b717f27070;hb=274a7b1ab7cf30fd1ceaddd02f991eaf694cc37c;hp=5be56bfa25ca8128960224206b4a621ea784ac94;hpb=a2da0796b273efd1fbb5d251fb748c627f189fa9;p=ghc-hetmet.git

diff --git a/ghc/compiler/iface/MkIface.lhs b/ghc/compiler/iface/MkIface.lhs
index 5be56bf..cafb6b6 100644
--- a/ghc/compiler/iface/MkIface.lhs
+++ b/ghc/compiler/iface/MkIface.lhs
@@ -214,7 +214,7 @@ import OccName		( OccName, OccEnv, mkOccEnv, lookupOccEnv, emptyOccEnv,
 			  isEmptyOccSet, intersectOccSet, intersectsOccSet,
 			  occNameFS, isTcOcc )
 import Module		( Module, moduleFS,
-			  ModLocation(..), mkSysModuleFS, moduleUserString,
+			  ModLocation(..), mkModuleFS, moduleString,
 			  ModuleEnv, emptyModuleEnv, lookupModuleEnv,
 			  extendModuleEnv_C
 			)
@@ -234,7 +234,7 @@ import DATA_IOREF	( writeIORef )
 import Monad		( when )
 import List		( insert )
 import Maybes		( orElse, mapCatMaybes, isNothing, isJust, 
-			  fromJust, expectJust, MaybeErr(..) )
+			  expectJust, MaybeErr(..) )
 \end{code}
 
 
@@ -321,7 +321,7 @@ mkIface hsc_env maybe_old_iface
 
 		-- Debug printing
 	; when (isJust pp_orphs && dopt Opt_WarnOrphans dflags) 
-	       (printDump (fromJust pp_orphs))
+	       (printDump (expectJust "mkIface" pp_orphs))
 	; when (dopt Opt_D_dump_hi_diffs dflags) (printDump pp_diffs)
 	; dumpIfSet_dyn dflags Opt_D_dump_hi "FINAL INTERFACE" 
 			(pprModIface new_iface)
@@ -336,18 +336,11 @@ mkIface hsc_env maybe_old_iface
 
 					      
 -----------------------------
-writeIfaceFile :: HscEnv -> ModLocation -> ModIface -> Bool -> IO ()
--- Write the interface file, if necessary
-writeIfaceFile hsc_env location new_iface no_change_at_all
-  | no_change_at_all 	      = return ()
-  | ghc_mode == Interactive   = return ()
-  | ghc_mode == JustTypecheck = return ()
-  | otherwise
-  = do	{ createDirectoryHierarchy (directoryOf hi_file_path)
-	; writeBinIface hi_file_path new_iface }
-  where
-     ghc_mode = ghcMode (hsc_dflags hsc_env)
-     hi_file_path = ml_hi_file location
+writeIfaceFile :: ModLocation -> ModIface -> IO ()
+writeIfaceFile location new_iface
+    = do createDirectoryHierarchy (directoryOf hi_file_path)
+         writeBinIface hi_file_path new_iface
+    where hi_file_path = ml_hi_file location
 
 
 -----------------------------
@@ -726,7 +719,7 @@ mkIfaceExports :: NameSet -> [(Module, [GenAvailInfo OccName])]
   -- Group by module and sort by occurrence
   -- This keeps the list in canonical order
 mkIfaceExports exports 
-  = [ (mkSysModuleFS fs, eltsFM avails)
+  = [ (mkModuleFS fs, eltsFM avails)
     | (fs, avails) <- fmToList groupFM
     ]
   where
@@ -768,7 +761,7 @@ checkOldIface :: HscEnv
 
 checkOldIface hsc_env mod_summary source_unchanged maybe_iface
   = do	{ showPass (hsc_dflags hsc_env) 
-	           ("Checking old interface for " ++ moduleUserString (ms_mod mod_summary)) ;
+	           ("Checking old interface for " ++ moduleString (ms_mod mod_summary)) ;
 
 	; initIfaceCheck hsc_env $
 	  check_old_iface mod_summary source_unchanged maybe_iface
@@ -782,8 +775,8 @@ check_old_iface mod_summary source_unchanged maybe_iface
 
      -- If the source has changed and we're in interactive mode, avoid reading
      -- an interface; just return the one we might have been supplied with.
-    getGhciMode					`thenM` \ ghci_mode ->
-    if (ghci_mode == Interactive || ghci_mode == JustTypecheck) 
+    getGhcMode					`thenM` \ ghc_mode ->
+    if (ghc_mode == Interactive || ghc_mode == JustTypecheck) 
 	&& not source_unchanged then
          returnM (outOfDate, maybe_iface)
     else
@@ -896,7 +889,7 @@ checkModUsage (Usage { usg_name = mod_name, usg_mod = old_mod_vers,
 	-- CHECK EXPORT LIST
     if checkExportList maybe_old_export_vers new_export_vers then
 	out_of_date_vers (ptext SLIT("  Export list changed"))
-		         (fromJust maybe_old_export_vers) 
+		         (expectJust "checkModUsage" maybe_old_export_vers) 
 		         new_export_vers
     else