From 401d5ef4bfd4bc3d7c13932e9913db72446194c5 Mon Sep 17 00:00:00 2001 From: Stefan Fehrenbach Date: Tue, 12 Jun 2018 16:28:29 +0100 Subject: [PATCH 1/2] Switch (<>) to be right-biased --- src/Data/Map/Internal.purs | 2 +- test/Test/Data/Map.purs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Data/Map/Internal.purs b/src/Data/Map/Internal.purs index 6c3deda..6cdc398 100644 --- a/src/Data/Map/Internal.purs +++ b/src/Data/Map/Internal.purs @@ -81,7 +81,7 @@ instance showMap :: (Show k, Show v) => Show (Map k v) where show m = "(fromFoldable " <> show (toAscArray m) <> ")" instance semigroupMap :: Ord k => Semigroup (Map k v) where - append = union + append = unionWith (\_ x -> x) instance monoidMap :: Ord k => Monoid (Map k v) where mempty = empty diff --git a/test/Test/Data/Map.purs b/test/Test/Data/Map.purs index 64c6df1..57726ec 100644 --- a/test/Test/Data/Map.purs +++ b/test/Test/Data/Map.purs @@ -176,6 +176,10 @@ mapTests = do groupBy ((==) `on` fst) <<< sortBy (compare `on` fst) in M.fromFoldableWith (<>) arr === f (arr :: List (Tuple String String)) + log "fromFoldable (a <> b) = fromFoldable a <> fromFoldable b, for arrays a, b" + quickCheck $ \a b -> + M.fromFoldable (a <> b) === M.fromFoldable a <> M.fromFoldable (b :: Array (Tuple String String)) + log "toUnfoldable is sorted" quickCheck $ \(TestMap m) -> let list = M.toUnfoldable (m :: M.Map SmallKey Int) From 60637e7d338b8a066e782bfb2396f529700cdd27 Mon Sep 17 00:00:00 2001 From: Stefan Fehrenbach Date: Tue, 12 Jun 2018 16:35:42 +0100 Subject: [PATCH 2/2] Switch union to be right-biased --- src/Data/Map/Internal.purs | 6 +++--- test/Test/Data/Map.purs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Data/Map/Internal.purs b/src/Data/Map/Internal.purs index 6cdc398..3bcb80e 100644 --- a/src/Data/Map/Internal.purs +++ b/src/Data/Map/Internal.purs @@ -81,7 +81,7 @@ instance showMap :: (Show k, Show v) => Show (Map k v) where show m = "(fromFoldable " <> show (toAscArray m) <> ")" instance semigroupMap :: Ord k => Semigroup (Map k v) where - append = unionWith (\_ x -> x) + append = union instance monoidMap :: Ord k => Monoid (Map k v) where mempty = empty @@ -603,10 +603,10 @@ unionWith f m1 m2 = foldl go m2 (toUnfoldable m1 :: List (Tuple k v)) where go m (Tuple k v) = alter (Just <<< maybe v (f v)) k m --- | Compute the union of two maps, preferring values from the first map in the case +-- | Compute the union of two maps, preferring values from the second map in the case -- | of duplicate keys union :: forall k v. Ord k => Map k v -> Map k v -> Map k v -union = unionWith const +union = unionWith (\_ x -> x) -- | Compute the union of a collection of maps unions :: forall k v f. Ord k => Foldable f => f (Map k v) -> Map k v diff --git a/test/Test/Data/Map.purs b/test/Test/Data/Map.purs index 57726ec..794f0dc 100644 --- a/test/Test/Data/Map.purs +++ b/test/Test/Data/Map.purs @@ -188,15 +188,15 @@ mapTests = do log "Lookup from union" quickCheck $ \(TestMap m1) (TestMap m2) k -> - M.lookup (smallKey k) (M.union m1 m2) == (case M.lookup k m1 of - Nothing -> M.lookup k m2 + M.lookup (smallKey k) (M.union m1 m2) == (case M.lookup k m2 of + Nothing -> M.lookup k m1 Just v -> Just (number v)) ("m1: " <> show m1 <> ", m2: " <> show m2 <> ", k: " <> show k <> ", v1: " <> show (M.lookup k m1) <> ", v2: " <> show (M.lookup k m2) <> ", union: " <> show (M.union m1 m2)) log "Union is idempotent" quickCheck $ \(TestMap m1) (TestMap m2) -> (m1 `M.union` m2) == ((m1 `M.union` m2) `M.union` (m2 :: M.Map SmallKey Int)) - log "Union prefers left" - quickCheck $ \(TestMap m1) (TestMap m2) k -> M.lookup k (M.union m1 (m2 :: M.Map SmallKey Int)) == (M.lookup k m1 <|> M.lookup k m2) + log "Union prefers right" + quickCheck $ \(TestMap m1) (TestMap m2) k -> M.lookup k (M.union m1 (m2 :: M.Map SmallKey Int)) == (M.lookup k m2 <|> M.lookup k m1) log "unionWith" for_ [Tuple (+) 0, Tuple (*) 1] $ \(Tuple op ident) ->