diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-05-04 18:03:02 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-05-04 18:03:02 +0000 |
| commit | 63dde2e3cb89839f7375363bde31fabdcddb1462 (patch) | |
| tree | dc2a7f217bc0544c4d31f062147e5005f3682eff /compiler/utils | |
| parent | 5b9c4a01ed7539b4f894c491178962ecb7295c4e (diff) | |
| download | haskell-63dde2e3cb89839f7375363bde31fabdcddb1462.tar.gz | |
Fix build with GHC 6.10
In GHC 6.10, intersectionWith is (a -> b -> a) instead of (a -> b -> c),
so we need to jump through some hoops to get the more general type.
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/UniqFM.lhs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/compiler/utils/UniqFM.lhs b/compiler/utils/UniqFM.lhs index 293e48ed14..19b1428d90 100644 --- a/compiler/utils/UniqFM.lhs +++ b/compiler/utils/UniqFM.lhs @@ -183,7 +183,20 @@ plusUFM (UFM x) (UFM y) = UFM (M.union y x) plusUFM_C f (UFM x) (UFM y) = UFM (M.unionWith f x y) minusUFM (UFM x) (UFM y) = UFM (M.difference x y) intersectUFM (UFM x) (UFM y) = UFM (M.intersection x y) +#if __GLASGOW_HASKELL__ >= 611 intersectUFM_C f (UFM x) (UFM y) = UFM (M.intersectionWith f x y) +#else +-- In GHC 6.10, intersectionWith is (a -> b -> a) instead of (a -> b -> c), +-- so we need to jump through some hoops to get the more general type. +intersectUFM_C f (UFM x) (UFM y) = UFM z + where z = let x' = M.map Left x + f' (Left a) b = Right (f a b) + f' (Right _) _ = panic "intersectUFM_C: f': Right" + z' = M.intersectionWith f' x' y + fromRight (Right a) = a + fromRight _ = panic "intersectUFM_C: Left" + in M.map fromRight z' +#endif foldUFM k z (UFM m) = M.fold k z m foldUFM_Directly k z (UFM m) = M.foldWithKey (k . getUnique) z m |