From 4d34c7f66b1783423387c9dae359bd38f64426dd Mon Sep 17 00:00:00 2001 From: Peter LjungloĢˆf Date: Fri, 30 Nov 2018 11:52:56 +0100 Subject: Fix deprecations from containers >= 0.4.0.0 E.g. `foldWithKey` has been deprecated since 0.4.0.0 (November 2010)[1] and has been removed in 0.6.0.1 (2018)[2] [1]: https://github.com/haskell/containers/blob/master/changelog.md#0400--nov-2010 [2]: https://github.com/haskell/containers/blob/master/changelog.md#death-of-deprecated-functions (commit originally by @fredefox) --- src/runtime/haskell/PGF/TrieMap.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/runtime/haskell/PGF/TrieMap.hs') diff --git a/src/runtime/haskell/PGF/TrieMap.hs b/src/runtime/haskell/PGF/TrieMap.hs index f0383941a..fbf6ea26e 100644 --- a/src/runtime/haskell/PGF/TrieMap.hs +++ b/src/runtime/haskell/PGF/TrieMap.hs @@ -79,12 +79,12 @@ unionsWith f = foldl (unionWith f) empty elems :: TrieMap k v -> [v] elems tr = collect tr [] where - collect (Tr mb_v m) xs = maybe id (:) mb_v (Map.fold collect xs m) + collect (Tr mb_v m) xs = maybe id (:) mb_v (Map.foldr collect xs m) toList :: TrieMap k v -> [([k],v)] toList tr = collect [] tr [] where - collect ks (Tr mb_v m) xs = maybe id (\v -> (:) (ks,v)) mb_v (Map.foldWithKey (\k -> collect (k:ks)) xs m) + collect ks (Tr mb_v m) xs = maybe id (\v -> (:) (ks,v)) mb_v (Map.foldrWithKey (\k -> collect (k:ks)) xs m) fromListWith :: Ord k => (v -> v -> v) -> [([k],v)] -> TrieMap k v fromListWith f xs = foldl' (\trie (ks,v) -> insertWith f ks v trie) empty xs -- cgit v1.2.3