diff options
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/FiniteMap.hs | 2 | ||||
| -rw-r--r-- | compiler/utils/UniqDFM.hs | 4 | ||||
| -rw-r--r-- | compiler/utils/UniqFM.hs | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/compiler/utils/FiniteMap.hs b/compiler/utils/FiniteMap.hs index dccfca10a9..cb6e5573e8 100644 --- a/compiler/utils/FiniteMap.hs +++ b/compiler/utils/FiniteMap.hs @@ -24,6 +24,6 @@ deleteList :: Ord key => [key] -> Map key elt -> Map key elt deleteList ks m = foldl (flip Map.delete) m ks foldRight :: (elt -> a -> a) -> a -> Map key elt -> a -foldRight = Map.fold +foldRight = Map.foldr foldRightWithKey :: (key -> elt -> a -> a) -> a -> Map key elt -> a foldRightWithKey = Map.foldrWithKey diff --git a/compiler/utils/UniqDFM.hs b/compiler/utils/UniqDFM.hs index bbf6bb0bd8..10e8aa94d2 100644 --- a/compiler/utils/UniqDFM.hs +++ b/compiler/utils/UniqDFM.hs @@ -360,10 +360,10 @@ mapUDFM :: (elt1 -> elt2) -> UniqDFM elt1 -> UniqDFM elt2 mapUDFM f (UDFM m i) = UDFM (M.map (fmap f) m) i anyUDFM :: (elt -> Bool) -> UniqDFM elt -> Bool -anyUDFM p (UDFM m _i) = M.fold ((||) . p . taggedFst) False m +anyUDFM p (UDFM m _i) = M.foldr ((||) . p . taggedFst) False m allUDFM :: (elt -> Bool) -> UniqDFM elt -> Bool -allUDFM p (UDFM m _i) = M.fold ((&&) . p . taggedFst) True m +allUDFM p (UDFM m _i) = M.foldr ((&&) . p . taggedFst) True m instance Monoid (UniqDFM a) where mempty = emptyUDFM diff --git a/compiler/utils/UniqFM.hs b/compiler/utils/UniqFM.hs index be5da8373b..38d94342ad 100644 --- a/compiler/utils/UniqFM.hs +++ b/compiler/utils/UniqFM.hs @@ -237,7 +237,7 @@ disjointUFM :: UniqFM elt1 -> UniqFM elt2 -> Bool disjointUFM (UFM x) (UFM y) = M.null (M.intersection x y) foldUFM :: (elt -> a -> a) -> a -> UniqFM elt -> a -foldUFM k z (UFM m) = M.fold k z m +foldUFM k z (UFM m) = M.foldr k z m mapUFM :: (elt1 -> elt2) -> UniqFM elt1 -> UniqFM elt2 mapUFM f (UFM m) = UFM (M.map f m) @@ -285,10 +285,10 @@ ufmToSet_Directly :: UniqFM elt -> S.IntSet ufmToSet_Directly (UFM m) = M.keysSet m anyUFM :: (elt -> Bool) -> UniqFM elt -> Bool -anyUFM p (UFM m) = M.fold ((||) . p) False m +anyUFM p (UFM m) = M.foldr ((||) . p) False m allUFM :: (elt -> Bool) -> UniqFM elt -> Bool -allUFM p (UFM m) = M.fold ((&&) . p) True m +allUFM p (UFM m) = M.foldr ((&&) . p) True m seqEltsUFM :: ([elt] -> ()) -> UniqFM elt -> () seqEltsUFM seqList = seqList . nonDetEltsUFM @@ -312,13 +312,13 @@ nonDetKeysUFM (UFM m) = map getUnique $ M.keys m -- If you use this please provide a justification why it doesn't introduce -- nondeterminism. nonDetFoldUFM :: (elt -> a -> a) -> a -> UniqFM elt -> a -nonDetFoldUFM k z (UFM m) = M.fold k z m +nonDetFoldUFM k z (UFM m) = M.foldr k z m -- See Note [Deterministic UniqFM] to learn about nondeterminism. -- If you use this please provide a justification why it doesn't introduce -- nondeterminism. nonDetFoldUFM_Directly:: (Unique -> elt -> a -> a) -> a -> UniqFM elt -> a -nonDetFoldUFM_Directly k z (UFM m) = M.foldWithKey (k . getUnique) z m +nonDetFoldUFM_Directly k z (UFM m) = M.foldrWithKey (k . getUnique) z m -- See Note [Deterministic UniqFM] to learn about nondeterminism. -- If you use this please provide a justification why it doesn't introduce |