From: keithw <unknown>
Date: Tue, 5 Feb 2002 16:44:37 +0000 (+0000)
Subject: [project @ 2002-02-05 16:44:37 by keithw]
X-Git-Tag: Approximately_9120_patches~145
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6eaccd1a5bd5fb73e76b7316bf8578fbd5f393ae;p=ghc-hetmet.git

[project @ 2002-02-05 16:44:37 by keithw]
Generalise types of minusUFM and intersectUFM_C (this was applied long
ago to FiniteMap, IIRC).

Untested: I haven't got a build tree handy, so please shoot me if this
2-line change to two type signatures is type-incorrect.  Sorry!
---

diff --git a/ghc/compiler/utils/UniqFM.lhs b/ghc/compiler/utils/UniqFM.lhs
index 475d418..8512bad 100644
--- a/ghc/compiler/utils/UniqFM.lhs
+++ b/ghc/compiler/utils/UniqFM.lhs
@@ -96,11 +96,11 @@ plusUFM		:: UniqFM elt -> UniqFM elt -> UniqFM elt
 plusUFM_C	:: (elt -> elt -> elt)
 		-> UniqFM elt -> UniqFM elt -> UniqFM elt
 
-minusUFM	:: UniqFM elt -> UniqFM elt -> UniqFM elt
+minusUFM	:: UniqFM elt1 -> UniqFM elt2 -> UniqFM elt1
 
 intersectUFM	:: UniqFM elt -> UniqFM elt -> UniqFM elt
-intersectUFM_C	:: (elt -> elt -> elt)
-		-> UniqFM elt -> UniqFM elt -> UniqFM elt
+intersectUFM_C	:: (elt1 -> elt2 -> elt3)
+		-> UniqFM elt1 -> UniqFM elt2 -> UniqFM elt3
 foldUFM		:: (elt -> a -> a) -> a -> UniqFM elt -> a
 mapUFM		:: (elt1 -> elt2) -> UniqFM elt1 -> UniqFM elt2
 filterUFM	:: (elt -> Bool) -> UniqFM elt -> UniqFM elt