hashmap 1.3.1.1 → 1.3.2

raw patch · 4 files changed

+38/−15 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGES +4/−0
• Data/HashMap.hs +18/−9
• Data/HashSet.hs +14/−4
• hashmap.cabal +2/−2

@@ -1,3 +1,7 @@+= Version 1.3.2, 2016-11-30 =+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^+* Replace internal use of deprecated containers functions+ = Version 1.3.1.1, 2016-06-09 = ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ * Ensure hashmap.h is distributed with the tarball

@@ -253,7 +253,7 @@  -- | Number of elements in the map. size :: Map k a -> Int-size (Map m) = I.fold ((+) . some_size) 0 m+size (Map m) = ifoldr ((+) . some_size) 0 m   where some_size (Only _ _) = 1         some_size (More s) = M.size s @@ -691,36 +691,45 @@ -- | Fold the values in the map, such that @'fold' f z == 'Prelude.foldr' -- f z . 'elems'@. fold :: (a -> b -> b) -> b -> Map k a -> b-fold f z (Map m) = I.fold some_fold z m+fold f z (Map m) = ifoldr some_fold z m   where some_fold (Only _ x) y = f x y-        some_fold (More t) y   = M.fold f y t+        some_fold (More t) y   = mfoldr f y t  -- | Fold the keys and values in the map, such that @'foldWithKey' f z == -- 'Prelude.foldr' ('uncurry' f) z . 'toAscList'@. foldWithKey :: (k -> a -> b -> b) -> b -> Map k a -> b-foldWithKey f z (Map m) = I.fold some_fold_with_key z m+foldWithKey f z (Map m) = ifoldr some_fold_with_key z m   where some_fold_with_key (Only k x) y = f k x y-        some_fold_with_key (More t) y   = M.foldWithKey f y t+        some_fold_with_key (More t) y   = M.foldrWithKey f y t +mfoldr :: (a -> b -> b) -> b -> M.Map k a -> b+ifoldr :: (a -> b -> b) -> b -> I.IntMap a -> b+#if MIN_VERSION_containers(0,5,0)+mfoldr = M.foldr+ifoldr = I.foldr+#else+mfoldr = M.fold+ifoldr = I.fold+#endif  {--------------------------------------------------------------------   List variations --------------------------------------------------------------------} -- | Return all elements of the map in arbitrary order of their keys. elems :: Map k a -> [a]-elems (Map m) = I.fold some_append_elems [] m+elems (Map m) = ifoldr some_append_elems [] m   where some_append_elems (Only _ x) acc = x : acc         some_append_elems (More t) acc   = M.elems t ++ acc  -- | Return all keys of the map in arbitrary order. keys  :: Map k a -> [k]-keys (Map m) = I.fold some_append_keys [] m+keys (Map m) = ifoldr some_append_keys [] m   where some_append_keys (Only k _) acc = k : acc         some_append_keys (More t) acc   = M.keys t ++ acc  -- | The set of all keys of the map. keysSet :: Ord k => Map k a -> S.Set k-keysSet (Map m) = I.fold (S.union . some_keys_set) S.empty m+keysSet (Map m) = ifoldr (S.union . some_keys_set) S.empty m   where some_keys_set (Only k _) = S.singleton k         some_keys_set (More t)   = M.keysSet t @@ -735,7 +744,7 @@ -- | Convert the map to a list of key\/value pairs. toList :: Map k a -> [(k,a)] toList (Map m) =-  I.fold some_append [] m+  ifoldr some_append [] m   where some_append (Only k x) acc = (k, x) : acc         some_append (More t) acc   = M.toList t ++ acc 

@@ -180,7 +180,7 @@  -- | Number of elements in the set. size :: Set a -> Int-size (Set s) = I.fold ((+) . some_size) 0 s+size (Set s) = ifoldr ((+) . some_size) 0 s   where some_size (Only _) = 1         some_size (More t) = S.size t @@ -336,11 +336,21 @@ --------------------------------------------------------------------} -- | Fold over the elements of a set in an unspecified order. fold :: (a -> b -> b) -> b -> Set a -> b-fold f z (Set s) = I.fold some_fold z s+fold f z (Set s) = ifoldr some_fold z s   where some_fold (Only a) x = f a x-        some_fold (More t) x = S.fold f x t+        some_fold (More t) x = sfoldr f x t +ifoldr :: (a -> b -> b) -> b -> I.IntMap a -> b+sfoldr :: (a -> b -> b) -> b -> S.Set a -> b+#if MIN_VERSION_containers(0,5,0)+ifoldr = I.foldr+sfoldr = S.foldr+#else+ifoldr = I.fold+sfoldr = S.fold+#endif + {--------------------------------------------------------------------   Conversions --------------------------------------------------------------------}@@ -350,7 +360,7 @@  -- | Convert the set to a list of elements. toList :: Set a -> [a]-toList (Set s) = I.fold some_append [] s+toList (Set s) = ifoldr some_append [] s   where some_append (Only a) acc = a : acc         some_append (More t) acc = S.toList t ++ acc 

@@ -1,5 +1,5 @@ Name:                hashmap-Version:             1.3.1.1+Version:             1.3.2 Synopsis:            Persistent containers Map and Set based on hashing. Description:         An implementation of persistent 'Map' and 'Set' containers                      based on hashing. The implementation is build on@@ -35,7 +35,7 @@                    , GHC == 7.6.3                    , GHC == 7.8.4                    , GHC == 7.10.3-                   , GHC == 8.0.1+                   , GHC == 8.0.2  source-repository head   type: git