X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fiface%2FMkIface.lhs;h=c7a71b70985e19a1936038376fb6d0b8e4bf7a83;hb=59c796f8e77325d35f29ddd3e724bfa780466d40;hp=224617e281319f5fdd722994305a937340ab7a58;hpb=c6713d35dd3ed4de580a513bf4bd46f70d8cfe5d;p=ghc-hetmet.git

diff --git a/ghc/compiler/iface/MkIface.lhs b/ghc/compiler/iface/MkIface.lhs
index 224617e..c7a71b7 100644
--- a/ghc/compiler/iface/MkIface.lhs
+++ b/ghc/compiler/iface/MkIface.lhs
@@ -186,7 +186,7 @@ import TcRnTypes	( ImportAvails(..), mkModDeps )
 import TcType		( isFFITy )
 import HscTypes		( ModIface(..), TyThing(..),
 			  ModGuts(..), ModGuts, IfaceExport,
-			  GhciMode(..), 
+			  GhciMode(..), isOneShot,
 			  HscEnv(..), hscEPS,
 			  Dependencies(..), FixItem(..), 
 			  mkIfaceDepCache, mkIfaceFixCache, mkIfaceVerCache,
@@ -220,7 +220,7 @@ import Module		( Module, ModuleName, moduleNameFS, moduleName, isHomeModule,
 			)
 import Outputable
 import DriverUtil	( createDirectoryHierarchy, directoryOf )
-import Util		( sortLt, seqList )
+import Util		( sortLe, seqList )
 import Binary		( getBinFileWithDict )
 import BinIface		( writeBinIface, v_IgnoreHiWay )
 import Unique		( Unique, Uniquable(..) )
@@ -286,9 +286,9 @@ mkIface hsc_env location maybe_old_iface
 		; deprecs  = mkIfaceDeprec src_deprecs
 		; iface_rules 
 		     | omit_prags = []
-		     | otherwise  = sortLt lt_rule $
+		     | otherwise  = sortLe le_rule $
 				    map (coreRuleToIfaceRule this_mod_name ext_nm) rules
-		; iface_insts = sortLt lt_inst (map (dfunToIfaceInst this_mod_name) insts)
+		; iface_insts = sortLe le_inst (map dfunToIfaceInst insts)
 
 	        ; intermediate_iface = ModIface { 
 			mi_module   = this_mod,
@@ -333,8 +333,8 @@ mkIface hsc_env location maybe_old_iface
 
 	; return new_iface }
   where
-     r1 `lt_rule` r2 = ifRuleName r1 < ifRuleName r2
-     i1 `lt_inst` i2 = ifDFun     i1 < ifDFun     i2
+     r1 `le_rule` r2 = ifRuleName r1 <= ifRuleName r2
+     i1 `le_inst` i2 = ifDFun     i1 <= ifDFun     i2
 
      dflags    = hsc_dflags hsc_env
      ghci_mode = hsc_mode hsc_env
@@ -535,7 +535,7 @@ addVersionInfo (Just old_iface@(ModIface { mi_mod_vers  = old_mod_vers,
 	  eq_ind_occs [op | IfaceClassOp op _ _ <- sigs] 
     eq_indirects (IfaceData {ifName = tc_occ, ifCons = cons})
 	= same_insts tc_occ &&& same_fixity tc_occ &&&	-- The TyCon can have a fixity too
-	  eq_ind_occs [occ | IfaceConDecl occ _ _ _ _ _ <- visibleIfConDecls cons]
+	  eq_ind_occs [occ | IfaceConDecl occ _ _ _ _ _ _ <- visibleIfConDecls cons]
     eq_indirects other = Equal	-- Synonyms and foreign declarations
 
     eq_ind_occ :: OccName -> IfaceEq	-- For class ops and Ids; check fixity and rules
@@ -649,7 +649,7 @@ anyNothing p (x:xs) = isNothing (p x) || anyNothing p xs
 mkIfaceDeprec :: Deprecations -> IfaceDeprecs
 mkIfaceDeprec NoDeprecs        = NoDeprecs
 mkIfaceDeprec (DeprecAll t)    = DeprecAll t
-mkIfaceDeprec (DeprecSome env) = DeprecSome (sortLt (<) (nameEnvElts env))
+mkIfaceDeprec (DeprecSome env) = DeprecSome (sortLe (<=) (nameEnvElts env))
 
 ----------------------
 bump_unless :: Bool -> Version -> Version
@@ -745,7 +745,7 @@ mk_usage_info pit hpt dir_imp_mods dep_mods proto_used_names
         used_occs = lookupModuleEnv ent_map mod `orElse` []
 	ent_vers :: [(OccName,Version)]
         ent_vers = [ (occ, version_env occ `orElse` initialVersion) 
-		   | occ <- sortLt (<) used_occs]
+		   | occ <- sortLe (<=) used_occs]
 \end{code}
 
 \begin{code}
@@ -857,18 +857,22 @@ checkVersions source_unchanged iface
   | not source_unchanged
   = returnM outOfDate
   | otherwise
-  = traceHiDiffs (text "Considering whether compilation is required for" <+> 
-		  ppr (mi_module iface) <> colon)	`thenM_`
+  = do	{ traceHiDiffs (text "Considering whether compilation is required for" <+> 
+		        ppr (mi_module iface) <> colon)
 
 	-- Source code unchanged and no errors yet... carry on 
+
 	-- First put the dependent-module info in the envt, just temporarily,
 	-- so that when we look for interfaces we look for the right one (.hi or .hi-boot)
 	-- It's just temporary because either the usage check will succeed 
 	-- (in which case we are done with this module) or it'll fail (in which
 	-- case we'll compile the module from scratch anyhow).
-    updGblEnv (\ gbl -> gbl { if_is_boot = mod_deps }) (
-	checkList [checkModUsage u | u <- mi_usages iface]
-    )
+	; mode <- getGhciMode
+	; ifM (isOneShot mode) 
+	      (updateEps_ $ \eps  -> eps { eps_is_boot = mod_deps })
+
+	; checkList [checkModUsage u | u <- mi_usages iface]
+    }
   where
 	-- This is a bit of a hack really
     mod_deps :: ModuleEnv (ModuleName, IsBootInterface)