[project @ 1996-06-26 10:26:00 by partain]

[ghc-hetmet.git] / ghc / compiler / utils / UniqSet.lhs

diff --git a/ghc/compiler/utils/UniqSet.lhs b/ghc/compiler/utils/UniqSet.lhs
index 3adc33b..5216e14 100644 (file)
--- a/ghc/compiler/utils/UniqSet.lhs
+++ b/ghc/compiler/utils/UniqSet.lhs
@@ -1,57 +1,39 @@
 %
-% (c) The AQUA Project, Glasgow University, 1994-1995
+% (c) The AQUA Project, Glasgow University, 1994-1996
 %
 \section[UniqSet]{Specialised sets, for things with @Uniques@}
 
 Based on @UniqFMs@ (as you would expect).
 
-Basically, the things need to be in class @NamedThing@.
-
-We also export specialisations for @Ids@ and @TyVars@.
+Basically, the things need to be in class @Uniquable@.
 
 \begin{code}
 #include "HsVersions.h"
 
 module UniqSet (
-       UniqSet(..),    -- abstract type: NOT
+       SYN_IE(UniqSet),    -- abstract type: NOT
 
-       mkUniqSet, uniqSetToList, emptyUniqSet, singletonUniqSet,
+       mkUniqSet, uniqSetToList, emptyUniqSet, unitUniqSet,
+       addOneToUniqSet,
        unionUniqSets, unionManyUniqSets, minusUniqSet,
-       elementOfUniqSet, mapUniqSet,
-       intersectUniqSets, isEmptyUniqSet,
-       
-       -- specalised for Ids:
-       IdSet(..),
-
-       -- specalised for TyVars:
-       TyVarSet(..),
-
-       -- specalised for Names:
-       NameSet(..),
+       elementOfUniqSet, mapUniqSet, intersectUniqSets,
+       isEmptyUniqSet
+    ) where
 
-       -- to make the interface self-sufficient
-       Id, TyVar, Name,
+IMP_Ubiq(){-uitous-}
 
-       UniqFM, Unique
+import Maybes          ( maybeToBool )
+import UniqFM
+import Unique          ( Unique )
+import SrcLoc          ( SrcLoc )
+import Pretty          ( SYN_IE(Pretty), PrettyRep )
+import PprStyle                ( PprStyle )
+import Util            ( Ord3(..) )
 
-       -- and to be pragma friendly
-#ifdef USE_ATTACK_PRAGMAS
-       , emptyUFM, intersectUFM, isNullUFM, minusUFM, singletonUFM,
-       plusUFM, eltsUFM,
-       u2i
-#endif
-    ) where
+import {-hide from mkdependHS-}
+       RnHsSyn ( RnName ) -- specialising only
 
-import UniqFM
-import Id              -- for specialisation to Ids
-import IdInfo          -- sigh
-import Maybes          ( maybeToBool, Maybe(..) )
-import Name
-import Outputable
-import AbsUniType      -- for specialisation to TyVars
-import Util
 #if ! OMIT_NATIVE_CODEGEN
-import AsmRegAlloc     ( Reg )
 #define IF_NCG(a) a
 #else
 #define IF_NCG(a) {--}
@@ -64,7 +46,7 @@ import AsmRegAlloc    ( Reg )
 %*                                                                     *
 %************************************************************************
 
-We use @UniqFM@, with a (@getTheUnique@-able) @Unique@ as ``key''
+We use @UniqFM@, with a (@uniqueOf@-able) @Unique@ as ``key''
 and the thing itself as the ``value'' (for later retrieval).
 
 \begin{code}
@@ -76,15 +58,18 @@ type UniqSet a = UniqFM a
 emptyUniqSet :: UniqSet a
 emptyUniqSet = MkUniqSet emptyUFM
 
-singletonUniqSet :: NamedThing a => a -> UniqSet a
-singletonUniqSet x = MkUniqSet (singletonUFM x x)
+unitUniqSet :: Uniquable a => a -> UniqSet a
+unitUniqSet x = MkUniqSet (unitUFM x x)
 
 uniqSetToList :: UniqSet a -> [a]
-uniqSetToList (MkUniqSet set) = BSCC("uniqSetToList") eltsUFM set ESCC
+uniqSetToList (MkUniqSet set) = eltsUFM set
 
