git.iko.soy/monoidal-containers
on master help sign in
swap
64c444649 ahead, 0 behind
.travis.yml+124−106
since splitsnapshots
unifiedsplit
@@ -1,135 +1,153 @@
1# This Travis job script has been generated by a script via
1# This Travis job script has been generated by a script via
2#
2#
3−# runghc make_travis_yml_2.hs 'monoidal-containers.cabal'
3+# haskell-ci 'monoidal-containers.cabal' '-o' '.travis.yml'
4+#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
4#
8#
5# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
6#
10#
11+# version: 0.10.3
12+#
13+version: ~> 1.0
7language: c
14language: c
8−sudo: false
15+os: linux
9−
16+dist: xenial
10git:
17git:
11− submodules: false # whether to recursively clone submodules
18+ # whether to recursively clone submodules
12−
19+ submodules: false
13cache:
20cache:
14 directories:
21 directories:
15 - $HOME/.cabal/packages
22 - $HOME/.cabal/packages
16 - $HOME/.cabal/store
23 - $HOME/.cabal/store
17−
24+ - $HOME/.hlint
18before_cache:
25before_cache:
19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
20 # remove files that are regenerated by 'cabal update'
27 # remove files that are regenerated by 'cabal update'
21− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
28+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
22− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
29+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
30+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
24− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
31+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
32+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
26−
27− - rm -rfv $HOME/.cabal/packages/head.hackage
33+ - rm -rfv $CABALHOME/packages/head.hackage
28−
34+jobs:
29−matrix:
30 include:
35 include:
31− - compiler: "ghc-8.6.1"
36+ - compiler: ghc-8.10.2
32− env: GHCHEAD=true
37+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.2","cabal-install-3.2"]}}
33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}
38+ os: linux
39+ - compiler: ghc-8.8.4
40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.4","cabal-install-3.2"]}}
41+ os: linux
42+ - compiler: ghc-8.6.5
43+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
44+ os: linux
34− - compiler: "ghc-8.4.3"
45+ - compiler: ghc-8.4.3
35− # env: TEST=--disable-tests BENCH=--disable-benchmarks
46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.3","cabal-install-3.2"]}}
36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
47+ os: linux
37− - compiler: "ghc-8.2.2"
48+ - compiler: ghc-8.2.2
38− # env: TEST=--disable-tests BENCH=--disable-benchmarks
49+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
39− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
50+ os: linux
40− - compiler: "ghc-8.0.2"
51+ - compiler: ghc-8.0.2
41− # env: TEST=--disable-tests BENCH=--disable-benchmarks
52+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
53+ os: linux
43− - compiler: "ghc-7.8.4"
54+ - compiler: ghc-7.8.4
44− # env: TEST=--disable-tests BENCH=--disable-benchmarks
55+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}
45− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
56+ os: linux
46−
47− allow_failures:
48− - compiler: "ghc-8.6.1"
49−
50before_install:
57before_install:
51− - HC=${CC}
58+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
59+ - WITHCOMPILER="-w $HC"
60+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
52− - HCPKG=${HC/ghc/ghc-pkg}
61+ - HCPKG="$HC-pkg"
53 - unset CC
62 - unset CC
54− - ROOTDIR=$(pwd)
63+ - CABAL=/opt/ghc/bin/cabal
55− - mkdir -p $HOME/.local/bin
64+ - CABALHOME=$HOME/.cabal
56− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
65+ - export PATH="$CABALHOME/bin:$PATH"
66+ - TOP=$(pwd)
57− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
67+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
58 - echo $HCNUMVER
68 - echo $HCNUMVER
59−
69+ - CABAL="$CABAL -vnormal+nowrap"
70+ - set -o pipefail
71+ - TEST=--enable-tests
72+ - BENCH=--enable-benchmarks
73+ - HEADHACKAGE=false
74+ - rm -f $CABALHOME/config
75+ - |
76+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
77+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
78+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
79+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
80+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
81+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
82+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
83+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
84+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
85+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
86+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
87+ echo "install-dirs user" >> $CABALHOME/config
88+ echo " prefix: $CABALHOME" >> $CABALHOME/config
89+ echo "repository hackage.haskell.org" >> $CABALHOME/config
90+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
60install:
91install:
61− - cabal --version
92+ - ${CABAL} --version
62 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
93 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
63− - BENCH=${BENCH---enable-benchmarks}
64− - TEST=${TEST---enable-tests}
65− - HADDOCK=${HADDOCK-true}
66− - UNCONSTRAINED=${UNCONSTRAINED-true}
67− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
68− - GHCHEAD=${GHCHEAD-false}
69− - travis_retry cabal update -v
70− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
71− - rm -fv cabal.project cabal.project.local
72− # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
73 - |
94 - |
74− if $GHCHEAD; then
95+ echo "program-default-options" >> $CABALHOME/config
75− sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
96+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
76− for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
97+ - cat $CABALHOME/config
77−
98+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
78− echo 'repository head.hackage' >> ${HOME}/.cabal/config
99+ - travis_retry ${CABAL} v2-update -v
79− echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
100+ # Generate cabal.project
80− echo ' secure: True' >> ${HOME}/.cabal/config
101+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
81− echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
102+ - touch cabal.project
82− echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
103+ - |
83− echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
84− echo ' key-threshold: 3' >> ${HOME}/.cabal.config
85−
86− grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
87−
88− cabal new-update head.hackage -v
89− fi
90− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
91− - "printf 'packages: \".\"\\n' > cabal.project"
104+ echo "packages: ." >> cabal.project
92− - touch cabal.project.local
105+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package monoidal-containers' >> cabal.project ; fi
106+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
107+ - |
93− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- monoidal-containers | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
108+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(monoidal-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
94 - cat cabal.project || true
109 - cat cabal.project || true
95 - cat cabal.project.local || true
110 - cat cabal.project.local || true
96− - if [ -f "./configure.ac" ]; then
111+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
97− (cd "." && autoreconf -i);
112+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
98− fi
113+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
99− - rm -f cabal.project.freeze
114+ - rm cabal.project.freeze
100− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
115+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
101− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
116+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
102− - rm -rf .ghc.environment.* "."/dist
103− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
104−
105−# Here starts the actual work to be performed for the package under test;
106−# any command which exits with a non-zero exit code causes the build to fail.
107script:
117script:
108− # test that source-distributions can be generated
118+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
109− - (cd "." && cabal sdist)
119+ # Packaging...
120+ - ${CABAL} v2-sdist all
121+ # Unpacking...
110− - mv "."/dist/monoidal-containers-*.tar.gz ${DISTDIR}/
122+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
111 - cd ${DISTDIR} || false
123 - cd ${DISTDIR} || false
112− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
124+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
125+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
126+ - PKGDIR_monoidal_containers="$(find . -maxdepth 1 -type d -regex '.*/monoidal-containers-[0-9.]*')"
127+ # Generate cabal.project
128+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
129+ - touch cabal.project
130+ - |
113− - "printf 'packages: monoidal-containers-*/*.cabal\\n' > cabal.project"
131+ echo "packages: ${PKGDIR_monoidal_containers}" >> cabal.project
114− - touch cabal.project.local
132+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package monoidal-containers' >> cabal.project ; fi
133+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
134+ - |
115− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- monoidal-containers | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
135+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(monoidal-containers)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
116 - cat cabal.project || true
136 - cat cabal.project || true
117 - cat cabal.project.local || true
137 - cat cabal.project.local || true
138+ # Building...
118 # this builds all libraries and executables (without tests/benchmarks)
139 # this builds all libraries and executables (without tests/benchmarks)
119− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
140+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
120−
141+ # Building with tests and benchmarks...
121 # build & run tests, build benchmarks
142 # build & run tests, build benchmarks
122− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
143+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
123−
124− # cabal check
144+ # cabal check...
125− - (cd monoidal-containers-* && cabal check)
145+ - (cd ${PKGDIR_monoidal_containers} && ${CABAL} -vnormal check)
126−
127− # haddock
146+ # haddock...
128− - rm -rf ./dist-newstyle
147+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
129− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
130−
131− # Build without installed constraints for packages in global-db
148+ # Building without installed constraints for packages in global-db...
132− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
149+ - rm -f cabal.project.local
133−
150+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
151+
134−# REGENDATA ["monoidal-containers.cabal"]
152+# REGENDATA ("0.10.3",["monoidal-containers.cabal","-o",".travis.yml"])
135# EOF
153# EOF
Changelog.md+24−1
@@ -1,9 +1,32 @@
1# Monoidal containers
1# Monoidal containers
2
2
3+# 0.6.0.1
4+
5+ * Support semialign-1.1
6+
7+# 0.6
8+
9+ * Deprecates 0.5.* and reverts behavior of fromList, insert, mapKeys, etc. to match behavior in Data.Map. The only difference in behavior between Data.Map.Monoidal.MonoidalMap and Data.Map.Map is now the semigroup and monoid instances (as was the case in 0.4 and earlier).
10+ * Fix the argument order of Data.HashMap.Monoidal.insert
11+ * Remove Data.HashMap.Monoidal.insertOrReplace as it is now identical to Data.HashMap.Monoidal.insert
12+ * Added Data.HashMap.Monoidal.insertWith and Data.HashMap.Monoidal.fromListWith
13+
14+# 0.5.0.1
15+
16+ * Add a flag, `split-these`, to select whether to use the new "these"/"semialign" packages or the older combined "these" package.
17+ * Add default.nix to make it easier to hack on this package in nix
18+
19+# 0.5.0.0
20+
21+ * Added Data.IntMap.Monoidal and Data.IntMap.Monoidal.Strict, corresponding to Data.IntMap and Data.IntMap.Strict
22+ * Make `fromList`, `insert`, and `mapKeys` from `Data.Map.Monoidal` and `Data.Map.Monoidal.Strict` require `Semigroup` on values to properly capture monoidal behavior instead of reverting to the left-biased semantics of `Data.Map`.
23+ * Add Align instances and, for sufficiently recent versions of `these`, Semialign instances
24+ * Support `these` 0.8.0
25+
3# 0.4.0.0
26# 0.4.0.0
4
27
5General changes:
28General changes:
6−
29+
7 * Added support for `unordered-containers < 0.2.8`
30 * Added support for `unordered-containers < 0.2.8`
8 * Added many more functions in `Data.Map.[Strict.]Monoid`
31 * Added many more functions in `Data.Map.[Strict.]Monoid`
9
32
README.md+4
@@ -6,3 +6,7 @@ of the values to be used when resolving conflicts between keys when merging
6structures. Sadly, these are not the semantics offered by the provided
6structures. Sadly, these are not the semantics offered by the provided
7instances. This package provides `newtypes` with an appropriate set of
7instances. This package provides `newtypes` with an appropriate set of
8instances and utility functions to make them usable.
8instances and utility functions to make them usable.
9+
10+## Important Note
11+
12+This library is designed to be a drop-in replacement for `Data.Map` and similar. Absolutely no other semantic changes are introduced in functions like `fromList` or `insert`. They are still left-biased like `Data.Map`'s. The only difference is in instances for `Semigroup`.
default.nixnew file+16
@@ -0,0 +1,16 @@
1+{ mkDerivation, aeson, base, containers, deepseq, hashable, lens
2+, newtype, semialign, semigroups, stdenv, these
3+, unordered-containers
4+}:
5+mkDerivation {
6+ pname = "monoidal-containers";
7+ version = "0.6";
8+ src = ./.;
9+ libraryHaskellDepends = [
10+ aeson base containers deepseq hashable lens newtype semialign
11+ semigroups these unordered-containers
12+ ];
13+ homepage = "http://github.com/bgamari/monoidal-containers";
14+ description = "Containers with monoidal accumulation";
15+ license = stdenv.lib.licenses.bsd3;
16+}
monoidal-containers.cabal+20−7
@@ -1,5 +1,5 @@
1name: monoidal-containers
1name: monoidal-containers
2−version: 0.4.0.0
2+version: 0.6.0.1
3synopsis: Containers with monoidal accumulation
3synopsis: Containers with monoidal accumulation
4description:
4description:
5 Containers with merging via monoidal accumulation. The 'Monoid' instances
5 Containers with merging via monoidal accumulation. The 'Monoid' instances
@@ -24,30 +24,43 @@ category: Data
24build-type: Simple
24build-type: Simple
25cabal-version: >=1.10
25cabal-version: >=1.10
26extra-source-files: Changelog.md
26extra-source-files: Changelog.md
27−tested-with: GHC ==7.8.4, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.3, GHC ==8.6.1
27+tested-with: GHC ==7.8.4, GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.3, GHC ==8.6.5, GHC ==8.8.4, GHC ==8.10.2
28
28
29source-repository head
29source-repository head
30 type: git
30 type: git
31 location: git://github.com/bgamari/monoidal-containers
31 location: git://github.com/bgamari/monoidal-containers
32
32
33+flag split-these
34+ description: Use split these/semialign packages
35+ manual: False
36+ default: True
37+
33library
38library
34 exposed-modules: Data.Map.Monoidal
39 exposed-modules: Data.Map.Monoidal
35 Data.HashMap.Monoidal
40 Data.HashMap.Monoidal
41+ Data.IntMap.Monoidal
36 Data.Map.Monoidal.Strict
42 Data.Map.Monoidal.Strict
43+ Data.IntMap.Monoidal.Strict
37 other-extensions: CPP,
44 other-extensions: CPP,
38 MultiParamTypeClasses,
45 MultiParamTypeClasses,
39 GeneralizedNewtypeDeriving,
46 GeneralizedNewtypeDeriving,
40 DeriveTraversable,
47 DeriveTraversable,
41 DeriveDataTypeable
48 DeriveDataTypeable
42− build-depends: base >=4.5 && <4.13,
49+ build-depends: base >=4.7 && <4.16,
43− aeson >=1.0 && <1.5,
50+ aeson >=1.0 && <1.6,
44 containers >=0.5 && <0.7,
51 containers >=0.5 && <0.7,
45 deepseq >=1.3 && <1.5,
52 deepseq >=1.3 && <1.5,
46 unordered-containers >= 0.2 && < 0.3,
53 unordered-containers >= 0.2 && < 0.3,
47− hashable >= 1.2 && < 1.3,
54+ hashable >= 1.2 && < 1.4,
48 lens >=4.4 && <5,
55 lens >=4.4 && <5,
49 newtype >=0.2 && <0.3,
56 newtype >=0.2 && <0.3,
50− semigroups >= 0.18 && < 0.19,
57+ semigroups >= 0.18 && < 0.20
51− these
58+
59+ if flag(split-these)
60+ build-depends: these >= 1 && <1.2,
61+ semialign >=1 && <1.2
62+ else
63+ build-depends: these >= 0.7 && <0.9
64+
52 hs-source-dirs: src
65 hs-source-dirs: src
53 default-language: Haskell2010
66 default-language: Haskell2010
src/Data/HashMap/Monoidal.hs+43−24
@@ -20,6 +20,7 @@ module Data.HashMap.Monoidal
20 -- * Often-needed functions
20 -- * Often-needed functions
21 , toList
21 , toList
22 , fromList
22 , fromList
23+ , fromListWith
23 , singleton
24 , singleton
24 , size
25 , size
25 , member
26 , member
@@ -31,7 +32,7 @@ module Data.HashMap.Monoidal
31 , delete
32 , delete
32 , mapKeys
33 , mapKeys
33 , insert
34 , insert
34− , insertOrReplace
35+ , insertWith
35 , modify
36 , modify
36 , modifyDef
37 , modifyDef
37 , map
38 , map
@@ -59,6 +60,12 @@ import Data.Hashable.Lifted (Hashable1)
59import Control.Lens
60import Control.Lens
60import Control.Newtype
61import Control.Newtype
61import Data.Align
62import Data.Align
63+#ifdef MIN_VERSION_semialign
64+import Data.Semialign (Unalign)
65+#if MIN_VERSION_semialign(1,1,0)
66+import Data.Zip (Zip)
67+#endif
68+#endif
62
69
63-- | A 'HashMap' with monoidal accumulation
70-- | A 'HashMap' with monoidal accumulation
64newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap k a }
71newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap k a }
@@ -69,6 +76,12 @@ newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap
69#endif
76#endif
70#if MIN_VERSION_these(0,8,0)
77#if MIN_VERSION_these(0,8,0)
71 , Semialign
78 , Semialign
79+#endif
80+#ifdef MIN_VERSION_semialign
81+ , Unalign
82+#if MIN_VERSION_semialign(1,1,0)
83+ , Zip
84+#endif
72#endif
85#endif
73 )
86 )
74
87
@@ -125,7 +138,7 @@ instance Newtype (MonoidalHashMap k a) (M.HashMap k a) where
125#if MIN_VERSION_base(4,7,0)
138#if MIN_VERSION_base(4,7,0)
126instance (Eq k, Hashable k, Semigroup a) => Exts.IsList (MonoidalHashMap k a) where
139instance (Eq k, Hashable k, Semigroup a) => Exts.IsList (MonoidalHashMap k a) where
127 type Item (MonoidalHashMap k a) = (k, a)
140 type Item (MonoidalHashMap k a) = (k, a)
128− fromList = MonoidalHashMap . M.fromListWith (<>)
141+ fromList = MonoidalHashMap . M.fromList
129 {-# INLINE fromList #-}
142 {-# INLINE fromList #-}
130 toList = M.toList . unpack
143 toList = M.toList . unpack
131 {-# INLINE toList #-}
144 {-# INLINE toList #-}
@@ -182,38 +195,44 @@ keys = M.keys . unpack
182{-# INLINE keys #-}
195{-# INLINE keys #-}
183
196
184-- | /O(n*log n)/. Construct a map with the supplied mappings. If the list
197-- | /O(n*log n)/. Construct a map with the supplied mappings. If the list
185−-- contains duplicate mappings, values will be merged using (mappend newVal oldVal).
198+-- contains duplicate mappings, values will be replaced.
186−fromList :: (Eq k, Hashable k, Semigroup a) => [(k,a)] -> MonoidalHashMap k a
199+fromList :: (Eq k, Hashable k) => [(k,a)] -> MonoidalHashMap k a
187−fromList = pack . M.fromListWith (<>)
200+fromList = pack . M.fromList
188{-# INLINE fromList #-}
201{-# INLINE fromList #-}
189
202
203+-- | /O(n*log n)/. Construct a map with the supplied mappings. If the list
204+-- contains duplicate mappings, values will be merged using the provided combining function.
205+fromListWith :: (Eq k, Hashable k) => (a -> a -> a) -> [(k,a)] -> MonoidalHashMap k a
206+fromListWith f = pack . M.fromListWith f
207+{-# INLINE fromListWith #-}
208+
209+
190-- | /O(n*log n)/. Return a list of this map's elements. The list is produced
210-- | /O(n*log n)/. Return a list of this map's elements. The list is produced
191-- lazily. The order of its elements is unspecified.
211-- lazily. The order of its elements is unspecified.
192toList :: MonoidalHashMap k a -> [(k,a)]
212toList :: MonoidalHashMap k a -> [(k,a)]
193toList = M.toList . unpack
213toList = M.toList . unpack
194{-# INLINE toList #-}
214{-# INLINE toList #-}
195
215
196−-- | /O(log n)/. Insert a value on some key, if it exists -- mappend
216+-- | /O(log n)/. Insert a value on some key, if it exists replace the value.
197−-- to the existing one.
198−insert :: (Semigroup a, Hashable k, Eq k)
217+insert :: (Hashable k, Eq k)
199− => a
218+ => k
200− -> k
219+ -> a
201 -> MonoidalHashMap k a
220 -> MonoidalHashMap k a
202 -> MonoidalHashMap k a
221 -> MonoidalHashMap k a
203−insert x k = pack
222+insert k x = pack
204− . M.insertWith (<>) k x
223+ . M.insert k x
205 . unpack
224 . unpack
206
225
207−-- | /O(log n)/. Insert a value on some key with a function, if value
226+-- | /O(log n)/. Insert a value on some key, if it exists apply the combining function.
208−-- under key exists -- replace it.
209−insertOrReplace :: (Semigroup a, Hashable k, Eq k)
227+insertWith :: (Hashable k, Eq k)
210− => a
228+ => (a -> a -> a)
211− -> k
229+ -> k
230+ -> a
212− -> MonoidalHashMap k a
231+ -> MonoidalHashMap k a
213− -> MonoidalHashMap k a
232+ -> MonoidalHashMap k a
214−insertOrReplace x k = pack
233+insertWith f k x = pack
215− . M.insert k x
234+ . M.insertWith f k x
216− . unpack
235+ . unpack
217
236
218-- | /O(log n)/. Modify a value on some key with a function, if value
237-- | /O(log n)/. Modify a value on some key with a function, if value
219-- under key doesn't exist -- use mempty.
238-- under key doesn't exist -- use mempty.
@@ -228,7 +247,7 @@ modify f k = pack
228
247
229-- | /O(log n)/. Modify a value on some key with a function, providing
248-- | /O(log n)/. Modify a value on some key with a function, providing
230-- a default value if that key doesn't exist.
249-- a default value if that key doesn't exist.
231−modifyDef :: (Semigroup a, Hashable k, Eq k)
250+modifyDef :: (Hashable k, Eq k)
232 => a -> (a -> a)
251 => a -> (a -> a)
233 -> k -> MonoidalHashMap k a
252 -> k -> MonoidalHashMap k a
234 -> MonoidalHashMap k a
253 -> MonoidalHashMap k a
@@ -239,7 +258,7 @@ modifyDef d f k = pack
239
258
240-- | /O(n)/. Map a function to each key of a map, if it will result
259-- | /O(n)/. Map a function to each key of a map, if it will result
241-- in duplicated mappings, their values will be merged in unspecified order
260-- in duplicated mappings, their values will be merged in unspecified order
242−mapKeys :: (Semigroup a, Hashable k, Eq k, Hashable k', Eq k')
261+mapKeys :: (Hashable k, Eq k, Hashable k', Eq k')
243 => (k -> k') -> MonoidalHashMap k a -> MonoidalHashMap k' a
262 => (k -> k') -> MonoidalHashMap k a -> MonoidalHashMap k' a
244mapKeys f = fromList
263mapKeys f = fromList
245 . fmap (\(k, v) -> (f k, v))
264 . fmap (\(k, v) -> (f k, v))
src/Data/IntMap/Monoidal.hsnew file+651
@@ -0,0 +1,651 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE MultiParamTypeClasses #-}
4+{-# LANGUAGE TypeFamilies #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE DeriveTraversable #-}
8+{-# LANGUAGE DeriveDataTypeable #-}
9+{-# LANGUAGE StandaloneDeriving #-}
10+
11+-- | This module provides a 'Data.IntMap' variant which uses the value's
12+-- 'Monoid' instance to accumulate conflicting entries when merging
13+-- 'Map's.
14+--
15+-- While some functions mirroring those of 'Data.IntMap' are provided
16+-- here for convenience, more specialized needs will likely want to use
17+-- either the 'Newtype' or 'Wrapped' instances to manipulate the
18+-- underlying 'Map'.
19+
20+module Data.IntMap.Monoidal
21+ ( MonoidalIntMap(..)
22+ -- * Often-needed functions
23+ , singleton
24+ , size
25+ , member
26+ , notMember
27+ , findWithDefault
28+ , assocs
29+ , elems
30+ , keys
31+ , (!)
32+ , (\\)
33+ , adjust
34+ , adjustWithKey
35+ , alter
36+ , delete
37+-- , deleteAt
38+ , deleteFindMax
39+ , deleteFindMin
40+ , deleteMax
41+ , deleteMin
42+ , difference
43+ , differenceWith
44+ , differenceWithKey
45+-- , elemAt
46+ , empty
47+ , filter
48+ , filterWithKey
49+-- , findIndex
50+ , findMax
51+ , findMin
52+ , foldMapWithKey
53+ , foldl
54+ , foldl'
55+ , foldlWithKey
56+ , foldlWithKey'
57+ , foldr
58+ , foldr'
59+ , foldrWithKey
60+ , foldrWithKey'
61+ , fromAscList
62+ , fromAscListWith
63+ , fromAscListWithKey
64+ , fromDistinctAscList
65+ , fromDistinctList
66+ , fromList
67+ , fromListWith
68+ , fromListWithKey
69+ , fromSet
70+ , insert
71+ , insertLookupWithKey
72+ , insertWith
73+ , insertWithKey
74+ , intersectionWith
75+ , intersectionWithKey
76+ , isProperSubmapOf
77+ , isProperSubmapOfBy
78+ , isSubmapOf
79+ , isSubmapOfBy
80+ , keysSet
81+ , lookup
82+ , lookupGE
83+ , lookupGT
84+-- , lookupIndex
85+ , lookupLE
86+ , lookupLT
87+ , map
88+ , mapAccum
89+ , mapAccumRWithKey
90+ , mapAccumWithKey
91+ , mapEither
92+ , mapEitherWithKey
93+ , mapKeys
94+ , mapKeysMonotonic
95+ , mapKeysWith
96+ , mapMaybe
97+ , mapMaybeWithKey
98+ , mapWithKey
99+ , maxView
100+ , maxViewWithKey
101+ , mergeWithKey
102+ , minView
103+ , minViewWithKey
104+ , null
105+ , partition
106+ , partitionWithKey
107+ , split
108+ , splitLookup
109+ , splitRoot
110+ , toAscList
111+ , toDescList
112+ , toList
113+ , traverseWithKey
114+ , unionWith
115+ , unionWithKey
116+ , unionsWith
117+ , update
118+-- , updateAt
119+ , updateLookupWithKey
120+ , updateMax
121+ , updateMaxWithKey
122+ , updateMin
123+ , updateMinWithKey
124+ , updateWithKey
125+-- , valid
126+ -- , showTree
127+ -- , showTreeWith
128+ ) where
129+
130+import Prelude hiding (null, lookup, map, foldl, foldr, filter)
131+
132+import Data.Coerce (coerce)
133+import Data.IntSet (IntSet)
134+import Data.Semigroup
135+import Data.Foldable (Foldable)
136+import Data.Traversable (Traversable)
137+import Control.Applicative (Applicative, pure)
138+import Data.Data (Data)
139+import Data.Typeable (Typeable)
140+
141+#if MIN_VERSION_base(4,7,0)
142+import qualified GHC.Exts as IsList
143+#endif
144+
145+import Control.DeepSeq
146+import qualified Data.IntMap as M
147+import Control.Lens
148+import Control.Newtype
149+import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)
150+#if MIN_VERSION_containers(0,5,9)
151+import Data.Functor.Classes
152+#endif
153+import Data.Align
154+#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
156+#if MIN_VERSION_semialign(1,1,0)
157+import Data.Zip (Zip)
158+#endif
159+#endif
160+
161+-- | An 'IntMap' with monoidal accumulation
162+newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
163+ deriving (Show, Read, Functor, Eq, Ord, NFData,
164+ Foldable, Traversable,
165+ FromJSON, ToJSON, FromJSON1, ToJSON1,
166+ Data, Typeable, Align
167+#if MIN_VERSION_these(0,8,0)
168+ , Semialign
169+#endif
170+#ifdef MIN_VERSION_semialign
171+ , Unalign
172+#if MIN_VERSION_semialign(1,1,0)
173+ , Zip
174+#endif
175+#endif
176+ )
177+
178+#if MIN_VERSION_containers(0,5,9)
179+deriving instance Eq1 MonoidalIntMap
180+deriving instance Ord1 MonoidalIntMap
181+deriving instance Show1 MonoidalIntMap
182+#endif
183+
184+type instance Index (MonoidalIntMap a) = Int
185+type instance IxValue (MonoidalIntMap a) = a
186+instance Ixed (MonoidalIntMap a) where
187+ ix k f (MonoidalIntMap m) = case M.lookup k m of
188+ Just v -> f v <&> \v' -> MonoidalIntMap (M.insert k v' m)
189+ Nothing -> pure (MonoidalIntMap m)
190+ {-# INLINE ix #-}
191+
192+instance At (MonoidalIntMap a) where
193+ at k f (MonoidalIntMap m) = f mv <&> \r -> case r of
194+ Nothing -> maybe (MonoidalIntMap m) (const (MonoidalIntMap $ M.delete k m)) mv
195+ Just v' -> MonoidalIntMap $ M.insert k v' m
196+ where mv = M.lookup k m
197+ {-# INLINE at #-}
198+
199+instance Each (MonoidalIntMap a) (MonoidalIntMap b) a b
200+
201+instance FunctorWithIndex Int MonoidalIntMap
202+instance FoldableWithIndex Int MonoidalIntMap
203+instance TraversableWithIndex Int MonoidalIntMap where
204+ itraverse f (MonoidalIntMap m) = fmap MonoidalIntMap $ itraverse f m
205+ {-# INLINE itraverse #-}
206+
207+instance TraverseMin Int MonoidalIntMap where
208+ traverseMin f (MonoidalIntMap m) = fmap MonoidalIntMap $ traverseMin f m
209+ {-# INLINE traverseMin #-}
210+instance TraverseMax Int MonoidalIntMap where
211+ traverseMax f (MonoidalIntMap m) = fmap MonoidalIntMap $ traverseMax f m
212+ {-# INLINE traverseMax #-}
213+
214+instance AsEmpty (MonoidalIntMap a) where
215+ _Empty = nearly (MonoidalIntMap M.empty) (M.null . unpack)
216+ {-# INLINE _Empty #-}
217+
218+instance Wrapped (MonoidalIntMap a) where
219+ type Unwrapped (MonoidalIntMap a) = M.IntMap a
220+ _Wrapped' = iso unpack pack
221+ {-# INLINE _Wrapped' #-}
222+
223+instance Semigroup a => Semigroup (MonoidalIntMap a) where
224+ MonoidalIntMap a <> MonoidalIntMap b = MonoidalIntMap $ M.unionWith (<>) a b
225+ {-# INLINE (<>) #-}
226+
227+instance Semigroup a => Monoid (MonoidalIntMap a) where
228+ mempty = MonoidalIntMap mempty
229+ {-# INLINE mempty #-}
230+#if !(MIN_VERSION_base(4,11,0))
231+ mappend (MonoidalIntMap a) (MonoidalIntMap b) = MonoidalIntMap $ M.unionWith (<>) a b
232+ {-# INLINE mappend #-}
233+#endif
234+
235+instance Newtype (MonoidalIntMap a) (M.IntMap a) where
236+ pack = MonoidalIntMap
237+ {-# INLINE pack #-}
238+ unpack (MonoidalIntMap a) = a
239+ {-# INLINE unpack #-}
240+
241+#if MIN_VERSION_base(4,7,0)
242+instance Semigroup a => IsList.IsList (MonoidalIntMap a) where
243+ type Item (MonoidalIntMap a) = (Int, a)
244+ fromList = MonoidalIntMap . M.fromListWith (<>)
245+ {-# INLINE fromList #-}
246+ toList = M.toList . unpack
247+ {-# INLINE toList #-}
248+#endif
249+
250+-- | /O(1)/. A map with a single element.
251+singleton :: Int -> a -> MonoidalIntMap a
252+singleton k a = MonoidalIntMap $ M.singleton k a
253+{-# INLINE singleton #-}
254+
255+-- | /O(1)/. The number of elements in the map.
256+size :: MonoidalIntMap a -> Int
257+size = M.size . unpack
258+{-# INLINE size #-}
259+
260+-- | /O(log n)/. Is the key a member of the map? See also 'notMember'.
261+member :: Int -> MonoidalIntMap a -> Bool
262+member k = M.member k . unpack
263+{-# INLINE member #-}
264+
265+-- | /O(log n)/. Is the key not a member of the map? See also 'member'.
266+notMember :: Int -> MonoidalIntMap a -> Bool
267+notMember k = not . M.member k . unpack
268+{-# INLINE notMember #-}
269+
270+-- | /O(log n)/. The expression @('findWithDefault' def k map)@ returns
271+-- the value at key @k@ or returns default value @def@
272+-- when the key is not in the map.
273+findWithDefault :: forall a. a -> Int -> MonoidalIntMap a -> a
274+findWithDefault def k = M.findWithDefault def k . unpack
275+{-# INLINE findWithDefault #-}
276+
277+-- | /O(log n)/. Delete a key and its value from the map. When the key is not
278+-- a member of the map, the original map is returned.
279+delete :: Int -> MonoidalIntMap a -> MonoidalIntMap a
280+delete k = _Wrapping' MonoidalIntMap %~ M.delete k
281+{-# INLINE delete #-}
282+
283+-- | /O(n)/. Return all elements of the map and their keys
284+assocs :: MonoidalIntMap a -> [(Int,a)]
285+assocs = M.assocs . unpack
286+{-# INLINE assocs #-}
287+
288+-- | /O(n)/. Return all elements of the map in the ascending order of their
289+-- keys. Subject to list fusion.
290+elems :: MonoidalIntMap a -> [a]
291+elems = M.elems . unpack
292+{-# INLINE elems #-}
293+
294+-- | /O(n)/. Return all keys of the map in ascending order. Subject to list
295+-- fusion.
296+keys :: MonoidalIntMap a -> [Int]
297+keys = M.keys . unpack
298+{-# INLINE keys #-}
299+
300+(!) :: forall a. MonoidalIntMap a -> Int -> a
301+(!) = coerce ((M.!) :: M.IntMap a -> Int -> a)
302+infixl 9 !
303+
304+(\\) :: forall a b. MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
305+(\\) = coerce ((M.\\) :: M.IntMap a -> M.IntMap b -> M.IntMap a)
306+infixl 9 \\ --
307+
308+null :: forall a. MonoidalIntMap a -> Bool
309+null = coerce (M.null :: M.IntMap a -> Bool)
310+{-# INLINE null #-}
311+
312+lookup :: forall a. Int -> MonoidalIntMap a -> Maybe a
313+lookup = coerce (M.lookup :: Int -> M.IntMap a -> Maybe a)
314+{-# INLINE lookup #-}
315+
316+lookupLT :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
317+lookupLT = coerce (M.lookupLT :: Int -> M.IntMap a -> Maybe (Int,a))
318+{-# INLINE lookupLT #-}
319+
320+lookupGT :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
321+lookupGT = coerce (M.lookupGT :: Int -> M.IntMap a -> Maybe (Int,a))
322+{-# INLINE lookupGT #-}
323+
324+lookupLE :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
325+lookupLE = coerce (M.lookupLE :: Int -> M.IntMap a -> Maybe (Int,a))
326+{-# INLINE lookupLE #-}
327+
328+lookupGE :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
329+lookupGE = coerce (M.lookupGE :: Int -> M.IntMap a -> Maybe (Int,a))
330+{-# INLINE lookupGE #-}
331+
332+empty :: forall a. MonoidalIntMap a
333+empty = coerce (M.empty :: M.IntMap a)
334+{-# INLINE empty #-}
335+
336+insert :: forall a. Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
337+insert = coerce (M.insert :: Int -> a -> M.IntMap a -> M.IntMap a)
338+{-# INLINE insert #-}
339+
340+insertWith :: forall a. (a -> a -> a) -> Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
341+insertWith = coerce (M.insertWith :: (a -> a -> a) -> Int -> a -> M.IntMap a -> M.IntMap a)
342+{-# INLINE insertWith #-}
343+
344+insertWithKey :: forall a. (Int -> a -> a -> a) -> Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
345+insertWithKey = coerce (M.insertWithKey :: (Int -> a -> a -> a) -> Int -> a -> M.IntMap a -> M.IntMap a)
346+{-# INLINE insertWithKey #-}
347+
348+insertLookupWithKey :: forall a. (Int -> a -> a -> a) -> Int -> a -> MonoidalIntMap a -> (Maybe a, MonoidalIntMap a)
349+insertLookupWithKey = coerce (M.insertLookupWithKey :: (Int -> a -> a -> a) -> Int -> a -> M.IntMap a -> (Maybe a, M.IntMap a))
350+{-# INLINE insertLookupWithKey #-}
351+
352+adjust :: forall a. (a -> a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
353+adjust = coerce (M.adjust :: (a -> a) -> Int -> M.IntMap a -> M.IntMap a)
354+{-# INLINE adjust #-}
355+
356+adjustWithKey :: forall a. (Int -> a -> a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
357+adjustWithKey = coerce (M.adjustWithKey :: (Int -> a -> a) -> Int -> M.IntMap a -> M.IntMap a)
358+{-# INLINE adjustWithKey #-}
359+
360+update :: forall a. (a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
361+update = coerce (M.update :: (a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
362+{-# INLINE update #-}
363+
364+updateWithKey :: forall a. (Int -> a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
365+updateWithKey = coerce (M.updateWithKey :: (Int -> a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
366+{-# INLINE updateWithKey #-}
367+
368+updateLookupWithKey :: forall a. (Int -> a -> Maybe a) -> Int -> MonoidalIntMap a -> (Maybe a, MonoidalIntMap a)
369+updateLookupWithKey = coerce (M.updateLookupWithKey :: (Int -> a -> Maybe a) -> Int -> M.IntMap a -> (Maybe a, M.IntMap a))
370+{-# INLINE updateLookupWithKey #-}
371+
372+alter :: forall a. (Maybe a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
373+alter = coerce (M.alter :: (Maybe a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
374+{-# INLINE alter #-}
375+
376+unionWith :: forall a. (a -> a -> a) -> MonoidalIntMap a -> MonoidalIntMap a -> MonoidalIntMap a
377+unionWith = coerce (M.unionWith :: (a -> a -> a) -> M.IntMap a -> M.IntMap a -> M.IntMap a)
378+{-# INLINE unionWith #-}
379+
380+unionWithKey :: forall a. (Int -> a -> a -> a) -> MonoidalIntMap a -> MonoidalIntMap a -> MonoidalIntMap a
381+unionWithKey = coerce (M.unionWithKey :: (Int -> a -> a -> a) -> M.IntMap a -> M.IntMap a -> M.IntMap a)
382+{-# INLINE unionWithKey #-}
383+
384+unionsWith :: forall a. (a -> a -> a) -> [MonoidalIntMap a] -> MonoidalIntMap a
385+unionsWith = coerce (M.unionsWith :: (a -> a -> a) -> [M.IntMap a] -> M.IntMap a)
386+{-# INLINE unionsWith #-}
387+
388+difference :: forall a b. MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
389+difference = (\\)
390+{-# INLINE difference #-}
391+
392+differenceWith :: forall a b. (a -> b -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
393+differenceWith = coerce (M.differenceWith :: (a -> b -> Maybe a) -> M.IntMap a -> M.IntMap b -> M.IntMap a)
394+{-# INLINE differenceWith #-}
395+
396+differenceWithKey :: forall a b. (Int -> a -> b -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
397+differenceWithKey = coerce (M.differenceWithKey :: (Int -> a -> b -> Maybe a) -> M.IntMap a -> M.IntMap b -> M.IntMap a)
398+{-# INLINE differenceWithKey #-}
399+
400+intersectionWith :: forall a b c. (a -> b -> c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
401+intersectionWith = coerce (M.intersectionWith :: (a -> b -> c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
402+{-# INLINE intersectionWith #-}
403+
404+intersectionWithKey :: forall a b c. (Int -> a -> b -> c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
405+intersectionWithKey = coerce (M.intersectionWithKey :: (Int -> a -> b -> c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
406+{-# INLINE intersectionWithKey #-}
407+
408+mergeWithKey :: forall a b c. (Int -> a -> b -> Maybe c) -> (MonoidalIntMap a -> MonoidalIntMap c) -> (MonoidalIntMap b -> MonoidalIntMap c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
409+mergeWithKey = coerce (M.mergeWithKey :: (Int -> a -> b -> Maybe c) -> (M.IntMap a -> M.IntMap c) -> (M.IntMap b -> M.IntMap c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
410+{-# INLINE mergeWithKey #-}
411+
412+map :: (a -> b) -> MonoidalIntMap a -> MonoidalIntMap b
413+map = fmap
414+{-# INLINE map #-}
415+
416+mapWithKey :: forall a b. (Int -> a -> b) -> MonoidalIntMap a -> MonoidalIntMap b
417+mapWithKey = coerce (M.mapWithKey :: (Int -> a -> b) -> M.IntMap a -> M.IntMap b)
418+{-# INLINE mapWithKey #-}
419+
420+traverseWithKey :: Applicative t => (Int -> a -> t b) -> MonoidalIntMap a -> t (MonoidalIntMap b)
421+traverseWithKey = itraverse
422+{-# INLINE traverseWithKey #-}
423+
424+mapAccum :: forall a b c. (a -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
425+mapAccum = coerce (M.mapAccum :: (a -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
426+{-# INLINE mapAccum #-}
427+
428+mapAccumWithKey :: forall a b c. (a -> Int -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
429+mapAccumWithKey = coerce (M.mapAccumWithKey :: (a -> Int -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
430+{-# INLINE mapAccumWithKey #-}
431+
432+mapAccumRWithKey :: forall a b c. (a -> Int -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
433+mapAccumRWithKey = coerce (M.mapAccumRWithKey :: (a -> Int -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
434+{-# INLINE mapAccumRWithKey #-}
435+
436+mapKeys :: forall a. (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
437+mapKeys = coerce (M.mapKeys :: (Int -> Int) -> M.IntMap a -> M.IntMap a)
438+{-# INLINE mapKeys #-}
439+
440+mapKeysWith :: forall a. (a -> a -> a) -> (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
441+mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (Int -> Int) -> M.IntMap a -> M.IntMap a)
442+{-# INLINE mapKeysWith #-}
443+
444+mapKeysMonotonic :: forall a. (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
445+mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (Int -> Int) -> M.IntMap a -> M.IntMap a)
446+{-# INLINE mapKeysMonotonic #-}
447+
448+foldr :: forall a b. (a -> b -> b) -> b -> MonoidalIntMap a -> b
449+foldr = coerce (M.foldr :: (a -> b -> b) -> b -> M.IntMap a -> b)
450+{-# INLINE foldr #-}
451+
452+foldl :: forall a b. (a -> b -> a) -> a -> MonoidalIntMap b -> a
453+foldl = coerce (M.foldl :: (a -> b -> a) -> a -> M.IntMap b -> a)
454+{-# INLINE foldl #-}
455+
456+foldrWithKey :: forall a b. (Int -> a -> b -> b) -> b -> MonoidalIntMap a -> b
457+foldrWithKey = coerce (M.foldrWithKey :: (Int -> a -> b -> b) -> b -> M.IntMap a -> b)
458+{-# INLINE foldrWithKey #-}
459+
460+foldlWithKey :: forall a b. (a -> Int -> b -> a) -> a -> MonoidalIntMap b -> a
461+foldlWithKey = coerce (M.foldlWithKey :: (a -> Int -> b -> a) -> a -> M.IntMap b -> a)
462+{-# INLINE foldlWithKey #-}
463+
464+foldMapWithKey :: forall a m. Monoid m => (Int -> a -> m) -> MonoidalIntMap a -> m
465+foldMapWithKey = coerce (M.foldMapWithKey :: Monoid m => (Int -> a -> m) -> M.IntMap a -> m)
466+{-# INLINE foldMapWithKey #-}
467+
468+foldr' :: forall a b. (a -> b -> b) -> b -> MonoidalIntMap a -> b
469+foldr' = coerce (M.foldr' :: (a -> b -> b) -> b -> M.IntMap a -> b)
470+{-# INLINE foldr' #-}
471+
472+foldl' :: forall a b. (a -> b -> a) -> a -> MonoidalIntMap b -> a
473+foldl' = coerce (M.foldl' :: (a -> b -> a) -> a -> M.IntMap b -> a)
474+{-# INLINE foldl' #-}
475+
476+foldrWithKey' :: forall a b. (Int -> a -> b -> b) -> b -> MonoidalIntMap a -> b
477+foldrWithKey' = coerce (M.foldrWithKey' :: (Int -> a -> b -> b) -> b -> M.IntMap a -> b)
478+{-# INLINE foldrWithKey' #-}
479+
480+foldlWithKey' :: forall a b. (a -> Int -> b -> a) -> a -> MonoidalIntMap b -> a
481+foldlWithKey' = coerce (M.foldlWithKey' :: (a -> Int -> b -> a) -> a -> M.IntMap b -> a)
482+{-# INLINE foldlWithKey' #-}
483+
484+keysSet :: forall a. MonoidalIntMap a -> IntSet
485+keysSet = coerce (M.keysSet :: M.IntMap a -> IntSet)
486+{-# INLINE keysSet #-}
487+
488+fromSet :: forall a. (Int -> a) -> IntSet -> MonoidalIntMap a
489+fromSet = coerce (M.fromSet :: (Int -> a) -> IntSet -> M.IntMap a)
490+{-# INLINE fromSet #-}
491+
492+toList :: forall a. MonoidalIntMap a -> [(Int, a)]
493+toList = coerce (M.toList :: M.IntMap a -> [(Int, a)])
494+{-# INLINE toList #-}
495+
496+fromList :: forall a. [(Int, a)] -> MonoidalIntMap a
497+fromList = coerce (M.fromList :: [(Int, a)] -> M.IntMap a)
498+{-# INLINE fromList #-}
499+
500+fromListWith :: forall a. (a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
501+fromListWith = coerce (M.fromListWith :: (a -> a -> a) -> [(Int, a)] -> M.IntMap a)
502+{-# INLINE fromListWith #-}
503+
504+fromListWithKey :: forall a. (Int -> a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
505+fromListWithKey = coerce (M.fromListWithKey :: (Int -> a -> a -> a) -> [(Int, a)] -> M.IntMap a)
506+{-# INLINE fromListWithKey #-}
507+
508+toAscList :: forall a. MonoidalIntMap a -> [(Int, a)]
509+toAscList = coerce (M.toAscList :: M.IntMap a -> [(Int, a)])
510+{-# INLINE toAscList #-}
511+
512+toDescList :: forall a. MonoidalIntMap a -> [(Int, a)]
513+toDescList = coerce (M.toDescList :: M.IntMap a -> [(Int, a)])
514+{-# INLINE toDescList #-}
515+
516+fromAscList :: forall a. [(Int, a)] -> MonoidalIntMap a
517+fromAscList = coerce (M.fromAscList :: [(Int, a)] -> M.IntMap a)
518+{-# INLINE fromAscList #-}
519+
520+fromAscListWith :: forall a. (a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
521+fromAscListWith = coerce (M.fromAscListWith :: (a -> a -> a) -> [(Int, a)] -> M.IntMap a)
522+{-# INLINE fromAscListWith #-}
523+
524+fromAscListWithKey :: forall a. (Int -> a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
525+fromAscListWithKey = coerce (M.fromAscListWithKey :: (Int -> a -> a -> a) -> [(Int, a)] -> M.IntMap a)
526+{-# INLINE fromAscListWithKey #-}
527+
528+fromDistinctAscList :: forall a. [(Int, a)] -> MonoidalIntMap a
529+fromDistinctAscList = coerce (M.fromDistinctAscList :: [(Int, a)] -> M.IntMap a)
530+{-# INLINE fromDistinctAscList #-}
531+
532+fromDistinctList :: forall a. [(Int, a)] -> MonoidalIntMap a
533+fromDistinctList = coerce (M.fromList :: [(Int, a)] -> M.IntMap a)
534+{-# INLINE fromDistinctList #-}
535+
536+filter :: forall a. (a -> Bool) -> MonoidalIntMap a -> MonoidalIntMap a
537+filter = coerce (M.filter :: (a -> Bool) -> M.IntMap a -> M.IntMap a)
538+{-# INLINE filter #-}
539+
540+filterWithKey :: forall a. (Int -> a -> Bool) -> MonoidalIntMap a -> MonoidalIntMap a
541+filterWithKey = coerce (M.filterWithKey :: (Int -> a -> Bool) -> M.IntMap a -> M.IntMap a)
542+{-# INLINE filterWithKey #-}
543+
544+partition :: forall a. (a -> Bool) -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
545+partition = coerce (M.partition :: (a -> Bool) -> M.IntMap a -> (M.IntMap a, M.IntMap a))
546+{-# INLINE partition #-}
547+
548+partitionWithKey :: forall a. (Int -> a -> Bool) -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
549+partitionWithKey = coerce (M.partitionWithKey :: (Int -> a -> Bool) -> M.IntMap a -> (M.IntMap a, M.IntMap a))
550+{-# INLINE partitionWithKey #-}
551+
552+mapMaybe :: forall a b. (a -> Maybe b) -> MonoidalIntMap a -> MonoidalIntMap b
553+mapMaybe = coerce (M.mapMaybe :: (a -> Maybe b) -> M.IntMap a -> M.IntMap b)
554+{-# INLINE mapMaybe #-}
555+
556+mapMaybeWithKey :: forall a b. (Int -> a -> Maybe b) -> MonoidalIntMap a -> MonoidalIntMap b
557+mapMaybeWithKey = coerce (M.mapMaybeWithKey :: (Int -> a -> Maybe b) -> M.IntMap a -> M.IntMap b)
558+{-# INLINE mapMaybeWithKey #-}
559+
560+mapEither :: forall a b c. (a -> Either b c) -> MonoidalIntMap a -> (MonoidalIntMap b, MonoidalIntMap c)
561+mapEither = coerce (M.mapEither :: (a -> Either b c) -> M.IntMap a -> (M.IntMap b, M.IntMap c))
562+{-# INLINE mapEither #-}
563+
564+mapEitherWithKey :: forall a b c. (Int -> a -> Either b c) -> MonoidalIntMap a -> (MonoidalIntMap b, MonoidalIntMap c)
565+mapEitherWithKey = coerce (M.mapEitherWithKey :: (Int -> a -> Either b c) -> M.IntMap a -> (M.IntMap b, M.IntMap c))
566+{-# INLINE mapEitherWithKey #-}
567+
568+split :: forall a. Int -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
569+split = coerce (M.split :: Int -> M.IntMap a -> (M.IntMap a, M.IntMap a))
570+{-# INLINE split #-}
571+
572+splitLookup :: forall a. Int -> MonoidalIntMap a -> (MonoidalIntMap a, Maybe a, MonoidalIntMap a)
573+splitLookup = coerce (M.splitLookup :: Int -> M.IntMap a -> (M.IntMap a, Maybe a, M.IntMap a))
574+{-# INLINE splitLookup #-}
575+
576+splitRoot :: forall a. MonoidalIntMap a -> [MonoidalIntMap a]
577+splitRoot = coerce (M.splitRoot :: M.IntMap a -> [M.IntMap a])
578+{-# INLINE splitRoot #-}
579+
580+isSubmapOf :: forall a. Eq a => MonoidalIntMap a -> MonoidalIntMap a -> Bool
581+isSubmapOf = coerce (M.isSubmapOf :: M.IntMap a -> M.IntMap a -> Bool)
582+{-# INLINE isSubmapOf #-}
583+
584+isSubmapOfBy :: forall a b. (a -> b -> Bool) -> MonoidalIntMap a -> MonoidalIntMap b -> Bool
585+isSubmapOfBy = coerce (M.isSubmapOfBy :: (a -> b -> Bool) -> M.IntMap a -> M.IntMap b -> Bool)
586+{-# INLINE isSubmapOfBy #-}
587+
588+isProperSubmapOf :: forall a. Eq a => MonoidalIntMap a -> MonoidalIntMap a -> Bool
589+isProperSubmapOf = coerce (M.isProperSubmapOf :: M.IntMap a -> M.IntMap a -> Bool)
590+{-# INLINE isProperSubmapOf #-}
591+
592+isProperSubmapOfBy :: forall a b. (a -> b -> Bool) -> MonoidalIntMap a -> MonoidalIntMap b -> Bool
593+isProperSubmapOfBy = coerce (M.isProperSubmapOfBy :: (a -> b -> Bool) -> M.IntMap a -> M.IntMap b -> Bool)
594+{-# INLINE isProperSubmapOfBy #-}
595+
596+findMin :: forall a. MonoidalIntMap a -> (Int, a)
597+findMin = coerce (M.findMin :: M.IntMap a -> (Int, a))
598+{-# INLINE findMin #-}
599+
600+findMax :: forall a. MonoidalIntMap a -> (Int, a)
601+findMax = coerce (M.findMax :: M.IntMap a -> (Int, a))
602+{-# INLINE findMax #-}
603+
604+deleteMin :: forall a. MonoidalIntMap a -> MonoidalIntMap a
605+deleteMin = coerce (M.deleteMin :: M.IntMap a -> M.IntMap a)
606+{-# INLINE deleteMin #-}
607+
608+deleteMax :: forall a. MonoidalIntMap a -> MonoidalIntMap a
609+deleteMax = coerce (M.deleteMax :: M.IntMap a -> M.IntMap a)
610+{-# INLINE deleteMax #-}
611+
612+deleteFindMin :: forall a. MonoidalIntMap a -> ((Int, a), MonoidalIntMap a)
613+deleteFindMin = coerce (M.deleteFindMin :: M.IntMap a -> ((Int, a), M.IntMap a))
614+{-# INLINE deleteFindMin #-}
615+
616+deleteFindMax :: forall a. MonoidalIntMap a -> ((Int, a), MonoidalIntMap a)
617+deleteFindMax = coerce (M.deleteFindMax :: M.IntMap a -> ((Int, a), M.IntMap a))
618+{-# INLINE deleteFindMax #-}
619+
620+updateMin :: forall a. (a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
621+updateMin = coerce (M.updateMin :: (a -> Maybe a) -> M.IntMap a -> M.IntMap a)
622+{-# INLINE updateMin #-}
623+
624+updateMax :: forall a. (a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
625+updateMax = coerce (M.updateMax :: (a -> Maybe a) -> M.IntMap a -> M.IntMap a)
626+{-# INLINE updateMax #-}
627+
628+updateMinWithKey :: forall a. (Int -> a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
629+updateMinWithKey = coerce (M.updateMinWithKey :: (Int -> a -> Maybe a) -> M.IntMap a -> M.IntMap a)
630+{-# INLINE updateMinWithKey #-}
631+
632+updateMaxWithKey :: forall a. (Int -> a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
633+updateMaxWithKey = coerce (M.updateMaxWithKey :: (Int -> a -> Maybe a) -> M.IntMap a -> M.IntMap a)
634+{-# INLINE updateMaxWithKey #-}
635+
636+minView :: forall a. MonoidalIntMap a -> Maybe (a, MonoidalIntMap a)
637+minView = coerce (M.minView :: M.IntMap a -> Maybe (a, M.IntMap a))
638+{-# INLINE minView #-}
639+
640+maxView :: forall a. MonoidalIntMap a -> Maybe (a, MonoidalIntMap a)
641+maxView = coerce (M.maxView :: M.IntMap a -> Maybe (a, M.IntMap a))
642+{-# INLINE maxView #-}
643+
644+minViewWithKey :: forall a. MonoidalIntMap a -> Maybe ((Int, a), MonoidalIntMap a)
645+minViewWithKey = coerce (M.minViewWithKey :: M.IntMap a -> Maybe ((Int, a), M.IntMap a))
646+{-# INLINE minViewWithKey #-}
647+
648+maxViewWithKey :: forall a. MonoidalIntMap a -> Maybe ((Int, a), MonoidalIntMap a)
649+maxViewWithKey = coerce (M.maxViewWithKey :: M.IntMap a -> Maybe ((Int, a), M.IntMap a))
650+{-# INLINE maxViewWithKey #-}
651+
src/Data/IntMap/Monoidal/Strict.hsnew file+651
@@ -0,0 +1,651 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE MultiParamTypeClasses #-}
4+{-# LANGUAGE TypeFamilies #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE DeriveTraversable #-}
8+{-# LANGUAGE DeriveDataTypeable #-}
9+{-# LANGUAGE StandaloneDeriving #-}
10+
11+-- | This module provides a 'Data.IntMap' variant which uses the value's
12+-- 'Monoid' instance to accumulate conflicting entries when merging
13+-- 'Map's.
14+--
15+-- While some functions mirroring those of 'Data.IntMap' are provided
16+-- here for convenience, more specialized needs will likely want to use
17+-- either the 'Newtype' or 'Wrapped' instances to manipulate the
18+-- underlying 'Map'.
19+
20+module Data.IntMap.Monoidal.Strict
21+ ( MonoidalIntMap(..)
22+ -- * Often-needed functions
23+ , singleton
24+ , size
25+ , member
26+ , notMember
27+ , findWithDefault
28+ , assocs
29+ , elems
30+ , keys
31+ , (!)
32+ , (\\)
33+ , adjust
34+ , adjustWithKey
35+ , alter
36+ , delete
37+-- , deleteAt
38+ , deleteFindMax
39+ , deleteFindMin
40+ , deleteMax
41+ , deleteMin
42+ , difference
43+ , differenceWith
44+ , differenceWithKey
45+-- , elemAt
46+ , empty
47+ , filter
48+ , filterWithKey
49+-- , findIndex
50+ , findMax
51+ , findMin
52+ , foldMapWithKey
53+ , foldl
54+ , foldl'
55+ , foldlWithKey
56+ , foldlWithKey'
57+ , foldr
58+ , foldr'
59+ , foldrWithKey
60+ , foldrWithKey'
61+ , fromAscList
62+ , fromAscListWith
63+ , fromAscListWithKey
64+ , fromDistinctAscList
65+ , fromDistinctList
66+ , fromList
67+ , fromListWith
68+ , fromListWithKey
69+ , fromSet
70+ , insert
71+ , insertLookupWithKey
72+ , insertWith
73+ , insertWithKey
74+ , intersectionWith
75+ , intersectionWithKey
76+ , isProperSubmapOf
77+ , isProperSubmapOfBy
78+ , isSubmapOf
79+ , isSubmapOfBy
80+ , keysSet
81+ , lookup
82+ , lookupGE
83+ , lookupGT
84+-- , lookupIndex
85+ , lookupLE
86+ , lookupLT
87+ , map
88+ , mapAccum
89+ , mapAccumRWithKey
90+ , mapAccumWithKey
91+ , mapEither
92+ , mapEitherWithKey
93+ , mapKeys
94+ , mapKeysMonotonic
95+ , mapKeysWith
96+ , mapMaybe
97+ , mapMaybeWithKey
98+ , mapWithKey
99+ , maxView
100+ , maxViewWithKey
101+ , mergeWithKey
102+ , minView
103+ , minViewWithKey
104+ , null
105+ , partition
106+ , partitionWithKey
107+ , split
108+ , splitLookup
109+ , splitRoot
110+ , toAscList
111+ , toDescList
112+ , toList
113+ , traverseWithKey
114+ , unionWith
115+ , unionWithKey
116+ , unionsWith
117+ , update
118+-- , updateAt
119+ , updateLookupWithKey
120+ , updateMax
121+ , updateMaxWithKey
122+ , updateMin
123+ , updateMinWithKey
124+ , updateWithKey
125+-- , valid
126+ -- , showTree
127+ -- , showTreeWith
128+ ) where
129+
130+import Prelude hiding (null, lookup, map, foldl, foldr, filter)
131+
132+import Data.Coerce (coerce)
133+import Data.IntSet (IntSet)
134+import Data.Semigroup
135+import Data.Foldable (Foldable)
136+import Data.Traversable (Traversable)
137+import Control.Applicative (Applicative, pure)
138+import Data.Data (Data)
139+import Data.Typeable (Typeable)
140+
141+#if MIN_VERSION_base(4,7,0)
142+import qualified GHC.Exts as IsList
143+#endif
144+
145+import Control.DeepSeq
146+import qualified Data.IntMap.Strict as M
147+import Control.Lens
148+import Control.Newtype
149+import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)
150+#if MIN_VERSION_containers(0,5,9)
151+import Data.Functor.Classes
152+#endif
153+import Data.Align
154+#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
156+#if MIN_VERSION_semialign(1,1,0)
157+import Data.Zip (Zip)
158+#endif
159+#endif
160+
161+-- | An 'IntMap' with monoidal accumulation
162+newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
163+ deriving (Show, Read, Functor, Eq, Ord, NFData,
164+ Foldable, Traversable,
165+ FromJSON, ToJSON, FromJSON1, ToJSON1,
166+ Data, Typeable, Align
167+#if MIN_VERSION_these(0,8,0)
168+ , Semialign
169+#endif
170+#ifdef MIN_VERSION_semialign
171+ , Unalign
172+#if MIN_VERSION_semialign(1,1,0)
173+ , Zip
174+#endif
175+#endif
176+ )
177+
178+#if MIN_VERSION_containers(0,5,9)
179+deriving instance Eq1 MonoidalIntMap
180+deriving instance Ord1 MonoidalIntMap
181+deriving instance Show1 MonoidalIntMap
182+#endif
183+
184+type instance Index (MonoidalIntMap a) = Int
185+type instance IxValue (MonoidalIntMap a) = a
186+instance Ixed (MonoidalIntMap a) where
187+ ix k f (MonoidalIntMap m) = case M.lookup k m of
188+ Just v -> f v <&> \v' -> MonoidalIntMap (M.insert k v' m)
189+ Nothing -> pure (MonoidalIntMap m)
190+ {-# INLINE ix #-}
191+
192+instance At (MonoidalIntMap a) where
193+ at k f (MonoidalIntMap m) = f mv <&> \r -> case r of
194+ Nothing -> maybe (MonoidalIntMap m) (const (MonoidalIntMap $ M.delete k m)) mv
195+ Just v' -> MonoidalIntMap $ M.insert k v' m
196+ where mv = M.lookup k m
197+ {-# INLINE at #-}
198+
199+instance Each (MonoidalIntMap a) (MonoidalIntMap b) a b
200+
201+instance FunctorWithIndex Int MonoidalIntMap
202+instance FoldableWithIndex Int MonoidalIntMap
203+instance TraversableWithIndex Int MonoidalIntMap where
204+ itraverse f (MonoidalIntMap m) = fmap MonoidalIntMap $ itraverse f m
205+ {-# INLINE itraverse #-}
206+
207+instance TraverseMin Int MonoidalIntMap where
208+ traverseMin f (MonoidalIntMap m) = fmap MonoidalIntMap $ traverseMin f m
209+ {-# INLINE traverseMin #-}
210+instance TraverseMax Int MonoidalIntMap where
211+ traverseMax f (MonoidalIntMap m) = fmap MonoidalIntMap $ traverseMax f m
212+ {-# INLINE traverseMax #-}
213+
214+instance AsEmpty (MonoidalIntMap a) where
215+ _Empty = nearly (MonoidalIntMap M.empty) (M.null . unpack)
216+ {-# INLINE _Empty #-}
217+
218+instance Wrapped (MonoidalIntMap a) where
219+ type Unwrapped (MonoidalIntMap a) = M.IntMap a
220+ _Wrapped' = iso unpack pack
221+ {-# INLINE _Wrapped' #-}
222+
223+instance Semigroup a => Semigroup (MonoidalIntMap a) where
224+ MonoidalIntMap a <> MonoidalIntMap b = MonoidalIntMap $ M.unionWith (<>) a b
225+ {-# INLINE (<>) #-}
226+
227+instance Semigroup a => Monoid (MonoidalIntMap a) where
228+ mempty = MonoidalIntMap mempty
229+ {-# INLINE mempty #-}
230+#if !(MIN_VERSION_base(4,11,0))
231+ mappend (MonoidalIntMap a) (MonoidalIntMap b) = MonoidalIntMap $ M.unionWith (<>) a b
232+ {-# INLINE mappend #-}
233+#endif
234+
235+instance Newtype (MonoidalIntMap a) (M.IntMap a) where
236+ pack = MonoidalIntMap
237+ {-# INLINE pack #-}
238+ unpack (MonoidalIntMap a) = a
239+ {-# INLINE unpack #-}
240+
241+#if MIN_VERSION_base(4,7,0)
242+instance Semigroup a => IsList.IsList (MonoidalIntMap a) where
243+ type Item (MonoidalIntMap a) = (Int, a)
244+ fromList = MonoidalIntMap . M.fromListWith (<>)
245+ {-# INLINE fromList #-}
246+ toList = M.toList . unpack
247+ {-# INLINE toList #-}
248+#endif
249+
250+-- | /O(1)/. A map with a single element.
251+singleton :: Int -> a -> MonoidalIntMap a
252+singleton k a = MonoidalIntMap $ M.singleton k a
253+{-# INLINE singleton #-}
254+
255+-- | /O(1)/. The number of elements in the map.
256+size :: MonoidalIntMap a -> Int
257+size = M.size . unpack
258+{-# INLINE size #-}
259+
260+-- | /O(log n)/. Is the key a member of the map? See also 'notMember'.
261+member :: Int -> MonoidalIntMap a -> Bool
262+member k = M.member k . unpack
263+{-# INLINE member #-}
264+
265+-- | /O(log n)/. Is the key not a member of the map? See also 'member'.
266+notMember :: Int -> MonoidalIntMap a -> Bool
267+notMember k = not . M.member k . unpack
268+{-# INLINE notMember #-}
269+
270+-- | /O(log n)/. The expression @('findWithDefault' def k map)@ returns
271+-- the value at key @k@ or returns default value @def@
272+-- when the key is not in the map.
273+findWithDefault :: forall a. a -> Int -> MonoidalIntMap a -> a
274+findWithDefault def k = M.findWithDefault def k . unpack
275+{-# INLINE findWithDefault #-}
276+
277+-- | /O(log n)/. Delete a key and its value from the map. When the key is not
278+-- a member of the map, the original map is returned.
279+delete :: Int -> MonoidalIntMap a -> MonoidalIntMap a
280+delete k = _Wrapping' MonoidalIntMap %~ M.delete k
281+{-# INLINE delete #-}
282+
283+-- | /O(n)/. Return all elements of the map and their keys
284+assocs :: MonoidalIntMap a -> [(Int,a)]
285+assocs = M.assocs . unpack
286+{-# INLINE assocs #-}
287+
288+-- | /O(n)/. Return all elements of the map in the ascending order of their
289+-- keys. Subject to list fusion.
290+elems :: MonoidalIntMap a -> [a]
291+elems = M.elems . unpack
292+{-# INLINE elems #-}
293+
294+-- | /O(n)/. Return all keys of the map in ascending order. Subject to list
295+-- fusion.
296+keys :: MonoidalIntMap a -> [Int]
297+keys = M.keys . unpack
298+{-# INLINE keys #-}
299+
300+(!) :: forall a. MonoidalIntMap a -> Int -> a
301+(!) = coerce ((M.!) :: M.IntMap a -> Int -> a)
302+infixl 9 !
303+
304+(\\) :: forall a b. MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
305+(\\) = coerce ((M.\\) :: M.IntMap a -> M.IntMap b -> M.IntMap a)
306+infixl 9 \\ --
307+
308+null :: forall a. MonoidalIntMap a -> Bool
309+null = coerce (M.null :: M.IntMap a -> Bool)
310+{-# INLINE null #-}
311+
312+lookup :: forall a. Int -> MonoidalIntMap a -> Maybe a
313+lookup = coerce (M.lookup :: Int -> M.IntMap a -> Maybe a)
314+{-# INLINE lookup #-}
315+
316+lookupLT :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
317+lookupLT = coerce (M.lookupLT :: Int -> M.IntMap a -> Maybe (Int,a))
318+{-# INLINE lookupLT #-}
319+
320+lookupGT :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
321+lookupGT = coerce (M.lookupGT :: Int -> M.IntMap a -> Maybe (Int,a))
322+{-# INLINE lookupGT #-}
323+
324+lookupLE :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
325+lookupLE = coerce (M.lookupLE :: Int -> M.IntMap a -> Maybe (Int,a))
326+{-# INLINE lookupLE #-}
327+
328+lookupGE :: forall a. Int -> MonoidalIntMap a -> Maybe (Int, a)
329+lookupGE = coerce (M.lookupGE :: Int -> M.IntMap a -> Maybe (Int,a))
330+{-# INLINE lookupGE #-}
331+
332+empty :: forall a. MonoidalIntMap a
333+empty = coerce (M.empty :: M.IntMap a)
334+{-# INLINE empty #-}
335+
336+insert :: forall a. Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
337+insert = coerce (M.insert :: Int -> a -> M.IntMap a -> M.IntMap a)
338+{-# INLINE insert #-}
339+
340+insertWith :: forall a. (a -> a -> a) -> Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
341+insertWith = coerce (M.insertWith :: (a -> a -> a) -> Int -> a -> M.IntMap a -> M.IntMap a)
342+{-# INLINE insertWith #-}
343+
344+insertWithKey :: forall a. (Int -> a -> a -> a) -> Int -> a -> MonoidalIntMap a -> MonoidalIntMap a
345+insertWithKey = coerce (M.insertWithKey :: (Int -> a -> a -> a) -> Int -> a -> M.IntMap a -> M.IntMap a)
346+{-# INLINE insertWithKey #-}
347+
348+insertLookupWithKey :: forall a. (Int -> a -> a -> a) -> Int -> a -> MonoidalIntMap a -> (Maybe a, MonoidalIntMap a)
349+insertLookupWithKey = coerce (M.insertLookupWithKey :: (Int -> a -> a -> a) -> Int -> a -> M.IntMap a -> (Maybe a, M.IntMap a))
350+{-# INLINE insertLookupWithKey #-}
351+
352+adjust :: forall a. (a -> a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
353+adjust = coerce (M.adjust :: (a -> a) -> Int -> M.IntMap a -> M.IntMap a)
354+{-# INLINE adjust #-}
355+
356+adjustWithKey :: forall a. (Int -> a -> a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
357+adjustWithKey = coerce (M.adjustWithKey :: (Int -> a -> a) -> Int -> M.IntMap a -> M.IntMap a)
358+{-# INLINE adjustWithKey #-}
359+
360+update :: forall a. (a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
361+update = coerce (M.update :: (a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
362+{-# INLINE update #-}
363+
364+updateWithKey :: forall a. (Int -> a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
365+updateWithKey = coerce (M.updateWithKey :: (Int -> a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
366+{-# INLINE updateWithKey #-}
367+
368+updateLookupWithKey :: forall a. (Int -> a -> Maybe a) -> Int -> MonoidalIntMap a -> (Maybe a, MonoidalIntMap a)
369+updateLookupWithKey = coerce (M.updateLookupWithKey :: (Int -> a -> Maybe a) -> Int -> M.IntMap a -> (Maybe a, M.IntMap a))
370+{-# INLINE updateLookupWithKey #-}
371+
372+alter :: forall a. (Maybe a -> Maybe a) -> Int -> MonoidalIntMap a -> MonoidalIntMap a
373+alter = coerce (M.alter :: (Maybe a -> Maybe a) -> Int -> M.IntMap a -> M.IntMap a)
374+{-# INLINE alter #-}
375+
376+unionWith :: forall a. (a -> a -> a) -> MonoidalIntMap a -> MonoidalIntMap a -> MonoidalIntMap a
377+unionWith = coerce (M.unionWith :: (a -> a -> a) -> M.IntMap a -> M.IntMap a -> M.IntMap a)
378+{-# INLINE unionWith #-}
379+
380+unionWithKey :: forall a. (Int -> a -> a -> a) -> MonoidalIntMap a -> MonoidalIntMap a -> MonoidalIntMap a
381+unionWithKey = coerce (M.unionWithKey :: (Int -> a -> a -> a) -> M.IntMap a -> M.IntMap a -> M.IntMap a)
382+{-# INLINE unionWithKey #-}
383+
384+unionsWith :: forall a. (a -> a -> a) -> [MonoidalIntMap a] -> MonoidalIntMap a
385+unionsWith = coerce (M.unionsWith :: (a -> a -> a) -> [M.IntMap a] -> M.IntMap a)
386+{-# INLINE unionsWith #-}
387+
388+difference :: forall a b. MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
389+difference = (\\)
390+{-# INLINE difference #-}
391+
392+differenceWith :: forall a b. (a -> b -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
393+differenceWith = coerce (M.differenceWith :: (a -> b -> Maybe a) -> M.IntMap a -> M.IntMap b -> M.IntMap a)
394+{-# INLINE differenceWith #-}
395+
396+differenceWithKey :: forall a b. (Int -> a -> b -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap a
397+differenceWithKey = coerce (M.differenceWithKey :: (Int -> a -> b -> Maybe a) -> M.IntMap a -> M.IntMap b -> M.IntMap a)
398+{-# INLINE differenceWithKey #-}
399+
400+intersectionWith :: forall a b c. (a -> b -> c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
401+intersectionWith = coerce (M.intersectionWith :: (a -> b -> c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
402+{-# INLINE intersectionWith #-}
403+
404+intersectionWithKey :: forall a b c. (Int -> a -> b -> c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
405+intersectionWithKey = coerce (M.intersectionWithKey :: (Int -> a -> b -> c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
406+{-# INLINE intersectionWithKey #-}
407+
408+mergeWithKey :: forall a b c. (Int -> a -> b -> Maybe c) -> (MonoidalIntMap a -> MonoidalIntMap c) -> (MonoidalIntMap b -> MonoidalIntMap c) -> MonoidalIntMap a -> MonoidalIntMap b -> MonoidalIntMap c
409+mergeWithKey = coerce (M.mergeWithKey :: (Int -> a -> b -> Maybe c) -> (M.IntMap a -> M.IntMap c) -> (M.IntMap b -> M.IntMap c) -> M.IntMap a -> M.IntMap b -> M.IntMap c)
410+{-# INLINE mergeWithKey #-}
411+
412+map :: (a -> b) -> MonoidalIntMap a -> MonoidalIntMap b
413+map = fmap
414+{-# INLINE map #-}
415+
416+mapWithKey :: forall a b. (Int -> a -> b) -> MonoidalIntMap a -> MonoidalIntMap b
417+mapWithKey = coerce (M.mapWithKey :: (Int -> a -> b) -> M.IntMap a -> M.IntMap b)
418+{-# INLINE mapWithKey #-}
419+
420+traverseWithKey :: Applicative t => (Int -> a -> t b) -> MonoidalIntMap a -> t (MonoidalIntMap b)
421+traverseWithKey = itraverse
422+{-# INLINE traverseWithKey #-}
423+
424+mapAccum :: forall a b c. (a -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
425+mapAccum = coerce (M.mapAccum :: (a -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
426+{-# INLINE mapAccum #-}
427+
428+mapAccumWithKey :: forall a b c. (a -> Int -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
429+mapAccumWithKey = coerce (M.mapAccumWithKey :: (a -> Int -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
430+{-# INLINE mapAccumWithKey #-}
431+
432+mapAccumRWithKey :: forall a b c. (a -> Int -> b -> (a, c)) -> a -> MonoidalIntMap b -> (a, MonoidalIntMap c)
433+mapAccumRWithKey = coerce (M.mapAccumRWithKey :: (a -> Int -> b -> (a, c)) -> a -> M.IntMap b -> (a, M.IntMap c))
434+{-# INLINE mapAccumRWithKey #-}
435+
436+mapKeys :: forall a. (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
437+mapKeys = coerce (M.mapKeys :: (Int -> Int) -> M.IntMap a -> M.IntMap a)
438+{-# INLINE mapKeys #-}
439+
440+mapKeysWith :: forall a. (a -> a -> a) -> (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
441+mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (Int -> Int) -> M.IntMap a -> M.IntMap a)
442+{-# INLINE mapKeysWith #-}
443+
444+mapKeysMonotonic :: forall a. (Int -> Int) -> MonoidalIntMap a -> MonoidalIntMap a
445+mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (Int -> Int) -> M.IntMap a -> M.IntMap a)
446+{-# INLINE mapKeysMonotonic #-}
447+
448+foldr :: forall a b. (a -> b -> b) -> b -> MonoidalIntMap a -> b
449+foldr = coerce (M.foldr :: (a -> b -> b) -> b -> M.IntMap a -> b)
450+{-# INLINE foldr #-}
451+
452+foldl :: forall a b. (a -> b -> a) -> a -> MonoidalIntMap b -> a
453+foldl = coerce (M.foldl :: (a -> b -> a) -> a -> M.IntMap b -> a)
454+{-# INLINE foldl #-}
455+
456+foldrWithKey :: forall a b. (Int -> a -> b -> b) -> b -> MonoidalIntMap a -> b
457+foldrWithKey = coerce (M.foldrWithKey :: (Int -> a -> b -> b) -> b -> M.IntMap a -> b)
458+{-# INLINE foldrWithKey #-}
459+
460+foldlWithKey :: forall a b. (a -> Int -> b -> a) -> a -> MonoidalIntMap b -> a
461+foldlWithKey = coerce (M.foldlWithKey :: (a -> Int -> b -> a) -> a -> M.IntMap b -> a)
462+{-# INLINE foldlWithKey #-}
463+
464+foldMapWithKey :: forall a m. Monoid m => (Int -> a -> m) -> MonoidalIntMap a -> m
465+foldMapWithKey = coerce (M.foldMapWithKey :: Monoid m => (Int -> a -> m) -> M.IntMap a -> m)
466+{-# INLINE foldMapWithKey #-}
467+
468+foldr' :: forall a b. (a -> b -> b) -> b -> MonoidalIntMap a -> b
469+foldr' = coerce (M.foldr' :: (a -> b -> b) -> b -> M.IntMap a -> b)
470+{-# INLINE foldr' #-}
471+
472+foldl' :: forall a b. (a -> b -> a) -> a -> MonoidalIntMap b -> a
473+foldl' = coerce (M.foldl' :: (a -> b -> a) -> a -> M.IntMap b -> a)
474+{-# INLINE foldl' #-}
475+
476+foldrWithKey' :: forall a b. (Int -> a -> b -> b) -> b -> MonoidalIntMap a -> b
477+foldrWithKey' = coerce (M.foldrWithKey' :: (Int -> a -> b -> b) -> b -> M.IntMap a -> b)
478+{-# INLINE foldrWithKey' #-}
479+
480+foldlWithKey' :: forall a b. (a -> Int -> b -> a) -> a -> MonoidalIntMap b -> a
481+foldlWithKey' = coerce (M.foldlWithKey' :: (a -> Int -> b -> a) -> a -> M.IntMap b -> a)
482+{-# INLINE foldlWithKey' #-}
483+
484+keysSet :: forall a. MonoidalIntMap a -> IntSet
485+keysSet = coerce (M.keysSet :: M.IntMap a -> IntSet)
486+{-# INLINE keysSet #-}
487+
488+fromSet :: forall a. (Int -> a) -> IntSet -> MonoidalIntMap a
489+fromSet = coerce (M.fromSet :: (Int -> a) -> IntSet -> M.IntMap a)
490+{-# INLINE fromSet #-}
491+
492+toList :: forall a. MonoidalIntMap a -> [(Int, a)]
493+toList = coerce (M.toList :: M.IntMap a -> [(Int, a)])
494+{-# INLINE toList #-}
495+
496+fromList :: forall a. [(Int, a)] -> MonoidalIntMap a
497+fromList = coerce (M.fromList :: [(Int, a)] -> M.IntMap a)
498+{-# INLINE fromList #-}
499+
500+fromListWith :: forall a. (a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
501+fromListWith = coerce (M.fromListWith :: (a -> a -> a) -> [(Int, a)] -> M.IntMap a)
502+{-# INLINE fromListWith #-}
503+
504+fromListWithKey :: forall a. (Int -> a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
505+fromListWithKey = coerce (M.fromListWithKey :: (Int -> a -> a -> a) -> [(Int, a)] -> M.IntMap a)
506+{-# INLINE fromListWithKey #-}
507+
508+toAscList :: forall a. MonoidalIntMap a -> [(Int, a)]
509+toAscList = coerce (M.toAscList :: M.IntMap a -> [(Int, a)])
510+{-# INLINE toAscList #-}
511+
512+toDescList :: forall a. MonoidalIntMap a -> [(Int, a)]
513+toDescList = coerce (M.toDescList :: M.IntMap a -> [(Int, a)])
514+{-# INLINE toDescList #-}
515+
516+fromAscList :: forall a. [(Int, a)] -> MonoidalIntMap a
517+fromAscList = coerce (M.fromAscList :: [(Int, a)] -> M.IntMap a)
518+{-# INLINE fromAscList #-}
519+
520+fromAscListWith :: forall a. (a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
521+fromAscListWith = coerce (M.fromAscListWith :: (a -> a -> a) -> [(Int, a)] -> M.IntMap a)
522+{-# INLINE fromAscListWith #-}
523+
524+fromAscListWithKey :: forall a. (Int -> a -> a -> a) -> [(Int, a)] -> MonoidalIntMap a
525+fromAscListWithKey = coerce (M.fromAscListWithKey :: (Int -> a -> a -> a) -> [(Int, a)] -> M.IntMap a)
526+{-# INLINE fromAscListWithKey #-}
527+
528+fromDistinctAscList :: forall a. [(Int, a)] -> MonoidalIntMap a
529+fromDistinctAscList = coerce (M.fromDistinctAscList :: [(Int, a)] -> M.IntMap a)
530+{-# INLINE fromDistinctAscList #-}
531+
532+fromDistinctList :: forall a. [(Int, a)] -> MonoidalIntMap a
533+fromDistinctList = coerce (M.fromList :: [(Int, a)] -> M.IntMap a)
534+{-# INLINE fromDistinctList #-}
535+
536+filter :: forall a. (a -> Bool) -> MonoidalIntMap a -> MonoidalIntMap a
537+filter = coerce (M.filter :: (a -> Bool) -> M.IntMap a -> M.IntMap a)
538+{-# INLINE filter #-}
539+
540+filterWithKey :: forall a. (Int -> a -> Bool) -> MonoidalIntMap a -> MonoidalIntMap a
541+filterWithKey = coerce (M.filterWithKey :: (Int -> a -> Bool) -> M.IntMap a -> M.IntMap a)
542+{-# INLINE filterWithKey #-}
543+
544+partition :: forall a. (a -> Bool) -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
545+partition = coerce (M.partition :: (a -> Bool) -> M.IntMap a -> (M.IntMap a, M.IntMap a))
546+{-# INLINE partition #-}
547+
548+partitionWithKey :: forall a. (Int -> a -> Bool) -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
549+partitionWithKey = coerce (M.partitionWithKey :: (Int -> a -> Bool) -> M.IntMap a -> (M.IntMap a, M.IntMap a))
550+{-# INLINE partitionWithKey #-}
551+
552+mapMaybe :: forall a b. (a -> Maybe b) -> MonoidalIntMap a -> MonoidalIntMap b
553+mapMaybe = coerce (M.mapMaybe :: (a -> Maybe b) -> M.IntMap a -> M.IntMap b)
554+{-# INLINE mapMaybe #-}
555+
556+mapMaybeWithKey :: forall a b. (Int -> a -> Maybe b) -> MonoidalIntMap a -> MonoidalIntMap b
557+mapMaybeWithKey = coerce (M.mapMaybeWithKey :: (Int -> a -> Maybe b) -> M.IntMap a -> M.IntMap b)
558+{-# INLINE mapMaybeWithKey #-}
559+
560+mapEither :: forall a b c. (a -> Either b c) -> MonoidalIntMap a -> (MonoidalIntMap b, MonoidalIntMap c)
561+mapEither = coerce (M.mapEither :: (a -> Either b c) -> M.IntMap a -> (M.IntMap b, M.IntMap c))
562+{-# INLINE mapEither #-}
563+
564+mapEitherWithKey :: forall a b c. (Int -> a -> Either b c) -> MonoidalIntMap a -> (MonoidalIntMap b, MonoidalIntMap c)
565+mapEitherWithKey = coerce (M.mapEitherWithKey :: (Int -> a -> Either b c) -> M.IntMap a -> (M.IntMap b, M.IntMap c))
566+{-# INLINE mapEitherWithKey #-}
567+
568+split :: forall a. Int -> MonoidalIntMap a -> (MonoidalIntMap a, MonoidalIntMap a)
569+split = coerce (M.split :: Int -> M.IntMap a -> (M.IntMap a, M.IntMap a))
570+{-# INLINE split #-}
571+
572+splitLookup :: forall a. Int -> MonoidalIntMap a -> (MonoidalIntMap a, Maybe a, MonoidalIntMap a)
573+splitLookup = coerce (M.splitLookup :: Int -> M.IntMap a -> (M.IntMap a, Maybe a, M.IntMap a))
574+{-# INLINE splitLookup #-}
575+
576+splitRoot :: forall a. MonoidalIntMap a -> [MonoidalIntMap a]
577+splitRoot = coerce (M.splitRoot :: M.IntMap a -> [M.IntMap a])
578+{-# INLINE splitRoot #-}
579+
580+isSubmapOf :: forall a. Eq a => MonoidalIntMap a -> MonoidalIntMap a -> Bool
581+isSubmapOf = coerce (M.isSubmapOf :: M.IntMap a -> M.IntMap a -> Bool)
582+{-# INLINE isSubmapOf #-}
583+
584+isSubmapOfBy :: forall a b. (a -> b -> Bool) -> MonoidalIntMap a -> MonoidalIntMap b -> Bool
585+isSubmapOfBy = coerce (M.isSubmapOfBy :: (a -> b -> Bool) -> M.IntMap a -> M.IntMap b -> Bool)
586+{-# INLINE isSubmapOfBy #-}
587+
588+isProperSubmapOf :: forall a. Eq a => MonoidalIntMap a -> MonoidalIntMap a -> Bool
589+isProperSubmapOf = coerce (M.isProperSubmapOf :: M.IntMap a -> M.IntMap a -> Bool)
590+{-# INLINE isProperSubmapOf #-}
591+
592+isProperSubmapOfBy :: forall a b. (a -> b -> Bool) -> MonoidalIntMap a -> MonoidalIntMap b -> Bool
593+isProperSubmapOfBy = coerce (M.isProperSubmapOfBy :: (a -> b -> Bool) -> M.IntMap a -> M.IntMap b -> Bool)
594+{-# INLINE isProperSubmapOfBy #-}
595+
596+findMin :: forall a. MonoidalIntMap a -> (Int, a)
597+findMin = coerce (M.findMin :: M.IntMap a -> (Int, a))
598+{-# INLINE findMin #-}
599+
600+findMax :: forall a. MonoidalIntMap a -> (Int, a)
601+findMax = coerce (M.findMax :: M.IntMap a -> (Int, a))
602+{-# INLINE findMax #-}
603+
604+deleteMin :: forall a. MonoidalIntMap a -> MonoidalIntMap a
605+deleteMin = coerce (M.deleteMin :: M.IntMap a -> M.IntMap a)
606+{-# INLINE deleteMin #-}
607+
608+deleteMax :: forall a. MonoidalIntMap a -> MonoidalIntMap a
609+deleteMax = coerce (M.deleteMax :: M.IntMap a -> M.IntMap a)
610+{-# INLINE deleteMax #-}
611+
612+deleteFindMin :: forall a. MonoidalIntMap a -> ((Int, a), MonoidalIntMap a)
613+deleteFindMin = coerce (M.deleteFindMin :: M.IntMap a -> ((Int, a), M.IntMap a))
614+{-# INLINE deleteFindMin #-}
615+
616+deleteFindMax :: forall a. MonoidalIntMap a -> ((Int, a), MonoidalIntMap a)
617+deleteFindMax = coerce (M.deleteFindMax :: M.IntMap a -> ((Int, a), M.IntMap a))
618+{-# INLINE deleteFindMax #-}
619+
620+updateMin :: forall a. (a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
621+updateMin = coerce (M.updateMin :: (a -> Maybe a) -> M.IntMap a -> M.IntMap a)
622+{-# INLINE updateMin #-}
623+
624+updateMax :: forall a. (a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
625+updateMax = coerce (M.updateMax :: (a -> Maybe a) -> M.IntMap a -> M.IntMap a)
626+{-# INLINE updateMax #-}
627+
628+updateMinWithKey :: forall a. (Int -> a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
629+updateMinWithKey = coerce (M.updateMinWithKey :: (Int -> a -> Maybe a) -> M.IntMap a -> M.IntMap a)
630+{-# INLINE updateMinWithKey #-}
631+
632+updateMaxWithKey :: forall a. (Int -> a -> Maybe a) -> MonoidalIntMap a -> MonoidalIntMap a
633+updateMaxWithKey = coerce (M.updateMaxWithKey :: (Int -> a -> Maybe a) -> M.IntMap a -> M.IntMap a)
634+{-# INLINE updateMaxWithKey #-}
635+
636+minView :: forall a. MonoidalIntMap a -> Maybe (a, MonoidalIntMap a)
637+minView = coerce (M.minView :: M.IntMap a -> Maybe (a, M.IntMap a))
638+{-# INLINE minView #-}
639+
640+maxView :: forall a. MonoidalIntMap a -> Maybe (a, MonoidalIntMap a)
641+maxView = coerce (M.maxView :: M.IntMap a -> Maybe (a, M.IntMap a))
642+{-# INLINE maxView #-}
643+
644+minViewWithKey :: forall a. MonoidalIntMap a -> Maybe ((Int, a), MonoidalIntMap a)
645+minViewWithKey = coerce (M.minViewWithKey :: M.IntMap a -> Maybe ((Int, a), M.IntMap a))
646+{-# INLINE minViewWithKey #-}
647+
648+maxViewWithKey :: forall a. MonoidalIntMap a -> Maybe ((Int, a), MonoidalIntMap a)
649+maxViewWithKey = coerce (M.maxViewWithKey :: M.IntMap a -> Maybe ((Int, a), M.IntMap a))
650+{-# INLINE maxViewWithKey #-}
651+
src/Data/Map/Monoidal.hs+34−4
@@ -151,6 +151,12 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)
151import Data.Functor.Classes
151import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154+#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
156+#if MIN_VERSION_semialign(1,1,0)
157+import Data.Zip (Zip)
158+#endif
159+#endif
154
160
155-- | A 'Map' with monoidal accumulation
161-- | A 'Map' with monoidal accumulation
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
162newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
@@ -160,6 +166,12 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
160 , Data, Typeable, Align
166 , Data, Typeable, Align
161#if MIN_VERSION_these(0,8,0)
167#if MIN_VERSION_these(0,8,0)
162 , Semialign
168 , Semialign
169+#endif
170+#ifdef MIN_VERSION_semialign
171+ , Unalign
172+#if MIN_VERSION_semialign(1,1,0)
173+ , Zip
174+#endif
163#endif
175#endif
164 )
176 )
165
177
@@ -431,6 +443,24 @@ mapKeysWith :: forall k1 k2 a. Ord k2 => (a -> a -> a) -> (k1 -> k2) -> Monoidal
431mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
443mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
432{-# INLINE mapKeysWith #-}
444{-# INLINE mapKeysWith #-}
433
445
446+-- | /O(n)/.
447+-- @'mapKeysMonotonic' f s == 'mapKeys' f s@, but works only when @f@
448+-- is strictly increasing (both monotonic and injective).
449+-- That is, for any values @x@ and @y@, if @x@ < @y@ then @f x@ < @f y@
450+-- and @f@ is injective (i.e. it never maps two input keys to the same output key).
451+-- /The precondition is not checked./
452+-- Semi-formally, we have:
453+--
454+-- > and [x < y ==> f x < f y | x <- ls, y <- ls]
455+-- > ==> mapKeysMonotonic f s == mapKeys f s
456+-- > where ls = keys s
457+--
458+-- This means that @f@ maps distinct original keys to distinct resulting keys.
459+-- This function has better performance than 'mapKeys'.
460+--
461+-- > mapKeysMonotonic (\ k -> k * 2) (fromList [(5,"a"), (3,"b")]) == fromList [(6, "b"), (10, "a")]
462+-- > valid (mapKeysMonotonic (\ k -> k * 2) (fromList [(5,"a"), (3,"b")])) == True
463+-- > valid (mapKeysMonotonic (\ _ -> 1) (fromList [(5,"a"), (3,"b")])) == False
434mapKeysMonotonic :: forall k1 k2 a. (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
464mapKeysMonotonic :: forall k1 k2 a. (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
435mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
465mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
436{-# INLINE mapKeysMonotonic #-}
466{-# INLINE mapKeysMonotonic #-}
@@ -483,8 +513,8 @@ toList :: forall k a. MonoidalMap k a -> [(k, a)]
483toList = coerce (M.toList :: M.Map k a -> [(k, a)])
513toList = coerce (M.toList :: M.Map k a -> [(k, a)])
484{-# INLINE toList #-}
514{-# INLINE toList #-}
485
515
486−fromList :: forall k a. (Ord k, Semigroup a) => [(k, a)] -> MonoidalMap k a
516+fromList :: forall k a. Ord k => [(k, a)] -> MonoidalMap k a
487−fromList = fromListWith (<>)
517+fromList = coerce (M.fromList :: [(k, a)] -> M.Map k a)
488{-# INLINE fromList #-}
518{-# INLINE fromList #-}
489
519
490fromListWith :: forall k a. Ord k => (a -> a -> a) -> [(k, a)] -> MonoidalMap k a
520fromListWith :: forall k a. Ord k => (a -> a -> a) -> [(k, a)] -> MonoidalMap k a
@@ -503,8 +533,8 @@ toDescList :: forall k a. MonoidalMap k a -> [(k, a)]
503toDescList = coerce (M.toDescList :: M.Map k a -> [(k, a)])
533toDescList = coerce (M.toDescList :: M.Map k a -> [(k, a)])
504{-# INLINE toDescList #-}
534{-# INLINE toDescList #-}
505
535
506−fromAscList :: forall k a. (Eq k, Semigroup a) => [(k, a)] -> MonoidalMap k a
536+fromAscList :: forall k a. Eq k => [(k, a)] -> MonoidalMap k a
507−fromAscList = fromAscListWith (<>)
537+fromAscList = coerce (M.fromAscList :: [(k, a)] -> M.Map k a)
508{-# INLINE fromAscList #-}
538{-# INLINE fromAscList #-}
509
539
510fromAscListWith :: forall k a. Eq k => (a -> a -> a) -> [(k, a)] -> MonoidalMap k a
540fromAscListWith :: forall k a. Eq k => (a -> a -> a) -> [(k, a)] -> MonoidalMap k a
src/Data/Map/Monoidal/Strict.hs+32−4
@@ -151,6 +151,12 @@ import Data.Aeson(FromJSON, ToJSON, FromJSON1, ToJSON1)
151import Data.Functor.Classes
151import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154+#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
156+#if MIN_VERSION_semialign(1,1,0)
157+import Data.Zip (Zip)
158+#endif
159+#endif
154
160
155-- | A 'Map' with monoidal accumulation
161-- | A 'Map' with monoidal accumulation
156newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
162newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
@@ -160,6 +166,12 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
160 , Data, Typeable, Align
166 , Data, Typeable, Align
161#if MIN_VERSION_these(0,8,0)
167#if MIN_VERSION_these(0,8,0)
162 , Semialign
168 , Semialign
169+#endif
170+#ifdef MIN_VERSION_semialign
171+ , Unalign
172+#if MIN_VERSION_semialign(1,1,0)
173+ , Zip
174+#endif
163#endif
175#endif
164 )
176 )
165
177
@@ -422,14 +434,32 @@ mapAccumRWithKey :: forall k a b c. (a -> k -> b -> (a, c)) -> a -> MonoidalMap
422mapAccumRWithKey = coerce (M.mapAccumRWithKey :: (a -> k -> b -> (a, c)) -> a -> M.Map k b -> (a, M.Map k c))
434mapAccumRWithKey = coerce (M.mapAccumRWithKey :: (a -> k -> b -> (a, c)) -> a -> M.Map k b -> (a, M.Map k c))
423{-# INLINE mapAccumRWithKey #-}
435{-# INLINE mapAccumRWithKey #-}
424
436
425−mapKeys :: forall k1 k2 a. Ord k2 => (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
437+mapKeys :: forall k1 k2 a. (Ord k2, Semigroup a) => (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
426−mapKeys = coerce (M.mapKeys :: (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
438+mapKeys = mapKeysWith (<>)
427{-# INLINE mapKeys #-}
439{-# INLINE mapKeys #-}
428
440
429mapKeysWith :: forall k1 k2 a. Ord k2 => (a -> a -> a) -> (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
441mapKeysWith :: forall k1 k2 a. Ord k2 => (a -> a -> a) -> (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
430mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
442mapKeysWith = coerce (M.mapKeysWith :: (a -> a -> a) -> (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
431{-# INLINE mapKeysWith #-}
443{-# INLINE mapKeysWith #-}
432
444
445+-- | /O(n)/.
446+-- @'mapKeysMonotonic' f s == 'mapKeys' f s@, but works only when @f@
447+-- is strictly increasing (both monotonic and injective).
448+-- That is, for any values @x@ and @y@, if @x@ < @y@ then @f x@ < @f y@
449+-- and @f@ is injective (i.e. it never maps two input keys to the same output key).
450+-- /The precondition is not checked./
451+-- Semi-formally, we have:
452+--
453+-- > and [x < y ==> f x < f y | x <- ls, y <- ls]
454+-- > ==> mapKeysMonotonic f s == mapKeys f s
455+-- > where ls = keys s
456+--
457+-- This means that @f@ maps distinct original keys to distinct resulting keys.
458+-- This function has better performance than 'mapKeys'.
459+--
460+-- > mapKeysMonotonic (\ k -> k * 2) (fromList [(5,"a"), (3,"b")]) == fromList [(6, "b"), (10, "a")]
461+-- > valid (mapKeysMonotonic (\ k -> k * 2) (fromList [(5,"a"), (3,"b")])) == True
462+-- > valid (mapKeysMonotonic (\ _ -> 1) (fromList [(5,"a"), (3,"b")])) == False
433mapKeysMonotonic :: forall k1 k2 a. (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
463mapKeysMonotonic :: forall k1 k2 a. (k1 -> k2) -> MonoidalMap k1 a -> MonoidalMap k2 a
434mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
464mapKeysMonotonic = coerce (M.mapKeysMonotonic :: (k1 -> k2) -> M.Map k1 a -> M.Map k2 a)
435{-# INLINE mapKeysMonotonic #-}
465{-# INLINE mapKeysMonotonic #-}
@@ -669,5 +699,3 @@ maxViewWithKey = coerce (M.maxViewWithKey :: M.Map k a -> Maybe ((k, a), M.Map k
669valid :: forall k a. Ord k => MonoidalMap k a -> Bool
699valid :: forall k a. Ord k => MonoidalMap k a -> Bool
670valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)
700valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)
671{-# INLINE valid #-}
701{-# INLINE valid #-}
672−
673−