[project @ 1998-04-07 16:40:08 by simonpj]

[ghc-hetmet.git] / ghc / compiler / types / TyVar.lhs

diff --git a/ghc/compiler/types/TyVar.lhs b/ghc/compiler/types/TyVar.lhs
index c106981..e0d4178 100644 (file)
--- a/ghc/compiler/types/TyVar.lhs
+++ b/ghc/compiler/types/TyVar.lhs
@@ -21,7 +21,7 @@ module TyVar (
        emptyTyVarSet, unitTyVarSet, unionTyVarSets, addOneToTyVarSet,
        unionManyTyVarSets, intersectTyVarSets, mkTyVarSet,
        tyVarSetToList, elementOfTyVarSet, minusTyVarSet,
-       isEmptyTyVarSet
+       isEmptyTyVarSet, delOneFromTyVarSet
   ) where
 
 #include "HsVersions.h"
@@ -31,13 +31,13 @@ import Kind         ( Kind, mkBoxedTypeKind, mkTypeKind )
 
 -- others
 import UniqSet         -- nearly all of it
-import UniqFM          ( emptyUFM, listToUFM, addToUFM, lookupUFM,
+import UniqFM          ( emptyUFM, listToUFM, addToUFM, lookupUFM, delFromUFM,
                          plusUFM, sizeUFM, delFromUFM, isNullUFM, UniqFM
                        )
 import BasicTypes      ( Unused, unused )
 import Name            ( mkSysLocalName, mkLocalName, Name, NamedThing(..), OccName )
 import SrcLoc          ( noSrcLoc, SrcLoc )
-import Unique          ( mkAlphaTyVarUnique, Unique, Uniquable(..) )
+import Unique          ( initTyVarUnique, incrUnique, Unique, Uniquable(..) )
 import Util            ( zipEqual )
 import Outputable
 \end{code}
@@ -95,10 +95,10 @@ Fixed collection of type variables
        -- openAlphaTyVar is prepared to be instantiated
        -- to a boxed or unboxed type variable.  It's used for the 
        -- result type for "error", so that we can have (error Int# "Help")
-openAlphaTyVar = TyVar (mkAlphaTyVarUnique 1) mkTypeKind Nothing unused
+openAlphaTyVar = TyVar initTyVarUnique mkTypeKind Nothing unused
 
 alphaTyVars = [ TyVar u mkBoxedTypeKind Nothing unused
-             | u <- map mkAlphaTyVarUnique [2..] ]
+             | u <- iterate incrUnique initTyVarUnique]
 
 (alphaTyVar:betaTyVar:gammaTyVar:deltaTyVar:_) = alphaTyVars
 
@@ -149,10 +149,12 @@ minusTyVarSet       :: GenTyVarSet flexi -> GenTyVarSet flexi -> GenTyVarSet flexi
 isEmptyTyVarSet   :: GenTyVarSet flexi -> Bool
 mkTyVarSet       :: [GenTyVar flexi] -> GenTyVarSet flexi
 addOneToTyVarSet  :: GenTyVarSet flexi -> GenTyVar flexi -> GenTyVarSet flexi
+delOneFromTyVarSet :: GenTyVarSet flexi -> GenTyVar flexi -> GenTyVarSet flexi
 
 emptyTyVarSet            = emptyUniqSet
 unitTyVarSet      = unitUniqSet
 addOneToTyVarSet  = addOneToUniqSet
+delOneFromTyVarSet = delOneFromUniqSet
 intersectTyVarSets= intersectUniqSets
 unionTyVarSets           = unionUniqSets
 unionManyTyVarSets= unionManyUniqSets