@@ -1,6 +1,8 @@
1module Dict (empty,singleton,insert,update
1module Dict (empty,singleton,insert,update
2 ,lookup,findWithDefault
2 ,lookup,findWithDefault
3 ,remove,member
3 ,remove,member
5+ ,partition,partitionWithKey
4 ,foldl,foldr,map
6 ,foldl,foldr,map
5 ,union,intersect,diff
7 ,union,intersect,diff
6 ,keys,values
8 ,keys,values
@@ -327,9 +329,7 @@ union t1 t2 = foldl insert t2 t1
327{-| Keep a key-value pair when its key appears in the second dictionary.
329{-| Keep a key-value pair when its key appears in the second dictionary.
328Preference is given to values in the first dictionary. -}
330Preference is given to values in the first dictionary. -}
329intersect : Dict comparable v -> Dict comparable v -> Dict comparable v
331intersect : Dict comparable v -> Dict comparable v -> Dict comparable v
330−intersect t1 t2 =
332+intersect t1 t2 = filterWithKey (\k _ -> k `member` t2) t1
331− let combine k v t = if k `member` t2 then insert k v t else t
332− in foldl combine empty t1
334{-| Keep a key-value pair when its key does not appear in the second dictionary.
334{-| Keep a key-value pair when its key does not appear in the second dictionary.
335Preference is given to the first dictionary. -}
335Preference is given to the first dictionary. -}
@@ -354,6 +354,30 @@ fromList assocs = List.foldl (\(k,v) d -> insert k v d) empty assocs
355{-| Keep only key-value pairs where the value satisfies a predicate. -}
355{-| Keep only key-value pairs where the value satisfies a predicate. -}
356filter : (v -> Bool) -> Dict comparable v -> Dict comparable v
356filter : (v -> Bool) -> Dict comparable v -> Dict comparable v
357−filter p =
357+filter p = filterWithKey (\_ v -> p v)
359+{-| Keep only key-value pairs which satisfy a predicate. -}
360+filterWithKey : (comparable -> v -> Bool)
361+ -> Dict comparable v
362+ -> Dict comparable v
358− let add k v t = if p v then insert k v t else t
364+ let add k v t = if p k v then insert k v t else t
359− in foldl combine empty
365+ in foldl add empty
367+{-| Partition the Dict according to a predicate. The first Dict contains all
368+values which satisfy a predicate; the second contains the rest. -}
369+partition : (v -> Bool)
370+ -> Dict comparable v
371+ -> (Dict comparable v, Dict comparable v)
372+partition p = partitionWithKey (\_ v -> p v)
374+{-| Partition the Dict according to a predicate. The first Dict contains all
375+key-value pairs which satisfy a predicate; the second contains the rest. -}
376+partitionWithKey : (comparable -> v -> Bool)
377+ -> Dict comparable v
378+ -> (Dict comparable v, Dict comparable v)
380+ let add k v (t1, t2) = if p k v
381+ then (insert k v t1, t2)
382+ else (t1, insert k v t2)
383+ in foldl add (empty, empty)