-mkUniqSet :: NamedThing a => [a]  -> UniqSet a
+mkUniqSet :: Uniquable a => [a]  -> UniqSet a
 mkUniqSet xs = MkUniqSet (listToUFM [ (x, x) | x <- xs])
 
+addOneToUniqSet :: Uniquable a => UniqSet a -> a -> UniqSet a
+addOneToUniqSet set x = set `unionUniqSets` unitUniqSet x
+
 unionUniqSets :: UniqSet a -> UniqSet a -> UniqSet a
 unionUniqSets (MkUniqSet set1) (MkUniqSet set2) = MkUniqSet (plusUFM set1 set2)
 
@@ -100,13 +85,13 @@ minusUniqSet (MkUniqSet set1) (MkUniqSet set2) = MkUniqSet (minusUFM set1 set2)
 intersectUniqSets :: UniqSet a -> UniqSet a -> UniqSet a
 intersectUniqSets (MkUniqSet set1) (MkUniqSet set2) = MkUniqSet (intersectUFM set1 set2)
 
-elementOfUniqSet :: NamedThing a => a -> UniqSet a -> Bool
+elementOfUniqSet :: Uniquable a => a -> UniqSet a -> Bool
 elementOfUniqSet x (MkUniqSet set) = maybeToBool (lookupUFM set x)
 
 isEmptyUniqSet :: UniqSet a -> Bool
 isEmptyUniqSet (MkUniqSet set) = isNullUFM set {-SLOW: sizeUFM set == 0-}
 
-mapUniqSet :: NamedThing b => (a -> b) -> UniqSet a -> UniqSet b
+mapUniqSet :: Uniquable b => (a -> b) -> UniqSet a -> UniqSet b
 mapUniqSet f (MkUniqSet set)
   = MkUniqSet (listToUFM [ let
                             mapped_thing = f thing
@@ -115,50 +100,22 @@ mapUniqSet f (MkUniqSet set)
                        | thing <- eltsUFM set ])
 \end{code}
 
-%************************************************************************
-%*                                                                     *
-\subsection{The @IdSet@ and @TyVarSet@ specialisations for sets of Ids/TyVars}
-%*                                                                     *
-%************************************************************************
-
-@IdSet@ is a specialised version, optimised for sets of Ids.
-
 \begin{code}
-type IdSet    = UniqSet Id
-type TyVarSet = UniqSet TyVar
-type NameSet  = UniqSet Name
-#if ! OMIT_NATIVE_CODEGEN
-type RegSet   = UniqSet Reg
-#endif
-
 #if __GLASGOW_HASKELL__
-    -- avoid hbc bug (0.999.7)
 {-# SPECIALIZE
-    singletonUniqSet :: Id    -> IdSet,
-                       TyVar -> TyVarSet,
-                       Name  -> NameSet
-    IF_NCG(COMMA       Reg   -> RegSet)
+    addOneToUniqSet :: UniqSet Unique -> Unique -> UniqSet Unique
     #-}
-
 {-# SPECIALIZE
-    mkUniqSet :: [Id]    -> IdSet,
-                [TyVar] -> TyVarSet,
-                [Name]  -> NameSet
-    IF_NCG(COMMA [Reg]   -> RegSet)
+    elementOfUniqSet :: RnName -> UniqSet RnName -> Bool
+                     , Unique -> UniqSet Unique -> Bool
     #-}
-
 {-# SPECIALIZE
-    elementOfUniqSet :: Id    -> IdSet    -> Bool,
-                       TyVar -> TyVarSet -> Bool,
-                       Name  -> NameSet  -> Bool
-    IF_NCG(COMMA       Reg   -> RegSet   -> Bool)
+    mkUniqSet :: [RnName] -> UniqSet RnName
     #-}
 
 {-# SPECIALIZE
-    mapUniqSet :: (Id    -> Id)    -> IdSet    -> IdSet,
-                 (TyVar -> TyVar) -> TyVarSet -> TyVarSet,
-                 (Name  -> Name)  -> NameSet  -> NameSet
-    IF_NCG(COMMA  (Reg  -> Reg)    -> RegSet   -> RegSet)
+    unitUniqSet :: RnName -> UniqSet RnName
+                , Unique -> UniqSet Unique
     #-}
 #endif
 \end{code}