[project @ 2000-11-14 11:25:22 by simonpj]

vanilla -> constantIdInfo

diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs
index 68b6ff7..9ff18cb 100644 (file)
--- a/ghc/compiler/main/MkIface.lhs
+++ b/ghc/compiler/main/MkIface.lhs
@@ -390,7 +390,7 @@ mkFinalId codegen_ids is_rec id rhs
                                    idInfo id
 
     new_idinfo | opt_OmitInterfacePragmas
-              = vanillaIdInfo
+              = constantIdInfo
               | otherwise                
               = core_idinfo `setArityInfo`      arity_info
                             `setCafInfo`        cafInfo stg_idinfo

diff --git a/ghc/compiler/simplCore/SimplUtils.lhs b/ghc/compiler/simplCore/SimplUtils.lhs
index cf022c2..e8a6433 100644 (file)
--- a/ghc/compiler/simplCore/SimplUtils.lhs
+++ b/ghc/compiler/simplCore/SimplUtils.lhs
@@ -29,7 +29,7 @@ import Id             ( idType, idName,
                          idUnfolding, idStrictness,
                          mkVanillaId, idInfo
                        )
-import IdInfo          ( StrictnessInfo(..), ArityInfo, atLeastArity, vanillaIdInfo )
+import IdInfo          ( StrictnessInfo(..), ArityInfo, atLeastArity )
 import Maybes          ( maybeToBool, catMaybes )
 import Name            ( setNameUnique )
 import Demand          ( isStrict )

diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs
index ba28d13..f3ab742 100644 (file)
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/ghc/compiler/typecheck/TcEnv.lhs
@@ -45,7 +45,7 @@ import TcType         ( TcKind,  TcType, TcTyVar, TcTyVarSet, TcThetaType,
                          tcInstTyVars, zonkTcTyVars,
                        )
 import Id              ( idName, mkUserLocal, isDataConWrapId_maybe )
-import IdInfo          ( vanillaIdInfo )
+import IdInfo          ( constantIdInfo )
 import MkId            ( mkSpecPragmaId )
 import Var             ( TyVar, Id, idType, lazySetIdInfo, idInfo )
 import VarSet
@@ -206,7 +206,7 @@ tcAddImportedIdInfo env id
        -- The Id must be returned without a data dependency on maybe_id
   where
     new_info = case tcLookupRecId env (idName id) of
-                 Nothing          -> vanillaIdInfo
+                 Nothing          -> constantIdInfo
                  Just imported_id -> idInfo imported_id
                -- ToDo: could check that types are the same
 

diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs
index c947fab..58ed069 100644 (file)
--- a/ghc/compiler/typecheck/TcIfaceSig.lhs
+++ b/ghc/compiler/typecheck/TcIfaceSig.lhs
@@ -17,7 +17,7 @@ import TcMonoType     ( tcHsType )
 
 import TcEnv           ( TcEnv, RecTcEnv, tcExtendTyVarEnv, 
                          tcExtendGlobalValEnv, tcSetEnv,
-                         tcLookupGlobal_maybe, tcLookupRecId, tcEnvIds
+                         tcLookupGlobal_maybe, tcLookupRecId
                        )
 
 import RnHsSyn         ( RenamedHsDecl )
@@ -67,12 +67,12 @@ tcInterfaceSigs unf_env decls
        tcAddErrCtxt (ifaceSigCtxt name)                $
        tcHsType ty                                     `thenTc` \ sigma_ty ->
        tcIdInfo unf_env in_scope_vars name 
-                sigma_ty vanillaIdInfo id_infos        `thenTc` \ id_info ->
+                sigma_ty id_infos                      `thenTc` \ id_info ->
        returnTc (mkId name sigma_ty id_info)
 \end{code}
 
 \begin{code}
-tcIdInfo unf_env in_scope_vars name ty info info_ins
+tcIdInfo unf_env in_scope_vars name ty info_ins
   = foldlTc tcPrag constantIdInfo info_ins
   where
     tcPrag info (HsArity arity) = returnTc (info `setArityInfo`  arity)