monoidmap-examples 0.1.0.1 → 0.1.1.0
raw patch · 6 files changed
+49/−4 lines, 6 filesdep ~monoidmapPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: monoidmap
API changes (from Hackage documentation)
+ Data.MonoidMap.Examples.MultiSet: instance GHC.Classes.Ord a => GHC.Classes.Ord (Data.MonoidMap.Examples.MultiSet.MultiSet a)
+ Data.MonoidMap.Examples.NestedMonoidMap: instance (GHC.Classes.Ord k1, GHC.Classes.Ord k2, GHC.Classes.Ord v, Data.Monoid.Null.MonoidNull v) => GHC.Classes.Ord (Data.MonoidMap.Examples.NestedMonoidMap.NestedMonoidMap k1 k2 v)
+ Data.MonoidMap.Examples.RecoveredMap: instance (GHC.Classes.Ord k, GHC.Classes.Ord v) => GHC.Classes.Ord (Data.MonoidMap.Examples.RecoveredMap.Map k v)
Files
- CHANGELOG.md +4/−0
- components/monoidmap-examples-test/Data/MonoidMap/Examples/RecoveredMapSpec.hs +34/−1
- components/monoidmap-examples/Data/MonoidMap/Examples/MultiSet.hs +1/−0
- components/monoidmap-examples/Data/MonoidMap/Examples/NestedMonoidMap.hs +2/−1
- components/monoidmap-examples/Data/MonoidMap/Examples/RecoveredMap.hs +6/−0
- monoidmap-examples.cabal +2/−2
CHANGELOG.md view
@@ -1,3 +1,7 @@+# 0.1.1.0++- Added `Ord` instances for `MultiSet`, `NestedMonoidMap`, and `RecoveredMap`.+ # 0.1.0.1 - Revised the inlining of functions exported by `RecoveredMap`, so that GHC can
components/monoidmap-examples-test/Data/MonoidMap/Examples/RecoveredMapSpec.hs view
@@ -53,7 +53,13 @@ , (===) ) import Test.QuickCheck.Classes- ( eqLaws, functorLaws, monoidLaws, semigroupLaws, semigroupMonoidLaws )+ ( eqLaws+ , functorLaws+ , monoidLaws+ , ordLaws+ , semigroupLaws+ , semigroupMonoidLaws+ ) import Test.Hspec.QuickCheck.Classes ( testLaws ) @@ -81,6 +87,7 @@ , Function v , Monoid v , Ord k+ , Ord v , Show k , Show v , Typeable k@@ -108,6 +115,7 @@ testLaws @(RMap.Map k v) [ eqLaws , monoidLaws+ , ordLaws , semigroupLaws , semigroupMonoidLaws ]@@ -158,6 +166,11 @@ prop_stimes_toList @k @v & property + describe "Compare" $ do+ it "prop_compare" $+ prop_compare+ @k @v & property+ describe "Delete" $ do it "prop_delete_lookup" $ prop_delete_lookup@@ -368,6 +381,26 @@ & cover 10 (n >= 2) "n >= 2"++--------------------------------------------------------------------------------+-- Compare+--------------------------------------------------------------------------------++prop_compare+ :: forall k v. (Ord k, Ord v)+ => [(k, v)]+ -> [(k, v)]+ -> Property+prop_compare kvs1 kvs2 =+ (===)+ (compare (RMap.fromList kvs1) (RMap.fromList kvs2))+ (compare (OMap.fromList kvs1) (OMap.fromList kvs2))+ & cover 10+ (OMap.fromList kvs1 < OMap.fromList kvs2)+ "OMap.fromList kvs1 < OMap.fromList kvs2"+ & cover 10+ (OMap.fromList kvs1 > OMap.fromList kvs2)+ "OMap.fromList kvs1 > OMap.fromList kvs2" -------------------------------------------------------------------------------- -- Delete
components/monoidmap-examples/Data/MonoidMap/Examples/MultiSet.hs view
@@ -75,6 +75,7 @@ } deriving newtype ( Eq+ , Ord , Semigroup , Commutative , Monoid
components/monoidmap-examples/Data/MonoidMap/Examples/NestedMonoidMap.hs view
@@ -91,10 +91,10 @@ newtype NestedMonoidMap k1 k2 v = NestedMonoidMap (MonoidMap k1 (MonoidMap k2 v))- deriving stock Eq deriving newtype ( Cancellative , Commutative+ , Eq , GCDMonoid , LCMMonoid , LeftCancellative@@ -103,6 +103,7 @@ , Monoid , MonoidNull , Monus+ , Ord , OverlappingGCDMonoid , PositiveMonoid , Reductive
components/monoidmap-examples/Data/MonoidMap/Examples/RecoveredMap.hs view
@@ -45,6 +45,8 @@ ( First (..) ) import Data.MonoidMap ( MonoidMap )+import Data.Ord+ ( comparing ) import Data.Semigroup ( Semigroup (stimes), stimesIdempotentMonoid ) import Data.Set@@ -57,6 +59,10 @@ -- 'Data.Map.Strict.Map': {unMap :: MonoidMap k (First v)} deriving newtype (Eq, NFData, Monoid)++instance (Ord k, Ord v) => Ord (Map k v) where+ compare = comparing toList+ {-# INLINE compare #-} instance Ord k => Semigroup (Map k v) where (<>) = coerce @(MonoidMap k (First v) -> _ -> _) (<>)
monoidmap-examples.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.0 name: monoidmap-examples-version: 0.1.0.1+version: 0.1.1.0 homepage: https://github.com/jonathanknowles/monoidmap/tree/HEAD/packages/monoidmap-examples bug-reports: https://github.com/jonathanknowles/monoidmap/issues license: Apache-2.0@@ -29,7 +29,7 @@ common dependency-monoid-subclasses build-depends:monoid-subclasses >= 1.2.3 && < 1.3 common dependency-monoidmap- build-depends:monoidmap >= 0.1.0.0 && < 0.2+ build-depends:monoidmap >= 0.1.5.0 && < 0.2 common dependency-QuickCheck build-depends:QuickCheck >= 2.14.2 && < 2.20 common dependency-quickcheck-classes