[project @ 2001-12-11 12:19:04 by simonpj]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcEnv.lhs

diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs
index a1bf175..b2fe7d9 100644 (file)
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/ghc/compiler/typecheck/TcEnv.lhs
@@ -27,11 +27,10 @@ module TcEnv(
        tcGetGlobalTyVars, tcExtendGlobalTyVars,
 
        -- Random useful things
-       RecTcEnv, tcAddImportedIdInfo, tcLookupRecId, tcLookupRecId_maybe, 
+       RecTcEnv, tcLookupRecId, tcLookupRecId_maybe, 
 
        -- New Ids
-       newLocalId, newSpecPragmaId,
-       newDFunName,
+       newLocalName, newDFunName,
 
        -- Misc
        isLocalThing, tcSetEnv
@@ -42,20 +41,19 @@ module TcEnv(
 import RnHsSyn         ( RenamedMonoBinds, RenamedSig )
 import TcMonad
 import TcMType         ( zonkTcTyVarsAndFV )
-import TcType          ( Type, ThetaType, TcType, TcKind, TcTyVar, TcTyVarSet, 
+import TcType          ( Type, ThetaType, TcKind, TcTyVar, TcTyVarSet, 
                          tyVarsOfTypes, tcSplitDFunTy,
                          getDFunTyKey, tcTyConAppTyCon
                        )
-import Id              ( idName, mkSpecPragmaId, mkUserLocal, isDataConWrapId_maybe )
+import Id              ( idName, isDataConWrapId_maybe )
 import IdInfo          ( vanillaIdInfo )
 import Var             ( TyVar, Id, idType, lazySetIdInfo, idInfo )
 import VarSet
 import DataCon         ( DataCon )
 import TyCon           ( TyCon )
 import Class           ( Class, ClassOpItem )
-import Name            ( Name, OccName, NamedThing(..), 
-                         nameOccName, getSrcLoc, mkLocalName, isLocalName,
-                         nameIsLocalOrFrom
+import Name            ( Name, NamedThing(..), 
+                         getSrcLoc, mkLocalName, isLocalName, nameIsLocalOrFrom
                        )
 import NameEnv         ( NameEnv, lookupNameEnv, nameEnvElts, elemNameEnv,
                          extendNameEnvList, emptyNameEnv, plusNameEnv )
@@ -210,16 +208,6 @@ type RecTcEnv = TcEnv
 -- on imported things and for looking up Ids in unfoldings
 -- The environment doesn't have any local Ids in it
 
-tcAddImportedIdInfo :: RecTcEnv -> Id -> Id
-tcAddImportedIdInfo env id
-  = id `lazySetIdInfo` new_info
-       -- The Id must be returned without a data dependency on maybe_id
-  where
-    new_info = case tcLookupRecId_maybe env (idName id) of
-                 Nothing          -> pprTrace "tcAddIdInfo" (ppr id) vanillaIdInfo
-                 Just imported_id -> idInfo imported_id
-               -- ToDo: could check that types are the same
-
 tcLookupRecId_maybe :: RecTcEnv -> Name -> Maybe Id
 tcLookupRecId_maybe env name = case lookup_global env name of
                                   Just (AnId id) -> Just id
@@ -240,15 +228,10 @@ tcLookupRecId env name = case lookup_global env name of
 Constructing new Ids
 
 \begin{code}
-newLocalId :: OccName -> TcType -> SrcLoc -> NF_TcM TcId
-newLocalId name ty loc
-  = tcGetUnique                `thenNF_Tc` \ uniq ->
-    returnNF_Tc (mkUserLocal name uniq ty loc)
-
-newSpecPragmaId :: Name -> TcType -> NF_TcM TcId
-newSpecPragmaId name ty 
+newLocalName :: Name -> NF_TcM Name
+newLocalName name      -- Make a clone
   = tcGetUnique                `thenNF_Tc` \ uniq ->
-    returnNF_Tc (mkSpecPragmaId (nameOccName name) uniq ty (getSrcLoc name))
+    returnNF_Tc (mkLocalName uniq (getOccName name) (getSrcLoc name))
 \end{code}
 
 Make a name for the dict fun for an instance decl.