[project @ 2000-11-03 17:10:57 by simonpj]

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

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index a3572ba..dab3594 100644 (file)
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -9,19 +9,19 @@ module RdrName (
        RdrName,
 
        -- Construction
-       mkRdrUnqual, mkRdrQual, mkRdrOrig, mkRdrIfaceUnqual,
+       mkRdrUnqual, mkRdrQual, mkRdrOrig, mkRdrUnqual,
        mkUnqual, mkQual, mkIfaceOrig, mkOrig,
        qualifyRdrName, mkRdrNameWkr,
        dummyRdrVarName, dummyRdrTcName,
 
        -- Destruction
        rdrNameModule, rdrNameOcc, setRdrNameOcc,
-       isRdrDataCon, isRdrTyVar, isQual, isSourceQual, isUnqual, isIface,
+       isRdrDataCon, isRdrTyVar, isQual, isUnqual, isOrig,
 
        -- Environment
        RdrNameEnv, 
        emptyRdrEnv, lookupRdrEnv, addListToRdrEnv, rdrEnvElts, 
-       extendRdrEnv, rdrEnvToList, elemRdrEnv,
+       extendRdrEnv, rdrEnvToList, elemRdrEnv, foldRdrEnv,
 
        -- Printing;    instance Outputable RdrName
        pprUnqualRdrName 
@@ -55,10 +55,6 @@ data RdrName = RdrName Qual OccName
 
 data Qual = Unqual
 
-         | IfaceUnqual         -- An unqualified name from an interface file;
-                               -- implicitly its module is that of the enclosing
-                               -- interface file; don't look it up in the environment
-
          | Qual ModuleName     -- A qualified name written by the user in source code
                                -- The module isn't necessarily the module where
                                -- the thing is defined; just the one from which it
@@ -92,9 +88,6 @@ setRdrNameOcc (RdrName q _) occ = RdrName q occ
 mkRdrUnqual :: OccName -> RdrName
 mkRdrUnqual occ = RdrName Unqual occ
 
-mkRdrIfaceUnqual :: OccName -> RdrName
-mkRdrIfaceUnqual occ = RdrName IfaceUnqual occ
-
 mkRdrQual :: ModuleName -> OccName -> RdrName
 mkRdrQual mod occ = RdrName (Qual mod) occ
 
@@ -139,18 +132,14 @@ dummyRdrTcName  = RdrName Unqual (mkOccFS tcName SLIT("TC-DUMMY"))
 isRdrDataCon (RdrName _ occ) = isDataOcc occ
 isRdrTyVar   (RdrName _ occ) = isTvOcc occ
 
-isUnqual (RdrName Unqual _)      = True
-isUnqual (RdrName IfaceUnqual _) = True
-isUnqual other                  = False
-
-isQual rdr_name = not (isUnqual rdr_name)
+isUnqual (RdrName Unqual _) = True
+isUnqual other             = False
 
-isSourceQual (RdrName (Qual _) _) = True
-isSourceQual _                   = False
+isQual (RdrName (Qual _) _) = True
+isQual _                   = False
 
-isIface (RdrName (Orig _)    _) = True
-isIface (RdrName IfaceUnqual _) = True
-isIface other                  = False
+isOrig (RdrName (Orig _)    _) = True
+isOrig other                  = False
 \end{code}
 
 
@@ -165,7 +154,6 @@ instance Outputable RdrName where
     ppr (RdrName qual occ) = pp_qual qual <> ppr occ
                           where
                             pp_qual Unqual      = empty
-                            pp_qual IfaceUnqual = empty
                             pp_qual (Qual mod)  = ppr mod <> dot
                             pp_qual (Orig mod)  = ppr mod <> dot
 
@@ -186,12 +174,9 @@ instance Ord RdrName where
          (q1  `cmpQual` q2) 
 
 cmpQual Unqual     Unqual      = EQ
-cmpQual IfaceUnqual IfaceUnqual = EQ
 cmpQual (Qual m1)   (Qual m2)   = m1 `compare` m2
 cmpQual (Orig m1)   (Orig m2)   = m1 `compare` m2
 cmpQual Unqual      _          = LT
-cmpQual IfaceUnqual (Qual _)   = LT
-cmpQual IfaceUnqual (Orig _)   = LT
 cmpQual (Qual _)    (Orig _)    = LT
 cmpQual _          _           = GT
 \end{code}
@@ -214,6 +199,7 @@ extendRdrEnv        :: RdrNameEnv a -> RdrName -> a -> RdrNameEnv a
 rdrEnvToList    :: RdrNameEnv a -> [(RdrName, a)]
 rdrEnvElts     :: RdrNameEnv a -> [a]
 elemRdrEnv     :: RdrName -> RdrNameEnv a -> Bool
+foldRdrEnv     :: (RdrName -> a -> b -> b) -> b -> RdrNameEnv a -> b
 
 emptyRdrEnv  = emptyFM
 lookupRdrEnv = lookupFM
@@ -222,4 +208,5 @@ rdrEnvElts  = eltsFM
 extendRdrEnv    = addToFM
 rdrEnvToList    = fmToList
 elemRdrEnv      = elemFM
+foldRdrEnv     = foldFM
 \end{code}