[project @ 2001-08-28 10:06:29 by simonpj]

[ghc-hetmet.git] / ghc / compiler / basicTypes / Name.lhs

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 8286e39..303e0c7 100644 (file)
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -10,7 +10,7 @@ module Name (
 
        -- The Name type
        Name,                                   -- Abstract
-       mkLocalName, mkSysLocalName, mkCCallName,
+       mkLocalName, mkSysLocalName, mkFCallName,
        mkIPName,
        mkGlobalName, mkKnownKeyGlobal, mkWiredInName,
 
@@ -26,14 +26,6 @@ module Name (
        isTyVarName, isDllName, 
        nameIsLocalOrFrom, isHomePackageName,
        
-       -- Environment
-       NameEnv, mkNameEnv,
-       emptyNameEnv, unitNameEnv, nameEnvElts, 
-       extendNameEnv_C, extendNameEnv, foldNameEnv, filterNameEnv,
-       plusNameEnv, plusNameEnv_C, extendNameEnv, extendNameEnvList,
-       lookupNameEnv, lookupNameEnv_NF, delFromNameEnv, elemNameEnv, 
-
-
        -- Class NamedThing and overloaded friends
        NamedThing(..),
        getSrcLoc, getOccString, toRdrName
@@ -46,10 +38,8 @@ import Module                ( Module, moduleName, mkVanillaModule, isHomeModule )
 import RdrName         ( RdrName, mkRdrOrig, mkRdrUnqual, rdrNameOcc, rdrNameModule )
 import CmdLineOpts     ( opt_Static )
 import SrcLoc          ( builtinSrcLoc, noSrcLoc, SrcLoc )
-import Unique          ( Unique, Uniquable(..), u2i, pprUnique, pprUnique10 )
+import Unique          ( Unique, Uniquable(..), u2i, pprUnique )
 import FastTypes
-import Maybes          ( expectJust )
-import UniqFM
 import Outputable
 \end{code}
 
@@ -190,10 +180,10 @@ mkSysLocalName :: Unique -> UserFS -> Name
 mkSysLocalName uniq fs = Name { n_uniq = uniq, n_sort = System, 
                                n_occ = mkVarOcc fs, n_loc = noSrcLoc }
 
-mkCCallName :: Unique -> EncodedString -> Name
+mkFCallName :: Unique -> EncodedString -> Name
        -- The encoded string completely describes the ccall
-mkCCallName uniq str =  Name { n_uniq = uniq, n_sort = Local, 
-                              n_occ = mkCCallOcc str, n_loc = noSrcLoc }
+mkFCallName uniq str =  Name { n_uniq = uniq, n_sort = Local, 
+                              n_occ = mkFCallOcc str, n_loc = noSrcLoc }
 
 mkIPName :: Unique -> OccName -> Name
 mkIPName uniq occ
@@ -276,52 +266,6 @@ instance NamedThing Name where
 
 %************************************************************************
 %*                                                                     *
-\subsection{Name environment}
-%*                                                                     *
-%************************************************************************
-
-\begin{code}
-type NameEnv a = UniqFM a      -- Domain is Name
-
-emptyNameEnv            :: NameEnv a
-mkNameEnv       :: [(Name,a)] -> NameEnv a
-nameEnvElts             :: NameEnv a -> [a]
-extendNameEnv_C  :: (a->a->a) -> NameEnv a -> Name -> a -> NameEnv a
-extendNameEnv           :: NameEnv a -> Name -> a -> NameEnv a
-plusNameEnv             :: NameEnv a -> NameEnv a -> NameEnv a
-plusNameEnv_C           :: (a->a->a) -> NameEnv a -> NameEnv a -> NameEnv a
-extendNameEnvList:: NameEnv a -> [(Name,a)] -> NameEnv a
-delFromNameEnv          :: NameEnv a -> Name -> NameEnv a
-elemNameEnv             :: Name -> NameEnv a -> Bool
-unitNameEnv             :: Name -> a -> NameEnv a
-lookupNameEnv           :: NameEnv a -> Name -> Maybe a
-lookupNameEnv_NF :: NameEnv a -> Name -> a
-mapNameEnv      :: (a->b) -> NameEnv a -> NameEnv b
-foldNameEnv     :: (a -> b -> b) -> b -> NameEnv a -> b
-filterNameEnv   :: (elt -> Bool) -> NameEnv elt -> NameEnv elt
-
-emptyNameEnv            = emptyUFM
-foldNameEnv     = foldUFM
-mkNameEnv       = listToUFM
-nameEnvElts             = eltsUFM
-extendNameEnv_C  = addToUFM_C
-extendNameEnv           = addToUFM
-plusNameEnv             = plusUFM
-plusNameEnv_C           = plusUFM_C
-extendNameEnvList= addListToUFM
-delFromNameEnv          = delFromUFM
-elemNameEnv             = elemUFM
-mapNameEnv      = mapUFM
-unitNameEnv             = unitUFM
-filterNameEnv   = filterUFM
-
-lookupNameEnv                 = lookupUFM
-lookupNameEnv_NF env n = expectJust "lookupNameEnv_NF" (lookupUFM env n)
-\end{code}
-
-
-%************************************************************************
-%*                                                                     *
 \subsection{Pretty printing}
 %*                                                                     *
 %************************************************************************