X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVarSet.lhs;h=d7e85674bf511aa00356e4cf7f95f32e69a8591a;hb=9367b24fde0c3f5efa5934e69571f5834ed43548;hp=55e82a8515ae17871946e676343a1ed94dbeb249;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/VarSet.lhs b/compiler/basicTypes/VarSet.lhs
index 55e82a8..d7e8567 100644
--- a/compiler/basicTypes/VarSet.lhs
+++ b/compiler/basicTypes/VarSet.lhs
@@ -1,7 +1,7 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section{@VarSet@: Variable sets}
 
 \begin{code}
 module VarSet (
@@ -10,7 +10,7 @@ module VarSet (
 	extendVarSet, extendVarSetList, extendVarSet_C,
 	elemVarSet, varSetElems, subVarSet,
 	unionVarSet, unionVarSets,
-	intersectVarSet, intersectsVarSet,
+	intersectVarSet, intersectsVarSet, disjointVarSet,
 	isEmptyVarSet, delVarSet, delVarSetList, delVarSetByKey,
 	minusVarSet, foldVarSet, filterVarSet,
 	lookupVarSet, mapVarSet, sizeVarSet, seqVarSet,
@@ -19,10 +19,9 @@ module VarSet (
 
 #include "HsVersions.h"
 
-import Var		( Var, Id, TyVar )
-import Unique		( Unique )
+import Var
+import Unique
 import UniqSet
-import UniqFM		( delFromUFM_Directly, addToUFM_C )
 \end{code}
 
 %************************************************************************
@@ -69,9 +68,10 @@ extendVarSetList= addListToUniqSet
 intersectVarSet	= intersectUniqSets
 
 intersectsVarSet:: VarSet -> VarSet -> Bool 	-- True if non-empty intersection
-	-- (s1 `intersectsVarSet` s2) doesn't compute s2 if s1 is empty
+disjointVarSet  :: VarSet -> VarSet -> Bool 	-- True if empty intersection
 subVarSet	:: VarSet -> VarSet -> Bool	-- True if first arg is subset of second
- 	-- (s1 `subVarSet` s2) doesn't compute s2 if s1 is empty
+	-- (s1 `intersectsVarSet` s2) doesn't compute s2 if s1 is empty; 
+	-- ditto disjointVarSet, subVarSet
 
 unionVarSet	= unionUniqSets
 unionVarSets	= unionManyUniqSets
@@ -87,15 +87,16 @@ lookupVarSet	= lookupUniqSet
 mapVarSet	= mapUniqSet
 sizeVarSet	= sizeUniqSet
 filterVarSet	= filterUniqSet
-extendVarSet_C combine s x = addToUFM_C combine s x x
-delVarSetByKey	= delFromUFM_Directly	-- Can't be bothered to add this to UniqSet
+extendVarSet_C = addOneToUniqSet_C
+delVarSetByKey	= delOneFromUniqSet_Directly
 elemVarSetByKey	= elemUniqSet_Directly
 \end{code}
 
 \begin{code}
 -- See comments with type signatures
-intersectsVarSet s1 s2 = not (isEmptyVarSet (s1 `intersectVarSet` s2))
-a `subVarSet` b = isEmptyVarSet (a `minusVarSet` b)
+intersectsVarSet s1 s2 = not (s1 `disjointVarSet` s2)
+disjointVarSet   s1 s2 = isEmptyVarSet (s1 `intersectVarSet` s2)
+subVarSet        s1 s2 = isEmptyVarSet (s1 `minusVarSet` s2)
 \end{code}
 
 \begin{code}