[project @ 2001-02-20 11:04:42 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / MkIface.lhs

diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs
index e43429c..a77ce51 100644 (file)
--- a/ghc/compiler/main/MkIface.lhs
+++ b/ghc/compiler/main/MkIface.lhs
@@ -15,7 +15,7 @@ import HsSyn
 import HsCore          ( HsIdInfo(..), UfExpr(..), toUfExpr, toUfBndr )
 import HsTypes         ( toHsTyVars )
 import BasicTypes      ( Fixity(..), NewOrData(..),
-                         Version, initialVersion, bumpVersion, isLoopBreaker
+                         Version, initialVersion, bumpVersion, 
                        )
 import RnMonad
 import RnHsSyn         ( RenamedInstDecl, RenamedTyClDecl )
@@ -29,8 +29,8 @@ import HscTypes               ( VersionInfo(..), ModIface(..), ModDetails(..),
                        )
 
 import CmdLineOpts
-import Id              ( Id, idType, idInfo, omitIfaceSigForId, isDictFunId,
-                         idSpecialisation, setIdInfo, isLocalId, idName, hasNoBinding
+import Id              ( idType, idInfo, isImplicitId, isDictFunId,
+                         idSpecialisation, isLocalId, idName, hasNoBinding
                        )
 import Var             ( isId )
 import VarSet
@@ -261,8 +261,8 @@ ifaceTyCls (ATyCon tycon) so_far
        = ([getName field_label], mk_bang_ty strict_mark (fieldLabelType field_label))
 
 ifaceTyCls (AnId id) so_far
-  | omitIfaceSigForId id = so_far
-  | otherwise           = iface_sig : so_far
+  | isImplicitId id = so_far
+  | otherwise      = iface_sig : so_far
   where
     iface_sig = IfaceSig { tcdName   = getName id, 
                           tcdType   = toHsType id_type,
@@ -296,7 +296,6 @@ ifaceTyCls (AnId id) so_far
                        NoStrictnessInfo -> []
                        info             -> [HsStrictness info]
 
-
     ------------  Worker  --------------
     work_info   = workerInfo id_info
     has_worker  = case work_info of { HasWorker _ _ -> True; other -> False }
@@ -363,11 +362,13 @@ addVersionInfo Nothing new_iface
 -- No old interface, so definitely write a new one!
   = (new_iface, Just (text "No old interface available"))
 
-addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, 
-                                          mi_decls   = old_decls,
-                                          mi_fixities = old_fixities }))
-              new_iface@(ModIface { mi_decls = new_decls,
-                                    mi_fixities = new_fixities })
+addVersionInfo (Just old_iface@(ModIface { mi_version  = old_version, 
+                                          mi_decls    = old_decls,
+                                          mi_fixities = old_fixities,
+                                          mi_deprecs  = old_deprecs }))
+              new_iface@(ModIface { mi_decls    = new_decls,
+                                    mi_fixities = new_fixities,
+                                    mi_deprecs  = new_deprecs })
 
   | no_output_change && no_usage_change
   = (new_iface, Nothing)
@@ -385,11 +386,12 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version,
                                vers_rules   = bumpVersion no_rule_change   (vers_rules   old_version),
                                vers_decls   = tc_vers }
 
-    no_output_change = no_tc_change && no_rule_change && no_export_change
+    no_output_change = no_tc_change && no_rule_change && no_export_change && no_deprec_change
     no_usage_change  = mi_usages old_iface == mi_usages new_iface
 
     no_export_change = mi_exports old_iface == mi_exports new_iface            -- Kept sorted
     no_rule_change   = dcl_rules old_decls  == dcl_rules  new_decls            -- Ditto
+    no_deprec_change = old_deprecs         == new_deprecs
 
        -- Fill in the version number on the new declarations by looking at the old declarations.
        -- Set the flag if anything changes. 
@@ -400,6 +402,7 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version,
     pp_diffs = vcat [pp_tc_diffs,
                     pp_change no_export_change "Export list",
                     pp_change no_rule_change   "Rules",
+                    pp_change no_deprec_change "Deprecations",
                     pp_change no_usage_change  "Usages"]
     pp_change True  what = empty
     pp_change False what = text what <+> ptext SLIT("changed")