X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FFiniteMap.hs;h=96a9faf82955783c83267fd7479fe037bace489e;hb=27e10d6cb4ae6798ad78662db809f675ba0e1208;hp=3b1b7853c3051fa48e3905a578c9ca74092ab4e8;hpb=dbe5ad2718b2133d8c4205589905cf14acd73dcf;p=ghc-base.git diff --git a/Data/FiniteMap.hs b/Data/FiniteMap.hs index 3b1b785..96a9faf 100644 --- a/Data/FiniteMap.hs +++ b/Data/FiniteMap.hs @@ -159,12 +159,12 @@ delFromFM :: (Ord key OUTPUTABLE_key) => FiniteMap key elt -> key -> FiniteMap -- | List version of 'delFromFM'. delListFromFM :: (Ord key OUTPUTABLE_key) => FiniteMap key elt -> [key] -> FiniteMap key elt --- | Combine two 'FiniteMaps'. Mappings in the second argument shadow +-- | Combine two 'FiniteMap's. Mappings in the second argument shadow -- those in the first. plusFM :: (Ord key OUTPUTABLE_key) => FiniteMap key elt -> FiniteMap key elt -> FiniteMap key elt --- | Combine two 'FiniteMaps'. The specified combination function is +-- | Combine two 'FiniteMap's. The specified combination function is -- used to calculate the new value when there are two elements with -- the same key. plusFM_C :: (Ord key OUTPUTABLE_key) => (elt -> elt -> elt)