on 609fc03 help sign in
.github/workflows/haskell.ymldeleted−41
since splitsnapshots
unifiedsplit
@@ -1,41 +0,0 @@
1−name: github-action
2−
3−on: [push, pull_request]
4−
5−jobs:
6− build:
7− strategy:
8− matrix:
9− ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
10− os: ['ubuntu-latest', 'macos-latest']
11− runs-on: ${{ matrix.os }}
12−
13− name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
14− steps:
15− - uses: actions/checkout@v2
16− - uses: actions/setup-haskell@v1
17− with:
18− ghc-version: ${{ matrix.ghc }}
19− - name: Cache
20− uses: actions/cache@v1
21− env:
22− cache-name: cache-cabal
23− with:
24− path: ~/.cabal
25− key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
26− restore-keys: |
27− ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
28− ${{ runner.os }}-${{ matrix.ghc }}-build-
29− ${{ runner.os }}-${{ matrix.ghc }}-
30− ${{ runner.os }}
31−
32− - name: Install dependencies
33− run: |
34− cabal update
35− cabal build --only-dependencies --enable-tests --enable-benchmarks
36− - name: Build
37− run: cabal build --enable-tests --enable-benchmarks all
38− - name: Run tests
39− run: cabal test all
40− - name: Build Docs
41− run: cabal haddock
.travis.ymlnew file+177
@@ -0,0 +1,177 @@
1+# This Travis job script has been generated by a script via
2+#
3+# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
4+#
5+# For more information, see https://github.com/haskell-CI/haskell-ci
6+#
7+# version: 0.3.20190814
8+#
9+language: c
10+dist: xenial
11+sudo: required
12+git:
13+ # whether to recursively clone submodules
14+ submodules: false
15+cache:
16+ directories:
17+ - $HOME/.cabal/packages
18+ - $HOME/.cabal/store
19+before_cache:
20+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
21+ # remove files that are regenerated by 'cabal update'
22+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
23+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
24+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
27+ - rm -rfv $CABALHOME/packages/head.hackage
28+matrix:
29+ include:
30+ - compiler: ghcjs-8.4
31+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
32+ - compiler: ghc-8.8.1
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
34+ - compiler: ghc-8.6.5
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
36+ - compiler: ghc-8.4.4
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
38+ - compiler: ghc-8.2.2
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
40+ - compiler: ghc-8.0.2
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
42+before_install:
43+ - |
44+ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
45+ sudo add-apt-repository -y ppa:hvr/ghcjs;
46+ curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
47+ sudo apt-add-repository 'https://deb.nodesource.com/node_8.x xenial main'
48+ sudo apt-get update;
49+ sudo apt-get install $CC cabal-install-3.0 nodejs;
50+ fi
51+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
52+ - WITHCOMPILER="-w $HC"
53+ - |
54+ if echo $CC | grep -q ghcjs; then
55+ GHCJS=true
56+ HC=${HC}js
57+ WITHCOMPILER="--ghcjs ${WITHCOMPILER}js"
58+ else
59+ GHCJS=false;
60+ fi
61+ - if $GHCJS ; then sudo apt-get install -y ghc-8.4.4 ; fi
62+ - if $GHCJS ; then PATH="/opt/ghc/8.4.4/bin:$PATH" ; fi
63+ - HCPKG="$HC-pkg"
64+ - unset CC
65+ - CABAL=/opt/ghc/bin/cabal
66+ - CABALHOME=$HOME/.cabal
67+ - export PATH="$CABALHOME/bin:$PATH"
68+ - TOP=$(pwd)
69+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
70+ - echo $HCNUMVER
71+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
72+ - set -o pipefail
73+ - |
74+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
75+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
76+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
77+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
78+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
79+ echo ' if (state == "cabal") {' >> .colorful.awk
80+ echo ' print blue($0)' >> .colorful.awk
81+ echo ' } else {' >> .colorful.awk
82+ echo ' print $0' >> .colorful.awk
83+ echo ' }' >> .colorful.awk
84+ echo '}' >> .colorful.awk
85+ - cat .colorful.awk
86+ - |
87+ color_cabal_output () {
88+ awk -f $TOP/.colorful.awk
89+ }
90+ - echo text | color_cabal_output
91+install:
92+ - ${CABAL} --version
93+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
94+ - node --version
95+ - echo $GHCJS
96+ - TEST=--enable-tests
97+ - BENCH=--enable-benchmarks
98+ - BENCH=--disable-benchmarks
99+ - HEADHACKAGE=false
100+ - rm -f $CABALHOME/config
101+ - |
102+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
103+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
104+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
105+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
106+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
107+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
108+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
109+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
110+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
111+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
112+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
113+ echo "install-dirs user" >> $CABALHOME/config
114+ echo " prefix: $CABALHOME" >> $CABALHOME/config
115+ echo "repository hackage.haskell.org" >> $CABALHOME/config
116+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
117+ - cat $CABALHOME/config
118+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
119+ - travis_retry ${CABAL} v2-update -v
120+ - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 happy) ; fi
121+ # Generate cabal.project
122+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
123+ - touch cabal.project
124+ - |
125+ echo "packages: ." >> cabal.project
126+ - |
127+ - cat cabal.project || true
128+ - cat cabal.project.local || true
129+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
130+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
131+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
132+ - rm cabal.project.freeze
133+script:
134+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
135+ # Packaging...
136+ - ${CABAL} v2-sdist all | color_cabal_output
137+ # Unpacking...
138+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
139+ - cd ${DISTDIR} || false
140+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
141+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
142+ - PKGDIR_reflex="$(find . -maxdepth 1 -type d -regex '.*/reflex-[0-9.]*')"
143+ # Generate cabal.project
144+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
145+ - touch cabal.project
146+ - |
147+ echo "packages: ${PKGDIR_reflex}" >> cabal.project
148+ - |
149+ - cat cabal.project || true
150+ - cat cabal.project.local || true
151+ # Building...
152+ # this builds all libraries and executables (without tests/benchmarks)
153+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
154+ # Building with tests and benchmarks...
155+ # build & run tests, build benchmarks
156+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
157+ # Testing...
158+ - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
159+ # cabal check...
160+ - (cd ${PKGDIR_reflex} && ${CABAL} -vnormal check)
161+ # haddock...
162+ - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
163+ # Constraint sets
164+ - rm -rf cabal.project.local
165+ # Constraint set no-th
166+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex -use-template-haskell' all | color_cabal_output
167+ # Constraint set old-these
168+ - if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output ; fi
169+ # Constraint set old-witherable
170+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='witherable <0.3.2' all | color_cabal_output
171+ # Constraint set debug-propagation
172+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-propagation' all | color_cabal_output
173+ # Constraint set debug-cycles
174+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='reflex +debug-cycles' all | color_cabal_output
175+
176+# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]
177+# EOF
ChangeLog.md+20−58
@@ -1,63 +1,6 @@
1# Revision history for reflex
1# Revision history for reflex
2
2
3−## 0.8.2.0
3+## Unreleased
4−
5−* Add `matchResponseMapWithRequests`, which it similar to `matchResponsesWithRequests` but allows processing of multiple responses at once.
6−
7−## 0.8.1.1
8−
9−* Allow newer hlint for older GHCs, and add upper bound for newer GHCs
10−
11−## 0.8.1.0
12−
13−* Add support for GHC 8.10
14−* Drop support for GHC < 8.4
15−
16−## 0.8.0.0
17−
18−* Replace 0.7.2.0 with 0.8.0.0 to reflect the `MonadHold` interface change. Deprecates 0.7.2.0.
19−
20−## 0.7.2.0 -- *Deprecated*
21−
22−* ([#416](https://github.com/reflex-frp/reflex/pull/416)) Add `now :: m (Event t ())` to `MonadHold`.
23−* Extend some dependency version bounds
24−* Fix HLint 3 test
25−
26−## 0.7.1.1
27−
28−*Backport release*.
29−Changes do not carry forward to 0.7.2.0.
30−
31−* Add support for GHC 8.10
32−* Drop support for GHC < 8.4
33−* Extend some dependency version bounds
34−* Fix HLint 3 test
35−
36−## 0.7.1.0
37−
38−* ([#413](https://github.com/reflex-frp/reflex/pull/413), [#417](https://github.com/reflex-frp/reflex/pull/417)) Add `Reflex.Host.Headless` module which provides `runHeadlessApp` as an easy way to run a Reflex network in a "headless" environment.
39−* ([#420](https://github.com/reflex-frp/reflex/pull/420)) Add a [`Data.Zip.Unzip`](https://hackage.haskell.org/package/semialign-1.1/docs/Data-Zip.html#t:Unzip) instance for `Event`.
40−* ([#419](https://github.com/reflex-frp/reflex/pull/419)) Add `distributeIntMapOverDynPure` and `joinDynThroughIntMap` as convenience functions for working with `Dynamic` `IntMap`s.
41−
42−
43−## 0.7.0.0
44−
45−* Add lifting instances for most classes to `Reflex.Profiled.Profiled`. ([#398](https://github.com/reflex-frp/reflex/pull/398))
46−* Class `MonadQuery t q m` now has a `Monad m` superclass constraint. ([#400](https://github.com/reflex-frp/reflex/pull/400))
47−* **(Breaking change)** Rename class `MonadBehaviorWriter` -> `BehaviorWriter` for consistency with `EventWriter`/`DynamicWriter`. ([#401](https://github.com/reflex-frp/reflex/pull/401))
48−* Introduce deprecated alias `MonadBehaviorWriter = BehaviorWriter`. ([#401](https://github.com/reflex-frp/reflex/pull/401))
49−* Fix bug in spider where event subscriptions would be prematurely finalized due to over-aggressive inlining. ([#409](https://github.com/reflex-frp/reflex/pull/409))
50−* Add instances of `PerformEvent` and `TriggerEvent` for `MaybeT`. ([#395](https://github.com/reflex-frp/reflex/pull/395))
51−
52−## 0.6.4.1
53−
54−* Fix a bug in the Reflex Profiled transformer where
55− `Reflex.Class.mergeIncrementalG` and
56− `Reflex.Class.mergeIncrementalWithMoveG` implementations referenced
57− itself instead of the inner transformed timeline, causing an
58− infinite loop.
59−
60−## 0.6.4
61
4
62* Support GHC 8.8
5* Support GHC 8.8
63
6
@@ -71,6 +14,25 @@ Changes do not carry forward to 0.7.2.0.
71* Add cabal flags `debug-propagation` and `debug-event-cycles` to build in debugging
14* Add cabal flags `debug-propagation` and `debug-event-cycles` to build in debugging
72 code for performance and for cyclic dependencies between events
15 code for performance and for cyclic dependencies between events
73
16
17+* Refactor of `Reflex.Requester`:
18+ * Updated:
19+ * `RequesterData` to `RequestData`, `RequesterEnvelope`, and `ResponseData`
20+ * `singletonRequesterData` to `singletonRequestData` and `singletonResponseData`
21+ * `requesterDataToList` to `requestEnvelopesToDSums`
22+ * Removed:
23+ * `RequesterDataKey`
24+ * `multiEntry`
25+ * `unMultiEntry`
26+ * `withRequesterT`
27+ * `runWithReplaceRequesterTWith`
28+ * `requesting'`
29+ * `traverseIntMapWithKeyWithAdjustRequesterTWith`
30+ * `traverseDMapWithKeyWithAdjustRequesterTWith`
31+
32+* Added `Data.List.Deferred` and `Data.List.NonEmpty.Deferred` for optimizing `<>` operations.
33+
34+* Added `Data.TagMap`, `Reflex.FanTag`, and `Data.Unique.Tag.Local` to improve request and response tagging.
35+
74## 0.6.3
36## 0.6.3
75
37
76* `Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
38* `Data.WeakBag.traverse` and `Data.FastWeakBag.traverse` have been deprecated.
Quickref.md−1
@@ -54,7 +54,6 @@ Since MonadHold depends on MonadSample, any [S] function also runs in [H] contex
54[ ] difference :: Event a -> Event b -> Event a
54[ ] difference :: Event a -> Event b -> Event a
55[ ] align :: Event a -> Event b -> Event (These a b)
55[ ] align :: Event a -> Event b -> Event (These a b)
56[ ] alignWith :: (These a b -> c) -> Event a -> Event b -> Event c
56[ ] alignWith :: (These a b -> c) -> Event a -> Event b -> Event c
57− -- Note align functions from Data.Align in semialign package
58[ ] mergeWith :: (a -> a -> a) -> [Event a] -> Event a
57[ ] mergeWith :: (a -> a -> a) -> [Event a] -> Event a
59[ ] leftmost :: [Event a] -> Event a
58[ ] leftmost :: [Event a] -> Event a
60[ ] mergeList :: [Event a] -> Event (NonEmpty a)
59[ ] mergeList :: [Event a] -> Event (NonEmpty a)
README.md+17−15
@@ -1,23 +1,25 @@
1−# [Reflex](https://reflex-frp.org/)
1+## [Reflex](https://reflex-frp.org/)
2
2
3−[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex.svg)](https://hackage.haskell.org/package/reflex) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex/badge)](https://matrix.hackage.haskell.org/#/package/reflex) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex/blob/master/LICENSE)
3+[![Hackage](https://img.shields.io/hackage/v/reflex.svg)](http://hackage.haskell.org/package/reflex)
4
4
5−Interactive programs without callbacks or side-effects. Functional Reactive Programming (FRP) uses composable events and time-varying values to describe interactive systems as pure functions. Just like other pure functional code, functional reactive code is easier to get right on the first try, maintain, and reuse.
5+### Practical Functional Reactive Programming
6
6
7−Reflex is a fully-deterministic, higher-order Functional Reactive Programming interface and an engine that efficiently implements that interface.
7+Reflex is a fully-deterministic, higher-order Functional Reactive Programming (FRP) interface and an engine that efficiently implements that interface.
8
8
9−**Visit https://reflex-frp.org for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
9+[Reflex-DOM](https://github.com/reflex-frp/reflex-dom) is a framework built on Reflex that facilitates the development of web pages, including highly-interactive single-page apps.
10
10
11−## Resources
11+A summary of Reflex functions is available in the [quick reference](Quickref.md).
12
12
13−* [Official Website](https://reflex-frp.org)
13+**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
14−* [Quick Reference](Quickref.md)
15−* [Reflex-DOM](https://github.com/reflex-frp/reflex-dom): A framework built on Reflex that facilitates the development of web pages, including highly-interactive single-page apps.
16−* [Obelisk](https://github.com/obsidiansystems/obelisk#obelisk): A framework built on Reflex and Reflex-DOM for functional reactive web and mobile applications, with batteries included.
17−* [Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
18−* [/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
19−* [irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
20
14
21−## Hacking
15+### Resources
16+[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
22
17
23−From the root of a [Reflex Platform](https://github.com/reflex-frp/reflex-platform) checkout, run `./scripts/hack-on haskell-overlays/reflex-packages/dep/reflex`. This will check out the reflex source code into the `haskell-overlays/reflex-packages/dep/reflex` directory. You can then point that checkout at your fork, make changes, etc. Use the `./try-reflex` or `./scripts/work-on` scripts to start a shell in which you can test your changes.
18+[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
19+
20+[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
21+
22+### Hacking
23+
24+Use the `./scripts/hack-on reflex` script in [Reflex Platform](https://github.com/reflex-frp/reflex-platform) to checkout the source code of `reflex` locally in `reflex-platform/reflex` directory.
25+Then do modifications to the source in place, and use the `./try-reflex` or `./scripts/work-on` scripts to create the shell to test your changes.
cabal.project.freezenew file+2
@@ -0,0 +1,2 @@
1+constraints: any.text < 1.2.4.0
2+ , hlint < 2.2.6 || > 2.2.6
reflex.cabal+34−48
@@ -1,17 +1,7 @@
1Name: reflex
1Name: reflex
2−Version: 0.8.2.0
2+Version: 0.6.3
3Synopsis: Higher-order Functional Reactive Programming
3Synopsis: Higher-order Functional Reactive Programming
4−Description:
5− Interactive programs without callbacks or side-effects.
6− Functional Reactive Programming (FRP) uses composable events and time-varying
7− values to describe interactive systems as pure functions.
8− Just like other pure functional code, functional reactive code is easier
9− to get right on the first try, maintain, and reuse.
10− .
11− Reflex is a fully-deterministic, higher-order Functional Reactive Programming
4+Description: Reflex is a high-performance, deterministic, higher-order Functional Reactive Programming system
12− interface and an engine that efficiently implements that interface.
13− .
14− <https://reflex-frp.org>
15License: BSD3
5License: BSD3
16License-file: LICENSE
6License-file: LICENSE
17Author: Ryan Trinkle
7Author: Ryan Trinkle
@@ -28,8 +18,8 @@ extra-source-files:
28 ChangeLog.md
18 ChangeLog.md
29
19
30tested-with:
20tested-with:
31− GHC ==8.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.2,
21+ GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1,
32− GHCJS ==8.6
22+ GHCJS ==8.4
33
23
34flag use-reflex-optimizer
24flag use-reflex-optimizer
35 description: Use the GHC plugin Reflex.Optimizer on some of the modules in the package. This is still experimental.
25 description: Use the GHC plugin Reflex.Optimizer on some of the modules in the package. This is still experimental.
@@ -71,23 +61,22 @@ library
71 hs-source-dirs: src
61 hs-source-dirs: src
72 build-depends:
62 build-depends:
73 MemoTrie == 0.6.*,
63 MemoTrie == 0.6.*,
74− base >= 4.11 && < 4.15,
64+ base >= 4.9 && < 4.14,
75 bifunctors >= 5.2 && < 5.6,
65 bifunctors >= 5.2 && < 5.6,
76 comonad >= 5.0.4 && < 5.1,
66 comonad >= 5.0.4 && < 5.1,
77− constraints >= 0.10 && <0.14,
78 constraints-extras >= 0.3 && < 0.4,
67 constraints-extras >= 0.3 && < 0.4,
79 containers >= 0.6 && < 0.7,
68 containers >= 0.6 && < 0.7,
80 data-default >= 0.5 && < 0.8,
69 data-default >= 0.5 && < 0.8,
81− dependent-map >= 0.3 && < 0.5,
70+ dependent-map >= 0.3 && < 0.4,
71+ dlist == 0.8.*,
82 exception-transformers == 0.4.*,
72 exception-transformers == 0.4.*,
83 lens >= 4.7 && < 5,
73 lens >= 4.7 && < 5,
84− mmorph >= 1.0 && < 1.2,
85 monad-control >= 1.0.1 && < 1.1,
74 monad-control >= 1.0.1 && < 1.1,
86 mtl >= 2.1 && < 2.3,
75 mtl >= 2.1 && < 2.3,
87− patch >= 0.0.1 && < 0.1,
76+ patch >= 0.0.2 && < 0.1,
88− prim-uniq >= 0.1.0.1 && < 0.3,
77+ prim-uniq >= 0.1.0.1 && < 0.2,
89 primitive >= 0.5 && < 0.8,
78 primitive >= 0.5 && < 0.8,
90− profunctors >= 5.3 && < 5.7,
79+ profunctors >= 5.3 && < 5.6,
91 random == 1.1.*,
80 random == 1.1.*,
92 ref-tf == 0.4.*,
81 ref-tf == 0.4.*,
93 reflection == 2.1.*,
82 reflection == 2.1.*,
@@ -97,10 +86,10 @@ library
97 time >= 1.4 && < 1.10,
86 time >= 1.4 && < 1.10,
98 transformers >= 0.5.6.0 && < 0.6,
87 transformers >= 0.5.6.0 && < 0.6,
99 unbounded-delays >= 0.1.0.0 && < 0.2,
88 unbounded-delays >= 0.1.0.0 && < 0.2,
100− witherable >= 0.3 && < 0.5
89+ witherable >= 0.3 && < 0.3.2
101
90
102 if flag(split-these)
91 if flag(split-these)
103− build-depends: these >= 1 && <1.2,
92+ build-depends: these >= 1 && <1.1,
104 semialign >=1 && <1.2,
93 semialign >=1 && <1.2,
105 monoidal-containers >= 0.6 && < 0.7
94 monoidal-containers >= 0.6 && < 0.7
106 else
95 else
@@ -112,13 +101,19 @@ library
112 Data.AppendMap,
101 Data.AppendMap,
113 Data.FastMutableIntMap,
102 Data.FastMutableIntMap,
114 Data.FastWeakBag,
103 Data.FastWeakBag,
104+ Data.List.Deferred,
105+ Data.List.NonEmpty.Deferred,
106+ Data.List.NonEmpty.Deferred.Internal,
115 Data.Map.Misc,
107 Data.Map.Misc,
108+ Data.TagMap,
109+ Data.Unique.Tag.Local,
110+ Data.Unique.Tag.Local.Internal,
116 Data.WeakBag,
111 Data.WeakBag,
117 Reflex,
112 Reflex,
118− Reflex.Class,
119 Reflex.Adjustable.Class,
113 Reflex.Adjustable.Class,
120 Reflex.BehaviorWriter.Base,
114 Reflex.BehaviorWriter.Base,
121 Reflex.BehaviorWriter.Class,
115 Reflex.BehaviorWriter.Class,
116+ Reflex.Class,
122 Reflex.Collection,
117 Reflex.Collection,
123 Reflex.Dynamic,
118 Reflex.Dynamic,
124 Reflex.Dynamic.Uniq,
119 Reflex.Dynamic.Uniq,
@@ -128,10 +123,10 @@ library
128 Reflex.EventWriter,
123 Reflex.EventWriter,
129 Reflex.EventWriter.Base,
124 Reflex.EventWriter.Base,
130 Reflex.EventWriter.Class,
125 Reflex.EventWriter.Class,
126+ Reflex.FanTag,
131 Reflex.FastWeak,
127 Reflex.FastWeak,
132 Reflex.FunctorMaybe,
128 Reflex.FunctorMaybe,
133 Reflex.Host.Class,
129 Reflex.Host.Class,
134− Reflex.Host.Headless,
135 Reflex.Network,
130 Reflex.Network,
136 Reflex.NotReady.Class,
131 Reflex.NotReady.Class,
137 Reflex.PerformEvent.Base,
132 Reflex.PerformEvent.Base,
@@ -143,6 +138,7 @@ library
143 Reflex.Query.Base,
138 Reflex.Query.Base,
144 Reflex.Query.Class,
139 Reflex.Query.Class,
145 Reflex.Requester.Base,
140 Reflex.Requester.Base,
141+ Reflex.Requester.Base.Internal,
146 Reflex.Requester.Class,
142 Reflex.Requester.Class,
147 Reflex.Spider,
143 Reflex.Spider,
148 Reflex.Spider.Internal,
144 Reflex.Spider.Internal,
@@ -163,11 +159,11 @@ library
163 patch:Data.Patch.MapWithMove as Reflex.Patch.MapWithMove
159 patch:Data.Patch.MapWithMove as Reflex.Patch.MapWithMove
164
160
165 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs -funbox-strict-fields -O2 -fspecialise-aggressively
161 ghc-options: -Wall -fwarn-redundant-constraints -fwarn-tabs -funbox-strict-fields -O2 -fspecialise-aggressively
162+ ghc-prof-options: -fprof-auto-calls
166
163
167 if flag(debug-trace-events)
164 if flag(debug-trace-events)
168 cpp-options: -DDEBUG_TRACE_EVENTS
165 cpp-options: -DDEBUG_TRACE_EVENTS
169− build-depends:
166+ build-depends: bytestring
170− bytestring >= 0.10.8 && < 0.11
171
167
172 if flag(use-reflex-optimizer)
168 if flag(use-reflex-optimizer)
173 cpp-options: -DUSE_REFLEX_OPTIMIZER
169 cpp-options: -DUSE_REFLEX_OPTIMIZER
@@ -183,23 +179,22 @@ library
183 if flag(use-template-haskell)
179 if flag(use-template-haskell)
184 cpp-options: -DUSE_TEMPLATE_HASKELL
180 cpp-options: -DUSE_TEMPLATE_HASKELL
185 build-depends:
181 build-depends:
186− dependent-sum >= 0.6 && < 0.8,
182+ dependent-sum >= 0.6 && < 0.7,
187− haskell-src-exts >= 1.16 && < 1.24,
183+ haskell-src-exts >= 1.16 && < 1.23,
188 haskell-src-meta >= 0.6 && < 0.9,
184 haskell-src-meta >= 0.6 && < 0.9,
189− template-haskell >= 2.9 && < 2.17
185+ template-haskell >= 2.9 && < 2.16
190 exposed-modules:
186 exposed-modules:
191 Reflex.Dynamic.TH
187 Reflex.Dynamic.TH
192 other-extensions: TemplateHaskell
188 other-extensions: TemplateHaskell
193 else
189 else
194 build-depends:
190 build-depends:
195− dependent-sum >= 0.6 && < 0.8
191+ dependent-sum >= 0.6 && < 0.7
196
192
197 if flag(fast-weak) && impl(ghcjs)
193 if flag(fast-weak) && impl(ghcjs)
198 cpp-options: -DGHCJS_FAST_WEAK
194 cpp-options: -DGHCJS_FAST_WEAK
199
195
200 if impl(ghcjs)
196 if impl(ghcjs)
201− build-depends:
197+ build-depends: ghcjs-base
202− ghcjs-base == 0.2.*
203
198
204test-suite semantics
199test-suite semantics
205 default-language: Haskell2010
200 default-language: Haskell2010
@@ -207,6 +202,7 @@ test-suite semantics
207 main-is: semantics.hs
202 main-is: semantics.hs
208 hs-source-dirs: test
203 hs-source-dirs: test
209 ghc-options: -O2 -Wall -rtsopts
204 ghc-options: -O2 -Wall -rtsopts
205+ ghc-prof-options: -fprof-auto-calls
210 build-depends:
206 build-depends:
211 base,
207 base,
212 bifunctors,
208 bifunctors,
@@ -233,6 +229,7 @@ test-suite CrossImpl
233 main-is: Reflex/Test/CrossImpl.hs
229 main-is: Reflex/Test/CrossImpl.hs
234 hs-source-dirs: test
230 hs-source-dirs: test
235 ghc-options: -O2 -Wall -rtsopts
231 ghc-options: -O2 -Wall -rtsopts
232+ ghc-prof-options: -fprof-auto-calls
236 build-depends:
233 build-depends:
237 base,
234 base,
238 containers,
235 containers,
@@ -258,10 +255,7 @@ test-suite hlint
258 , directory
255 , directory
259 , filepath
256 , filepath
260 , filemanip
257 , filemanip
261− if impl(ghc >= 8.8)
262− build-depends: hlint >= 3 && < 4
263− else
264− build-depends: hlint (< 2.1 || >= 2.2.2) && < 4
258+ , hlint < 2.1 || >= 2.2.2
265 if impl(ghcjs)
259 if impl(ghcjs)
266 buildable: False
260 buildable: False
267
261
@@ -324,17 +318,15 @@ test-suite RequesterT
324 main-is: RequesterT.hs
318 main-is: RequesterT.hs
325 hs-source-dirs: test
319 hs-source-dirs: test
326 build-depends: base
320 build-depends: base
327− , constraints
328− , constraints-extras
329 , containers
321 , containers
330 , deepseq
322 , deepseq
331 , dependent-map
323 , dependent-map
332 , dependent-sum
324 , dependent-sum
333 , lens
325 , lens
334 , mtl
326 , mtl
327+ , primitive
335 , ref-tf
328 , ref-tf
336 , reflex
329 , reflex
337− , text
338 , these
330 , these
339 , transformers
331 , transformers
340
332
@@ -346,14 +338,6 @@ test-suite RequesterT
346 Reflex.Plan.Pure
338 Reflex.Plan.Pure
347 Test.Run
339 Test.Run
348
340
349−test-suite Headless
350− default-language: Haskell2010
351− type: exitcode-stdio-1.0
352− main-is: Headless.hs
353− hs-source-dirs: test
354− build-depends: base
355− , reflex
356−
357test-suite Adjustable
341test-suite Adjustable
358 default-language: Haskell2010
342 default-language: Haskell2010
359 type: exitcode-stdio-1.0
343 type: exitcode-stdio-1.0
@@ -447,6 +431,7 @@ benchmark spider-bench
447 hs-source-dirs: bench test
431 hs-source-dirs: bench test
448 main-is: Main.hs
432 main-is: Main.hs
449 ghc-options: -Wall -O2 -rtsopts
433 ghc-options: -Wall -O2 -rtsopts
434+ ghc-prof-options: -fprof-auto-calls
450 build-depends:
435 build-depends:
451 base,
436 base,
452 containers,
437 containers,
@@ -473,6 +458,7 @@ benchmark saulzar-bench
473 c-sources: bench-cbits/checkCapability.c
458 c-sources: bench-cbits/checkCapability.c
474 main-is: RunAll.hs
459 main-is: RunAll.hs
475 ghc-options: -Wall -O2 -rtsopts -threaded
460 ghc-options: -Wall -O2 -rtsopts -threaded
461+ ghc-prof-options: -fprof-auto-calls
476 build-depends:
462 build-depends:
477 base,
463 base,
478 containers,
464 containers,
release.nix+2−2
@@ -1,12 +1,12 @@
1{ reflex-platform-fun ? import ./dep/reflex-platform
1{ reflex-platform-fun ? import ./dep/reflex-platform
2−, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
3}:
2}:
4
3
5let
4let
6 native-reflex-platform = reflex-platform-fun {};
5 native-reflex-platform = reflex-platform-fun {};
7 inherit (native-reflex-platform.nixpkgs) lib;
6 inherit (native-reflex-platform.nixpkgs) lib;
7+ systems = ["x86_64-linux" "x86_64-darwin"];
8
8
9− perPlatform = lib.genAttrs supportedSystems (system: let
9+ perPlatform = lib.genAttrs systems (system: let
10 reflex-platform = reflex-platform-fun { inherit system; };
10 reflex-platform = reflex-platform-fun { inherit system; };
11 compilers = [
11 compilers = [
12 "ghc"
12 "ghc"
src/Data/List/Deferred.hsnew file+60
@@ -0,0 +1,60 @@
1+{-# LANGUAGE LambdaCase #-}
2+module Data.List.Deferred
3+ ( Deferred
4+ , empty
5+ , singleton
6+ , toNonEmpty
7+ , fromNonEmpty
8+ , toList
9+ ) where
10+
11+import Data.List.NonEmpty.Deferred.Internal (NonEmptyDeferred (..))
12+import qualified Data.List.NonEmpty.Deferred as NonEmpty
13+
14+data Deferred a
15+ = Deferred_Empty
16+ | Deferred_Singleton a
17+ | Deferred_Append !(NonEmptyDeferred a) !(NonEmptyDeferred a)
18+
19+{-# INLINE toNonEmpty #-}
20+toNonEmpty :: Deferred a -> Maybe (NonEmptyDeferred a)
21+toNonEmpty = \case
22+ Deferred_Empty -> Nothing
23+ Deferred_Singleton a -> Just $ NonEmpty.singleton a
24+ Deferred_Append a b -> Just $ a <> b
25+
26+{-# INLINE fromNonEmpty #-}
27+fromNonEmpty :: NonEmptyDeferred a -> Deferred a
28+fromNonEmpty = \case
29+ NonEmptyDeferred_Singleton a -> Deferred_Singleton a
30+ NonEmptyDeferred_Append a b -> Deferred_Append a b
31+
32+{-# INLINE empty #-}
33+empty :: Deferred a
34+empty = Deferred_Empty
35+
36+{-# INLINE singleton #-}
37+singleton :: a -> Deferred a
38+singleton = fromNonEmpty . NonEmpty.singleton
39+
40+{-# INLINE toList #-}
41+toList :: Deferred a -> [a]
42+toList = \case
43+ Deferred_Empty -> []
44+ Deferred_Singleton a -> [a]
45+ Deferred_Append a b -> NonEmpty.toList $ a <> b
46+
47+instance Semigroup (Deferred a) where
48+ (<>) = \case
49+ Deferred_Empty -> id
50+ a@(Deferred_Singleton va) -> \case
51+ Deferred_Empty -> a
52+ Deferred_Singleton vb -> Deferred_Append (NonEmpty.singleton va) (NonEmpty.singleton vb)
53+ Deferred_Append b1 b2 -> Deferred_Append (NonEmpty.singleton va) (b1 <> b2)
54+ a@(Deferred_Append a1 a2) -> \case
55+ Deferred_Empty -> a
56+ Deferred_Singleton vb -> Deferred_Append (a1 <> a2) (NonEmpty.singleton vb)
57+ Deferred_Append b1 b2 -> Deferred_Append (a1 <> a2) (b1 <> b2)
58+
59+instance Monoid (Deferred a) where
60+ mempty = Deferred_Empty
src/Data/List/NonEmpty/Deferred.hsnew file+13
@@ -0,0 +1,13 @@
1+-- | Uses a non-associative internal structure to represent a NonEmpty list, but
2+-- prevents external observers from observing the non-associativity. This
3+-- allows O(1) '(<>)'.
4+
5+{-# LANGUAGE LambdaCase #-}
6+module Data.List.NonEmpty.Deferred
7+ ( NonEmptyDeferred
8+ , singleton
9+ , toNonEmpty
10+ , toList
11+ ) where
12+
13+import Data.List.NonEmpty.Deferred.Internal
src/Data/List/NonEmpty/Deferred/Internal.hsnew file+30
@@ -0,0 +1,30 @@
1+{-# LANGUAGE LambdaCase #-}
2+module Data.List.NonEmpty.Deferred.Internal where
3+
4+import Data.List.NonEmpty (NonEmpty (..))
5+import qualified Data.List.NonEmpty as NonEmpty
6+
7+data NonEmptyDeferred a
8+ = NonEmptyDeferred_Singleton a
9+ | NonEmptyDeferred_Append !(NonEmptyDeferred a) !(NonEmptyDeferred a)
10+
11+{-# INLINE singleton #-}
12+singleton :: a -> NonEmptyDeferred a
13+singleton = NonEmptyDeferred_Singleton
14+
15+{-# INLINE toNonEmpty #-}
16+toNonEmpty :: NonEmptyDeferred a -> NonEmpty a
17+toNonEmpty = go []
18+ where go t = \case
19+ NonEmptyDeferred_Singleton a -> a :| t
20+ NonEmptyDeferred_Append a b -> go (NonEmpty.toList $ go t b) a
21+
22+{-# INLINE toList #-}
23+toList :: NonEmptyDeferred a -> [a]
24+toList = go []
25+ where go t = \case
26+ NonEmptyDeferred_Singleton a -> a : t
27+ NonEmptyDeferred_Append a b -> go (go t b) a
28+
29+instance Semigroup (NonEmptyDeferred a) where
30+ (<>) = NonEmptyDeferred_Append
src/Data/TagMap.hsnew file+43
@@ -0,0 +1,43 @@
1+{-# LANGUAGE PolyKinds #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+module Data.TagMap
4+ ( TagMap
5+ , unTagMap
6+ , fromDMap
7+ , toDMap
8+ , fromList
9+ , insert
10+ , size
11+ , singletonTagMap
12+ ) where
13+
14+import Data.IntMap (IntMap)
15+import qualified Data.IntMap as IntMap
16+import Data.Dependent.Map (DMap)
17+import qualified Data.Dependent.Map as DMap
18+import Data.Dependent.Sum (DSum (..))
19+import Data.Unique.Tag.Local
20+
21+import GHC.Exts (Any)
22+import Unsafe.Coerce
23+
24+-- | Like DMap, but with 'Data.Unique.Tag.Tag' as the keys. Implemented using 'Data.IntMap.IntMap' under the hood.
25+newtype TagMap x (v :: k -> *) = TagMap { unTagMap :: IntMap Any }
26+
27+fromDMap :: forall k x (v :: k -> *). DMap (Tag x) v -> TagMap x v
28+fromDMap = TagMap . IntMap.fromDistinctAscList . fmap (\((k :: Tag x (a :: k)) :=> v) -> (tagId k, (unsafeCoerce :: v a -> Any) v)) . DMap.toAscList
29+
30+toDMap :: forall x v. TagMap x v -> DMap (Tag x) v
31+toDMap = DMap.fromDistinctAscList . fmap (\(k, v) -> (unsafeTagFromId k :=> (unsafeCoerce :: Any -> v a) v)) . IntMap.toAscList . unTagMap
32+
33+insert :: forall x a v. Tag x a -> v a -> TagMap x v -> TagMap x v
34+insert k v = TagMap . IntMap.insert (tagId k) ((unsafeCoerce :: v a -> Any) v) . unTagMap
35+
36+fromList :: [DSum (Tag x) v] -> TagMap x v
37+fromList = TagMap . IntMap.fromList . fmap (\(t :=> v) -> (tagId t, (unsafeCoerce :: v a -> Any) v))
38+
39+size :: TagMap x v -> Int
40+size = IntMap.size . unTagMap
41+
42+singletonTagMap :: forall ps k v a. Tag ps k -> v a -> TagMap k v
43+singletonTagMap tag v = TagMap $ IntMap.singleton (tagId tag) $ (unsafeCoerce :: v a -> Any) v
src/Data/Unique/Tag/Local.hsnew file+11
@@ -0,0 +1,11 @@
1+module Data.Unique.Tag.Local
2+ ( Tag
3+ , TagGen (..)
4+ , tagId
5+ , unsafeTagFromId
6+ , newTag
7+ , newTagGen
8+ , withTagGen
9+ ) where
10+
11+import Data.Unique.Tag.Local.Internal
src/Data/Unique/Tag/Local/Internal.hsnew file+59
@@ -0,0 +1,59 @@
1+-- | The type-safety of this module depends on two assumptions:
2+-- 1. If the `s` parameters on two `TagGen`s can unify, then they contain the same MutVar
3+-- 2. Two Tag values made from the same TagGen never contain the same Int
4+
5+{-# LANGUAGE EmptyDataDecls #-}
6+{-# LANGUAGE DeriveFunctor #-}
7+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8+{-# LANGUAGE TypeFamilies #-}
9+{-# LANGUAGE PolyKinds #-}
10+{-# LANGUAGE RankNTypes #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE MagicHash #-}
13+module Data.Unique.Tag.Local.Internal where
14+
15+import Control.Monad.Primitive
16+import Data.Primitive.MutVar
17+import Data.GADT.Compare
18+import Data.Some
19+import GHC.Exts (Int (..), Int#, MutVar#, unsafeCoerce#)
20+
21+import Unsafe.Coerce
22+
23+-- `x` is which generator it's from
24+-- `a` is the type of the thing it's tagging
25+newtype Tag x a = Tag Int
26+
27+tagId :: Tag x a -> Int
28+tagId (Tag n) = n
29+
30+-- | WARNING: If you construct a tag with the wrong type, it will result in
31+-- incorrect unsafeCoerce applications, which can segfault or cause arbitrary
32+-- other damage to your program
33+unsafeTagFromId :: Int -> Tag x a
34+unsafeTagFromId n = Tag n
35+
36+-- We use Int because it is supported by e.g. IntMap
37+newtype TagGen ps s = TagGen { unTagGen :: MutVar ps Int }
38+
39+instance Show (TagGen ps s) where
40+ show (TagGen (MutVar m)) = show $ I# ((unsafeCoerce# :: MutVar# ps Int -> Int#) m)
41+
42+instance GEq (TagGen ps) where
43+ TagGen a `geq` TagGen b =
44+ if a == b
45+ then Just $ unsafeCoerce Refl
46+ else Nothing
47+
48+newTag :: PrimMonad m => TagGen (PrimState m) s -> m (Tag s a)
49+newTag (TagGen r) = do
50+ n <- atomicModifyMutVar' r $ \x -> (succ x, x)
51+ pure $ Tag n
52+
53+newTagGen :: PrimMonad m => m (Some (TagGen (PrimState m)))
54+newTagGen = Some . TagGen <$> newMutVar minBound
55+
56+withTagGen :: PrimMonad m => (forall s. TagGen (PrimState m) s -> m a) -> m a
57+withTagGen f = do
58+ g <- newTagGen
59+ withSome g f
src/Reflex/Adjustable/Class.hs+1−2
@@ -30,8 +30,7 @@ module Reflex.Adjustable.Class
30
30
31import Control.Monad.Identity
31import Control.Monad.Identity
32import Control.Monad.Reader
32import Control.Monad.Reader
33−import Data.Dependent.Map (DMap)
33+import Data.Dependent.Map (DMap, GCompare (..))
34−import Data.GADT.Compare (GCompare(..))
35import qualified Data.Dependent.Map as DMap
34import qualified Data.Dependent.Map as DMap
36import Data.Functor.Constant
35import Data.Functor.Constant
37import Data.Functor.Misc
36import Data.Functor.Misc
src/Reflex/BehaviorWriter/Base.hs+7−16
@@ -1,6 +1,6 @@
1{-|
1{-|
2Module: Reflex.BehaviorWriter.Base
2Module: Reflex.BehaviorWriter.Base
3−Description: Implementation of BehaviorWriter
3+Description: Implementation of MonadBehaviorWriter
4-}
4-}
5{-# LANGUAGE CPP #-}
5{-# LANGUAGE CPP #-}
6{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
@@ -24,7 +24,6 @@ module Reflex.BehaviorWriter.Base
24import Control.Monad.Exception
24import Control.Monad.Exception
25import Control.Monad.Identity
25import Control.Monad.Identity
26import Control.Monad.IO.Class
26import Control.Monad.IO.Class
27−import Control.Monad.Morph
28import Control.Monad.Reader
27import Control.Monad.Reader
29import Control.Monad.Ref
28import Control.Monad.Ref
30import Control.Monad.State.Strict
29import Control.Monad.State.Strict
@@ -47,20 +46,9 @@ import Reflex.Query.Class
47import Reflex.Requester.Class
46import Reflex.Requester.Class
48import Reflex.TriggerEvent.Class
47import Reflex.TriggerEvent.Class
49
48
50−-- | A basic implementation of 'BehaviorWriter'.
49+-- | A basic implementation of 'MonadBehaviorWriter'.
51newtype BehaviorWriterT t w m a = BehaviorWriterT { unBehaviorWriterT :: StateT [Behavior t w] m a }
50newtype BehaviorWriterT t w m a = BehaviorWriterT { unBehaviorWriterT :: StateT [Behavior t w] m a }
52− -- The list is kept in reverse order
51+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadAsyncException, MonadException) -- The list is kept in reverse order
53− deriving
54− ( Functor
55− , Applicative
56− , Monad
57− , MonadTrans
58− , MFunctor
59− , MonadIO
60− , MonadFix
61− , MonadAsyncException
62− , MonadException
63− )
64
52
65-- | Run a 'BehaviorWriterT' action. The behavior writer output will be provided
53-- | Run a 'BehaviorWriterT' action. The behavior writer output will be provided
66-- along with the result of the action.
54-- along with the result of the action.
@@ -85,6 +73,9 @@ withBehaviorWriterT f dw = do
85deriving instance MonadHold t m => MonadHold t (BehaviorWriterT t w m)
73deriving instance MonadHold t m => MonadHold t (BehaviorWriterT t w m)
86deriving instance MonadSample t m => MonadSample t (BehaviorWriterT t w m)
74deriving instance MonadSample t m => MonadSample t (BehaviorWriterT t w m)
87
75
76+instance MonadTrans (BehaviorWriterT t w) where
77+ lift = BehaviorWriterT . lift
78+
88instance MonadRef m => MonadRef (BehaviorWriterT t w m) where
79instance MonadRef m => MonadRef (BehaviorWriterT t w m) where
89 type Ref (BehaviorWriterT t w m) = Ref m
80 type Ref (BehaviorWriterT t w m) = Ref m
90 newRef = lift . newRef
81 newRef = lift . newRef
@@ -98,7 +89,7 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (BehaviorWri
98 newEventWithTrigger = lift . newEventWithTrigger
89 newEventWithTrigger = lift . newEventWithTrigger
99 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
90 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
100
91
101−instance (Monad m, Monoid w, Reflex t) => BehaviorWriter t w (BehaviorWriterT t w m) where
92+instance (Monad m, Monoid w, Reflex t) => MonadBehaviorWriter t w (BehaviorWriterT t w m) where
102 tellBehavior w = BehaviorWriterT $ modify (w :)
93 tellBehavior w = BehaviorWriterT $ modify (w :)
103
94
104instance MonadReader r m => MonadReader r (BehaviorWriterT t w m) where
95instance MonadReader r m => MonadReader r (BehaviorWriterT t w m) where
src/Reflex/BehaviorWriter/Class.hs+5−11
@@ -1,9 +1,8 @@
1{-|
1{-|
2Module: Reflex.BehaviorWriter.Class
2Module: Reflex.BehaviorWriter.Class
3−Description: This module defines the 'BehaviorWriter' class
3+Description: This module defines the 'MonadBehaviorWriter' class
4-}
4-}
5{-# LANGUAGE CPP #-}
5{-# LANGUAGE CPP #-}
6−{-# LANGUAGE ConstraintKinds #-}
7{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
8{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE FunctionalDependencies #-}
9{-# LANGUAGE UndecidableInstances #-}
8{-# LANGUAGE UndecidableInstances #-}
@@ -11,21 +10,16 @@ Description: This module defines the 'BehaviorWriter' class
11{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
10{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
12#endif
11#endif
13module Reflex.BehaviorWriter.Class
12module Reflex.BehaviorWriter.Class
14− ( MonadBehaviorWriter
13+ ( MonadBehaviorWriter (..)
15− , BehaviorWriter(..)
16 ) where
14 ) where
17
15
18import Control.Monad.Reader (ReaderT, lift)
16import Control.Monad.Reader (ReaderT, lift)
19import Reflex.Class (Behavior)
17import Reflex.Class (Behavior)
20
18
21−{-# DEPRECATED MonadBehaviorWriter "Use 'BehaviorWriter' instead" #-}
22−-- | Type synonym for 'BehaviorWriter'
23−type MonadBehaviorWriter = BehaviorWriter
24−
25−-- | 'BehaviorWriter' efficiently collects 'Behavior' values using 'tellBehavior'
19+-- | 'MonadBehaviorWriter' efficiently collects 'Behavior' values using 'tellBehavior'
26-- and combines them monoidally to provide a 'Behavior' result.
20-- and combines them monoidally to provide a 'Behavior' result.
27−class (Monad m, Monoid w) => BehaviorWriter t w m | m -> t w where
21+class (Monad m, Monoid w) => MonadBehaviorWriter t w m | m -> t w where
28 tellBehavior :: Behavior t w -> m ()
22 tellBehavior :: Behavior t w -> m ()
29
23
30−instance BehaviorWriter t w m => BehaviorWriter t w (ReaderT r m) where
24+instance MonadBehaviorWriter t w m => MonadBehaviorWriter t w (ReaderT r m) where
31 tellBehavior = lift . tellBehavior
25 tellBehavior = lift . tellBehavior
src/Reflex/Class.hs+64−56
@@ -169,6 +169,8 @@ module Reflex.Class
169 , tagCheap
169 , tagCheap
170 , mergeWithCheap
170 , mergeWithCheap
171 , mergeWithCheap'
171 , mergeWithCheap'
172+ , sconcatCheap
173+ , mconcatCheap
172 -- * Slow, but general, implementations
174 -- * Slow, but general, implementations
173 , slowHeadE
175 , slowHeadE
174 ) where
176 ) where
@@ -180,7 +182,7 @@ import Prelude hiding (zip, zipWith)
180import Data.These.Combinators (justThese)
182import Data.These.Combinators (justThese)
181#endif
183#endif
182#if MIN_VERSION_semialign(1,1,0)
184#if MIN_VERSION_semialign(1,1,0)
183−import Data.Zip (Zip (..), Unzip (..))
185+import Data.Zip (Zip (..))
184#endif
186#endif
185#endif
187#endif
186
188
@@ -196,8 +198,7 @@ import Data.Align
196import Data.Bifunctor
198import Data.Bifunctor
197import Data.Coerce
199import Data.Coerce
198import Data.Default
200import Data.Default
199−import Data.Dependent.Map (DMap)
201+import Data.Dependent.Map (DMap, DSum (..))
200−import Data.Dependent.Sum (DSum (..))
201import qualified Data.Dependent.Map as DMap
202import qualified Data.Dependent.Map as DMap
202import Data.Functor.Compose
203import Data.Functor.Compose
203import Data.Functor.Product
204import Data.Functor.Product
@@ -211,7 +212,8 @@ import Data.IntMap.Strict (IntMap)
211import qualified Data.IntMap.Strict as IntMap
212import qualified Data.IntMap.Strict as IntMap
212import Data.List.NonEmpty (NonEmpty (..))
213import Data.List.NonEmpty (NonEmpty (..))
213import Data.Map (Map)
214import Data.Map (Map)
215+import qualified Data.Map as Map
214−import Data.Semigroup (Semigroup (..))
216+import Data.Semigroup (Semigroup, sconcat, stimes, (<>))
215import Data.Some (Some(Some))
217import Data.Some (Some(Some))
216import Data.String
218import Data.String
217import Data.These
219import Data.These
@@ -421,13 +423,6 @@ class MonadSample t m => MonadHold t m where
421 -- | Create a new 'Event' that only occurs only once, on the first occurrence of
423 -- | Create a new 'Event' that only occurs only once, on the first occurrence of
422 -- the supplied 'Event'.
424 -- the supplied 'Event'.
423 headE :: Event t a -> m (Event t a)
425 headE :: Event t a -> m (Event t a)
424− -- | An event which only occurs at the current moment in time, such that:
425− --
426− -- > coincidence (pushAlways (\a -> (a <$) <$> now) e) = e
427− --
428− now :: m (Event t ())
429− default now :: (m ~ f m', MonadTrans f, MonadHold t m') => m (Event t ())
430− now = lift now
431
426
432-- | Accumulate an 'Incremental' with the supplied initial value and the firings of the provided 'Event',
427-- | Accumulate an 'Incremental' with the supplied initial value and the firings of the provided 'Event',
433-- using the combining function to produce a patch.
428-- using the combining function to produce a patch.
@@ -573,7 +568,6 @@ instance MonadHold t m => MonadHold t (ReaderT r m) where
573 holdIncremental a0 = lift . holdIncremental a0
568 holdIncremental a0 = lift . holdIncremental a0
574 buildDynamic a0 = lift . buildDynamic a0
569 buildDynamic a0 = lift . buildDynamic a0
575 headE = lift . headE
570 headE = lift . headE
576− now = lift now
577
571
578instance (MonadSample t m, Monoid r) => MonadSample t (WriterT r m) where
572instance (MonadSample t m, Monoid r) => MonadSample t (WriterT r m) where
579 sample = lift . sample
573 sample = lift . sample
@@ -584,7 +578,6 @@ instance (MonadHold t m, Monoid r) => MonadHold t (WriterT r m) where
584 holdIncremental a0 = lift . holdIncremental a0
578 holdIncremental a0 = lift . holdIncremental a0
585 buildDynamic a0 = lift . buildDynamic a0
579 buildDynamic a0 = lift . buildDynamic a0
586 headE = lift . headE
580 headE = lift . headE
587− now = lift now
588
581
589instance MonadSample t m => MonadSample t (StateT s m) where
582instance MonadSample t m => MonadSample t (StateT s m) where
590 sample = lift . sample
583 sample = lift . sample
@@ -595,7 +588,6 @@ instance MonadHold t m => MonadHold t (StateT s m) where
595 holdIncremental a0 = lift . holdIncremental a0
588 holdIncremental a0 = lift . holdIncremental a0
596 buildDynamic a0 = lift . buildDynamic a0
589 buildDynamic a0 = lift . buildDynamic a0
597 headE = lift . headE
590 headE = lift . headE
598− now = lift now
599
591
600instance MonadSample t m => MonadSample t (ExceptT e m) where
592instance MonadSample t m => MonadSample t (ExceptT e m) where
601 sample = lift . sample
593 sample = lift . sample
@@ -606,7 +598,6 @@ instance MonadHold t m => MonadHold t (ExceptT e m) where
606 holdIncremental a0 = lift . holdIncremental a0
598 holdIncremental a0 = lift . holdIncremental a0
607 buildDynamic a0 = lift . buildDynamic a0
599 buildDynamic a0 = lift . buildDynamic a0
608 headE = lift . headE
600 headE = lift . headE
609− now = lift now
610
601
611instance (MonadSample t m, Monoid w) => MonadSample t (RWST r w s m) where
602instance (MonadSample t m, Monoid w) => MonadSample t (RWST r w s m) where
612 sample = lift . sample
603 sample = lift . sample
@@ -617,7 +608,6 @@ instance (MonadHold t m, Monoid w) => MonadHold t (RWST r w s m) where
617 holdIncremental a0 = lift . holdIncremental a0
608 holdIncremental a0 = lift . holdIncremental a0
618 buildDynamic a0 = lift . buildDynamic a0
609 buildDynamic a0 = lift . buildDynamic a0
619 headE = lift . headE
610 headE = lift . headE
620− now = lift now
621
611
622instance MonadSample t m => MonadSample t (ContT r m) where
612instance MonadSample t m => MonadSample t (ContT r m) where
623 sample = lift . sample
613 sample = lift . sample
@@ -628,7 +618,6 @@ instance MonadHold t m => MonadHold t (ContT r m) where
628 holdIncremental a0 = lift . holdIncremental a0
618 holdIncremental a0 = lift . holdIncremental a0
629 buildDynamic a0 = lift . buildDynamic a0
619 buildDynamic a0 = lift . buildDynamic a0
630 headE = lift . headE
620 headE = lift . headE
631− now = lift now
632
621
633--------------------------------------------------------------------------------
622--------------------------------------------------------------------------------
634-- Convenience functions
623-- Convenience functions
@@ -753,11 +742,6 @@ instance Reflex t => Functor (Event t) where
753 {-# INLINE (<$) #-}
742 {-# INLINE (<$) #-}
754 x <$ e = fmapCheap (const x) e
743 x <$ e = fmapCheap (const x) e
755
744
756−-- TODO Remove this instance
757−instance Reflex t => FunctorMaybe (Event t) where
758− {-# INLINE fmapMaybe #-}
759− fmapMaybe = mapMaybe
760−
761instance Reflex t => Filterable (Event t) where
745instance Reflex t => Filterable (Event t) where
762 {-# INLINE mapMaybe #-}
746 {-# INLINE mapMaybe #-}
763 mapMaybe f = push $ return . f
747 mapMaybe f = push $ return . f
@@ -911,6 +895,12 @@ instance (Semigroup a, Reflex t) => Semigroup (Event t a) where
911 sconcat = fmap sconcat . mergeList . toList
895 sconcat = fmap sconcat . mergeList . toList
912 stimes n = fmap $ stimes n
896 stimes n = fmap $ stimes n
913
897
898+sconcatCheap :: (Semigroup a, Reflex t) => NonEmpty (Event t a) -> Event t a
899+sconcatCheap = fmapCheap sconcat . mergeList . toList
900+
901+mconcatCheap :: (Semigroup a, Reflex t) => [Event t a] -> Event t a
902+mconcatCheap = fmapCheap sconcat . mergeList
903+
914instance (Semigroup a, Reflex t) => Monoid (Event t a) where
904instance (Semigroup a, Reflex t) => Monoid (Event t a) where
915 mempty = never
905 mempty = never
916 mappend = (<>)
906 mappend = (<>)
@@ -925,6 +915,8 @@ mergeWith = mergeWith' id
925
915
926{-# INLINE mergeWith' #-}
916{-# INLINE mergeWith' #-}
927mergeWith' :: Reflex t => (a -> b) -> (b -> b -> b) -> [Event t a] -> Event t b
917mergeWith' :: Reflex t => (a -> b) -> (b -> b -> b) -> [Event t a] -> Event t b
918+mergeWith' _ _ [] = never
919+mergeWith' f _ [e] = fmap f e
928mergeWith' f g es = fmap (Prelude.foldl1 g . fmap f)
920mergeWith' f g es = fmap (Prelude.foldl1 g . fmap f)
929 . mergeInt
921 . mergeInt
930 . IntMap.fromDistinctAscList
922 . IntMap.fromDistinctAscList
@@ -942,6 +934,7 @@ leftmost = mergeWith const
942-- time.
934-- time.
943mergeList :: Reflex t => [Event t a] -> Event t (NonEmpty a)
935mergeList :: Reflex t => [Event t a] -> Event t (NonEmpty a)
944mergeList [] = never
936mergeList [] = never
937+mergeList [e] = fmapCheap (:|[]) e
945mergeList es = mergeWithFoldCheap' id es
938mergeList es = mergeWithFoldCheap' id es
946
939
947unsafeMapIncremental
940unsafeMapIncremental
@@ -958,10 +951,6 @@ unsafeMapIncremental f g a = unsafeBuildIncremental (fmap f $ sample $ currentIn
958mergeMap :: (Reflex t, Ord k) => Map k (Event t a) -> Event t (Map k a)
951mergeMap :: (Reflex t, Ord k) => Map k (Event t a) -> Event t (Map k a)
959mergeMap = fmap dmapToMap . merge . mapWithFunctorToDMap
952mergeMap = fmap dmapToMap . merge . mapWithFunctorToDMap
960
953
961−-- | Like 'mergeMap' but for 'IntMap'.
962−mergeIntMap :: Reflex t => IntMap (Event t a) -> Event t (IntMap a)
963−mergeIntMap = fmap dmapToIntMap . merge . intMapWithFunctorToDMap
964−
965-- | Create a merge whose parents can change over time
954-- | Create a merge whose parents can change over time
966mergeMapIncremental :: (Reflex t, Ord k) => Incremental t (PatchMap k (Event t a)) -> Event t (Map k a)
955mergeMapIncremental :: (Reflex t, Ord k) => Incremental t (PatchMap k (Event t a)) -> Event t (Map k a)
967mergeMapIncremental = fmap dmapToMap . mergeIncremental . unsafeMapIncremental mapWithFunctorToDMap (const2PatchDMapWith id)
956mergeMapIncremental = fmap dmapToMap . mergeIncremental . unsafeMapIncremental mapWithFunctorToDMap (const2PatchDMapWith id)
@@ -1038,33 +1027,45 @@ switchHoldPromptly ea0 eea = do
1038switchHoldPromptOnly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1027switchHoldPromptOnly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1039switchHoldPromptOnly e0 e' = do
1028switchHoldPromptOnly e0 e' = do
1040 eLag <- switch <$> hold e0 e'
1029 eLag <- switch <$> hold e0 e'
1041− return $ coincidence $ leftmost [e', eLag <$ eLag]
1030+ return $ fmapMaybeCheap id $ leftmost
1031+ [ fmapCheap Just $ coincidence e'
1032+ , fmapCheap (const Nothing) e'
1033+ , fmapCheap Just eLag
1034+ ]
1042
1035
1043-- | When the given outer event fires, condense the inner events into the contained patch. Non-firing inner events will be replaced with deletions.
1036-- | When the given outer event fires, condense the inner events into the contained patch. Non-firing inner events will be replaced with deletions.
1044coincidencePatchMap :: (Reflex t, Ord k) => Event t (PatchMap k (Event t v)) -> Event t (PatchMap k v)
1037coincidencePatchMap :: (Reflex t, Ord k) => Event t (PatchMap k (Event t v)) -> Event t (PatchMap k v)
1045−coincidencePatchMap e = fmapCheap PatchMap $ coincidence $ ffor e $ \(PatchMap m) -> mergeMap $ ffor m $ \case
1038+coincidencePatchMap e = fmapCheap PatchMap $ coincidence $ fforCheap e $ \(PatchMap m) -> if Map.null m then never else
1039+ let firingNewItems = mergeMap $ fforMaybe m $ \case
1046− Nothing -> fmapCheap (const Nothing) e
1040+ Nothing -> Nothing
1047− Just ev -> leftmost [fmapCheap Just ev, fmapCheap (const Nothing) e]
1041+ Just ev -> Just $ fmapCheap Just ev
1042+ oldItemMask = (Nothing <$ m) <$ e
1043+ in alignWith (mergeThese Map.union) firingNewItems oldItemMask -- Must be left-biased
1048
1044
1049-- | See 'coincidencePatchMap'
1045-- | See 'coincidencePatchMap'
1050coincidencePatchIntMap :: Reflex t => Event t (PatchIntMap (Event t v)) -> Event t (PatchIntMap v)
1046coincidencePatchIntMap :: Reflex t => Event t (PatchIntMap (Event t v)) -> Event t (PatchIntMap v)
1051−coincidencePatchIntMap e = fmapCheap PatchIntMap $ coincidence $ ffor e $ \(PatchIntMap m) -> mergeIntMap $ ffor m $ \case
1047+coincidencePatchIntMap e = fmapCheap PatchIntMap $ coincidence $ fforCheap e $ \(PatchIntMap m) -> if IntMap.null m then never else
1048+ let firingNewItems = mergeIntMap $ fforMaybe m $ \case
1052− Nothing -> fmapCheap (const Nothing) e
1049+ Nothing -> Nothing
1053− Just ev -> leftmost [fmapCheap Just ev, fmapCheap (const Nothing) e]
1050+ Just ev -> Just $ fmapCheap Just ev
1051+ oldItemMask = (Nothing <$ m) <$ e
1052+ in alignWith (mergeThese IntMap.union) firingNewItems oldItemMask -- Must be left-biased
1054
1053
1055-- | See 'coincidencePatchMap'
1054-- | See 'coincidencePatchMap'
1056coincidencePatchMapWithMove :: (Reflex t, Ord k) => Event t (PatchMapWithMove k (Event t v)) -> Event t (PatchMapWithMove k v)
1055coincidencePatchMapWithMove :: (Reflex t, Ord k) => Event t (PatchMapWithMove k (Event t v)) -> Event t (PatchMapWithMove k v)
1056+coincidencePatchMapWithMove e = fmapCheap unsafePatchMapWithMove $ coincidence $ fforCheap e $ \p -> if Map.null (unPatchMapWithMove p) then never else
1057−coincidencePatchMapWithMove e = fmapCheap unsafePatchMapWithMove $ coincidence $ ffor e $ \p -> mergeMap $ ffor (unPatchMapWithMove p) $ \ni -> case PatchMapWithMove._nodeInfo_from ni of
1057+ let firingNewItems = mergeMap $ fforMaybe (unPatchMapWithMove p) $ \ni -> case PatchMapWithMove._nodeInfo_from ni of
1058− PatchMapWithMove.From_Delete -> fforCheap e $ \_ ->
1058+ PatchMapWithMove.From_Insert ev -> Just $ fforCheap ev $ \v ->
1059− ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Delete }
1059+ ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Insert v }
1060− PatchMapWithMove.From_Move k -> fforCheap e $ \_ ->
1060+ _ -> Nothing
1061+ oldItemMask = fforCheap e $ \_ -> ffor (unPatchMapWithMove p) $ \ni -> case PatchMapWithMove._nodeInfo_from ni of
1062+ PatchMapWithMove.From_Delete ->
1061− ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Move k }
1063+ ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Delete }
1062− PatchMapWithMove.From_Insert ev -> leftmost
1064+ PatchMapWithMove.From_Move k ->
1063− [ fforCheap ev $ \v ->
1064− ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Insert v }
1065+ ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Move k }
1065− , fforCheap e $ \_ ->
1066+ PatchMapWithMove.From_Insert _ ->
1066− ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Delete }
1067+ ni { PatchMapWithMove._nodeInfo_from = PatchMapWithMove.From_Delete }
1067− ]
1068+ in alignWith (mergeThese Map.union) firingNewItems oldItemMask -- Must be left-biased
1068
1069
1069-- | Given a 'PatchTarget' of events (e.g., a 'Map' with 'Event' values) and an event of 'Patch'es
1070-- | Given a 'PatchTarget' of events (e.g., a 'Map' with 'Event' values) and an event of 'Patch'es
1070-- (e.g., a 'PatchMap' with 'Event' values), produce an 'Event' of the 'PatchTarget' type that
1071-- (e.g., a 'PatchMap' with 'Event' values), produce an 'Event' of the 'PatchTarget' type that
@@ -1105,12 +1106,6 @@ instance Reflex t => Zip (Event t) where
1105 zip x y = mapMaybe justThese $ align x y
1106 zip x y = mapMaybe justThese $ align x y
1106#endif
1107#endif
1107
1108
1108−#ifdef MIN_VERSION_semialign
1109−#if MIN_VERSION_semialign(1,1,0)
1110−instance Reflex t => Unzip (Event t) where
1111− unzip = splitE
1112−#endif
1113−#endif
1114
1109
1115-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and
1110-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and
1116-- the 'Behavior' is true at the time of occurrence.
1111-- the 'Behavior' is true at the time of occurrence.
@@ -1323,7 +1318,7 @@ accumMaybeMDyn
1323 -> Event t b
1318 -> Event t b
1324 -> m (Dynamic t a)
1319 -> m (Dynamic t a)
1325accumMaybeMDyn f z e = do
1320accumMaybeMDyn f z e = do
1326− rec let e' = flip push e $ \o -> do
1321+ rec let e' = flip pushCheap e $ \o -> do
1327 v <- sample $ current d'
1322 v <- sample $ current d'
1328 f v o
1323 f v o
1329 d' <- holdDyn z e'
1324 d' <- holdDyn z e'
@@ -1379,8 +1374,8 @@ mapAccumMaybeMDyn f z e = do
1379 return $ case result of
1374 return $ case result of
1380 (Nothing, Nothing) -> Nothing
1375 (Nothing, Nothing) -> Nothing
1381 _ -> Just result
1376 _ -> Just result
1382− d' <- holdDyn z $ mapMaybe fst e'
1377+ d' <- holdDyn z $ fmapMaybeCheap fst e'
1383− return (d', mapMaybe snd e')
1378+ return (d', fmapMaybeCheap snd e')
1384
1379
1385-- | Accumulate a 'Behavior' by folding occurrences of an 'Event'
1380-- | Accumulate a 'Behavior' by folding occurrences of an 'Event'
1386-- with the provided function.
1381-- with the provided function.
@@ -1418,7 +1413,7 @@ accumMaybeB f = accumMaybeMB $ \v o -> return $ f v o
1418{-# INLINE accumMaybeMB #-}
1413{-# INLINE accumMaybeMB #-}
1419accumMaybeMB :: (Reflex t, MonadHold t m, MonadFix m) => (a -> b -> PushM t (Maybe a)) -> a -> Event t b -> m (Behavior t a)
1414accumMaybeMB :: (Reflex t, MonadHold t m, MonadFix m) => (a -> b -> PushM t (Maybe a)) -> a -> Event t b -> m (Behavior t a)
1420accumMaybeMB f z e = do
1415accumMaybeMB f z e = do
1421− rec let e' = flip push e $ \o -> do
1416+ rec let e' = flip pushCheap e $ \o -> do
1422 v <- sample d'
1417 v <- sample d'
1423 f v o
1418 f v o
1424 d' <- hold z e'
1419 d' <- hold z e'
@@ -1468,8 +1463,8 @@ mapAccumMaybeMB f z e = do
1468 return $ case result of
1463 return $ case result of
1469 (Nothing, Nothing) -> Nothing
1464 (Nothing, Nothing) -> Nothing
1470 _ -> Just result
1465 _ -> Just result
1471− d' <- hold z $ mapMaybe fst e'
1466+ d' <- hold z $ fmapMaybeCheap fst e'
1472− return (d', mapMaybe snd e')
1467+ return (d', fmapMaybeCheap snd e')
1473
1468
1474-- | Accumulate occurrences of an 'Event', producing an output occurrence each
1469-- | Accumulate occurrences of an 'Event', producing an output occurrence each
1475-- time. Discard the underlying 'Accumulator'.
1470-- time. Discard the underlying 'Accumulator'.
@@ -1679,6 +1674,8 @@ mergeWithCheap' f g = mergeWithFoldCheap' $ foldl1 g . fmap f
1679-- | A "cheap" version of 'mergeWithFoldCheap''. See the performance note on 'pushCheap'.
1674-- | A "cheap" version of 'mergeWithFoldCheap''. See the performance note on 'pushCheap'.
1680{-# INLINE mergeWithFoldCheap' #-}
1675{-# INLINE mergeWithFoldCheap' #-}
1681mergeWithFoldCheap' :: Reflex t => (NonEmpty a -> b) -> [Event t a] -> Event t b
1676mergeWithFoldCheap' :: Reflex t => (NonEmpty a -> b) -> [Event t a] -> Event t b
1677+mergeWithFoldCheap' _ [] = never
1678+mergeWithFoldCheap' f [e] = fmapCheap (f . (:|[])) e
1682mergeWithFoldCheap' f es =
1679mergeWithFoldCheap' f es =
1683 fmapCheap (f . (\(h : t) -> h :| t) . IntMap.elems)
1680 fmapCheap (f . (\(h : t) -> h :| t) . IntMap.elems)
1684 . mergeInt
1681 . mergeInt
@@ -1693,7 +1690,18 @@ mergeWithFoldCheap' f es =
1693-- | See 'switchHoldPromptly'
1690-- | See 'switchHoldPromptly'
1694switchPromptly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1691switchPromptly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1695switchPromptly = switchHoldPromptly
1692switchPromptly = switchHoldPromptly
1693+
1696{-# DEPRECATED switchPromptOnly "Use 'switchHoldPromptOnly' instead. The 'switchHold*' naming convention was chosen because those functions are more closely related to each other than they are to 'switch'. " #-}
1694{-# DEPRECATED switchPromptOnly "Use 'switchHoldPromptOnly' instead. The 'switchHold*' naming convention was chosen because those functions are more closely related to each other than they are to 'switch'. " #-}
1697-- | See 'switchHoldPromptOnly'
1695-- | See 'switchHoldPromptOnly'
1698switchPromptOnly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1696switchPromptOnly :: (Reflex t, MonadHold t m) => Event t a -> Event t (Event t a) -> m (Event t a)
1699switchPromptOnly = switchHoldPromptOnly
1697switchPromptOnly = switchHoldPromptOnly
1698+
1699+{-# DEPRECATED mergeIntMap "Use 'mergeInt' instead" #-}
1700+-- | Like 'mergeMap' but for 'IntMap'.
1701+mergeIntMap :: Reflex t => IntMap (Event t a) -> Event t (IntMap a)
1702+mergeIntMap = mergeInt
1703+
1704+-- NOTE: A deprecation warning is expected on this instance
1705+instance Reflex t => FunctorMaybe (Event t) where
1706+ {-# INLINE fmapMaybe #-}
1707+ fmapMaybe = mapMaybe
src/Reflex/Dynamic.hs+2−16
@@ -53,12 +53,10 @@ module Reflex.Dynamic
53 , foldDynMaybe
53 , foldDynMaybe
54 , foldDynMaybeM
54 , foldDynMaybeM
55 , joinDynThroughMap
55 , joinDynThroughMap
56− , joinDynThroughIntMap
57 , traceDyn
56 , traceDyn
58 , traceDynWith
57 , traceDynWith
59 , splitDynPure
58 , splitDynPure
60 , distributeMapOverDynPure
59 , distributeMapOverDynPure
61− , distributeIntMapOverDynPure
62 , distributeDMapOverDynPure
60 , distributeDMapOverDynPure
63 , distributeListOverDynPure
61 , distributeListOverDynPure
64 , Demux
62 , Demux
@@ -82,7 +80,6 @@ import Data.Functor.Compose
82import Data.Functor.Misc
80import Data.Functor.Misc
83import Reflex.Class
81import Reflex.Class
84
82
85−import Control.Monad
86import Control.Monad.Fix
83import Control.Monad.Fix
87import Control.Monad.Identity
84import Control.Monad.Identity
88import Data.Align
85import Data.Align
@@ -90,8 +87,6 @@ import Data.Dependent.Map (DMap)
90import qualified Data.Dependent.Map as DMap
87import qualified Data.Dependent.Map as DMap
91import Data.Dependent.Sum (DSum (..))
88import Data.Dependent.Sum (DSum (..))
92import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))
89import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))
93−import Data.IntMap (IntMap)
94−import qualified Data.IntMap as IntMap
95import Data.Map (Map)
90import Data.Map (Map)
96import Data.Maybe
91import Data.Maybe
97import Data.Monoid ((<>))
92import Data.Monoid ((<>))
@@ -196,6 +191,7 @@ switchPromptlyDyn de =
196 let eLag = switch $ current de
191 let eLag = switch $ current de
197 eCoincidences = coincidence $ updated de
192 eCoincidences = coincidence $ updated de
198 in leftmost [eCoincidences, eLag]
193 in leftmost [eCoincidences, eLag]
194+--TODO: switchPromptlyDyn should get the `only` treatment like switchHoldPromptOnly
199
195
200-- | Split a 'Dynamic' pair into a pair of 'Dynamic's
196-- | Split a 'Dynamic' pair into a pair of 'Dynamic's
201splitDynPure :: Reflex t => Dynamic t (a, b) -> (Dynamic t a, Dynamic t b)
197splitDynPure :: Reflex t => Dynamic t (a, b) -> (Dynamic t a, Dynamic t b)
@@ -206,11 +202,6 @@ splitDynPure d = (fmap fst d, fmap snd d)
206distributeMapOverDynPure :: (Reflex t, Ord k) => Map k (Dynamic t v) -> Dynamic t (Map k v)
202distributeMapOverDynPure :: (Reflex t, Ord k) => Map k (Dynamic t v) -> Dynamic t (Map k v)
207distributeMapOverDynPure = fmap dmapToMap . distributeDMapOverDynPure . mapWithFunctorToDMap
203distributeMapOverDynPure = fmap dmapToMap . distributeDMapOverDynPure . mapWithFunctorToDMap
208
204
209−-- | Convert an 'IntMap' with 'Dynamic' elements into a 'Dynamic' of an 'IntMap' with
210−-- non-'Dynamic' elements.
211−distributeIntMapOverDynPure :: (Reflex t) => IntMap (Dynamic t v) -> Dynamic t (IntMap v)
212−distributeIntMapOverDynPure = fmap dmapToIntMap . distributeDMapOverDynPure . intMapWithFunctorToDMap
213−
214-- | Convert a list with 'Dynamic' elements into a 'Dynamic' of a list with
205-- | Convert a list with 'Dynamic' elements into a 'Dynamic' of a list with
215-- non-'Dynamic' elements, preserving the order of the elements.
206-- non-'Dynamic' elements, preserving the order of the elements.
216{-# DEPRECATED distributeListOverDynPure "Use 'distributeListOverDyn' instead" #-}
207{-# DEPRECATED distributeListOverDynPure "Use 'distributeListOverDyn' instead" #-}
@@ -223,11 +214,6 @@ distributeListOverDynPure = distributeListOverDyn
223joinDynThroughMap :: forall t k a. (Reflex t, Ord k) => Dynamic t (Map k (Dynamic t a)) -> Dynamic t (Map k a)
214joinDynThroughMap :: forall t k a. (Reflex t, Ord k) => Dynamic t (Map k (Dynamic t a)) -> Dynamic t (Map k a)
224joinDynThroughMap = (distributeMapOverDynPure =<<)
215joinDynThroughMap = (distributeMapOverDynPure =<<)
225
216
226−-- | Combine a 'Dynamic' of an 'IntMap' of 'Dynamic's into a 'Dynamic'
227−-- with the current values of the 'Dynamic's in a map.
228−joinDynThroughIntMap :: forall t a. (Reflex t) => Dynamic t (IntMap (Dynamic t a)) -> Dynamic t (IntMap a)
229−joinDynThroughIntMap = (distributeIntMapOverDynPure =<<)
230−
231-- | Print the value of the 'Dynamic' when it is first read and on each
217-- | Print the value of the 'Dynamic' when it is first read and on each
232-- subsequent change that is observed (as 'traceEvent'), prefixed with the
218-- subsequent change that is observed (as 'traceEvent'), prefixed with the
233-- provided string. This should /only/ be used for debugging.
219-- provided string. This should /only/ be used for debugging.
@@ -348,7 +334,7 @@ factorDyn d = buildDynamic (sample (current d) >>= holdKey) update where
348--
334--
349-- > demuxed (demux d) k === fmap (== k) d
335-- > demuxed (demux d) k === fmap (== k) d
350--
336--
351−-- However, when 'demuxed' is used multiple times, the complexity is only
337+-- However, when getDemuxed is used multiple times, the complexity is only
352-- /O(log(n))/, rather than /O(n)/ for fmap.
338-- /O(log(n))/, rather than /O(n)/ for fmap.
353data Demux t k = Demux { demuxValue :: Behavior t k
339data Demux t k = Demux { demuxValue :: Behavior t k
354 , demuxSelector :: EventSelector t (Const2 k Bool)
340 , demuxSelector :: EventSelector t (Const2 k Bool)
src/Reflex/DynamicWriter/Base.hs+4−13
@@ -22,7 +22,6 @@ module Reflex.DynamicWriter.Base
22import Control.Monad.Exception
22import Control.Monad.Exception
23import Control.Monad.Identity
23import Control.Monad.Identity
24import Control.Monad.IO.Class
24import Control.Monad.IO.Class
25−import Control.Monad.Morph
26import Control.Monad.Primitive
25import Control.Monad.Primitive
27import Control.Monad.Reader
26import Control.Monad.Reader
28import Control.Monad.Ref
27import Control.Monad.Ref
@@ -52,6 +51,9 @@ import Reflex.Query.Class
52import Reflex.Requester.Class
51import Reflex.Requester.Class
53import Reflex.TriggerEvent.Class
52import Reflex.TriggerEvent.Class
54
53
54+instance MonadTrans (DynamicWriterT t w) where
55+ lift = DynamicWriterT . lift
56+
55mapIncrementalMapValues :: (Reflex t, Patch (p v), Patch (p v'), PatchTarget (p v) ~ f v, PatchTarget (p v') ~ f v', Functor p, Functor f) => (v -> v') -> Incremental t (p v) -> Incremental t (p v')
57mapIncrementalMapValues :: (Reflex t, Patch (p v), Patch (p v'), PatchTarget (p v) ~ f v, PatchTarget (p v') ~ f v', Functor p, Functor f) => (v -> v') -> Incremental t (p v) -> Incremental t (p v')
56mapIncrementalMapValues f = unsafeMapIncremental (fmap f) (fmap f)
58mapIncrementalMapValues f = unsafeMapIncremental (fmap f) (fmap f)
57
59
@@ -88,18 +90,7 @@ mergeDynIncrementalWithMove a = unsafeBuildIncremental (mapM (sample . current)
88
90
89-- | A basic implementation of 'DynamicWriter'.
91-- | A basic implementation of 'DynamicWriter'.
90newtype DynamicWriterT t w m a = DynamicWriterT { unDynamicWriterT :: StateT [Dynamic t w] m a }
92newtype DynamicWriterT t w m a = DynamicWriterT { unDynamicWriterT :: StateT [Dynamic t w] m a }
91− -- The list is kept in reverse order
93+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadAsyncException, MonadException) -- The list is kept in reverse order
92− deriving
93− ( Functor
94− , Applicative
95− , Monad
96− , MonadTrans
97− , MFunctor
98− , MonadIO
99− , MonadFix
100− , MonadAsyncException
101− , MonadException
102− )
103
94
104deriving instance MonadHold t m => MonadHold t (DynamicWriterT t w m)
95deriving instance MonadHold t m => MonadHold t (DynamicWriterT t w m)
105deriving instance MonadSample t m => MonadSample t (DynamicWriterT t w m)
96deriving instance MonadSample t m => MonadSample t (DynamicWriterT t w m)
src/Reflex/EventWriter/Base.hs+11−70
@@ -35,98 +35,41 @@ import Reflex.TriggerEvent.Class
35
35
36import Control.Monad.Exception
36import Control.Monad.Exception
37import Control.Monad.Identity
37import Control.Monad.Identity
38−import Control.Monad.Morph
39import Control.Monad.Primitive
38import Control.Monad.Primitive
40import Control.Monad.Reader
39import Control.Monad.Reader
41import Control.Monad.Ref
40import Control.Monad.Ref
42import Control.Monad.State.Strict
41import Control.Monad.State.Strict
43import Data.Dependent.Map (DMap)
42import Data.Dependent.Map (DMap)
44import qualified Data.Dependent.Map as DMap
43import qualified Data.Dependent.Map as DMap
45−import Data.Dependent.Sum (DSum (..))
46import Data.Functor.Compose
44import Data.Functor.Compose
47import Data.Functor.Misc
45import Data.Functor.Misc
48−import Data.GADT.Compare (GCompare (..), GEq (..), GOrdering (..))
46+import Data.GADT.Compare (GCompare (..))
49import Data.IntMap.Strict (IntMap)
47import Data.IntMap.Strict (IntMap)
50import qualified Data.IntMap.Strict as IntMap
48import qualified Data.IntMap.Strict as IntMap
51import Data.List.NonEmpty (NonEmpty (..))
49import Data.List.NonEmpty (NonEmpty (..))
50+import Data.List.Deferred (Deferred)
51+import qualified Data.List.Deferred as Deferred
52import Data.Map (Map)
52import Data.Map (Map)
53import qualified Data.Map as Map
53import qualified Data.Map as Map
54import Data.Semigroup
54import Data.Semigroup
55import Data.Some (Some)
55import Data.Some (Some)
56import Data.Tuple
56import Data.Tuple
57−import Data.Type.Equality
58−
59−import Unsafe.Coerce
60−
61−{-# DEPRECATED TellId "Do not construct this directly; use tellId instead" #-}
62−newtype TellId w x
63− = TellId Int -- ^ WARNING: Do not construct this directly; use 'tellId' instead
64− deriving (Show, Eq, Ord, Enum)
65−
66−tellId :: Int -> TellId w w
67−tellId = TellId
68−{-# INLINE tellId #-}
69−
70−tellIdRefl :: TellId w x -> w :~: x
71−tellIdRefl _ = unsafeCoerce Refl
72−
73−withTellIdRefl :: TellId w x -> (w ~ x => r) -> r
74−withTellIdRefl tid r = case tellIdRefl tid of
75− Refl -> r
76−
77−instance GEq (TellId w) where
78− a `geq` b =
79− withTellIdRefl a $
80− withTellIdRefl b $
81− if a == b
82− then Just Refl
83− else Nothing
84−
85−instance GCompare (TellId w) where
86− a `gcompare` b =
87− withTellIdRefl a $
88− withTellIdRefl b $
89− case a `compare` b of
90− LT -> GLT
91− EQ -> GEQ
92− GT -> GGT
93−
94−data EventWriterState t w = EventWriterState
95− { _eventWriterState_nextId :: {-# UNPACK #-} !Int -- Always negative (and decreasing over time)
96− , _eventWriterState_told :: ![DSum (TellId w) (Event t)] -- In increasing order
97− }
98
57
99-- | A basic implementation of 'EventWriter'.
58-- | A basic implementation of 'EventWriter'.
100−newtype EventWriterT t w m a = EventWriterT { unEventWriterT :: StateT (EventWriterState t w) m a }
59+newtype EventWriterT t w m a = EventWriterT { unEventWriterT :: StateT (Deferred (Event t w)) m a }
101− deriving
60+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)
102− ( Functor
103− , Applicative
104− , Monad
105− , MonadTrans
106− , MFunctor
107− , MonadFix
108− , MonadIO
109− , MonadException
110− , MonadAsyncException
111− )
112
61
113-- | Run a 'EventWriterT' action.
62-- | Run a 'EventWriterT' action.
114runEventWriterT :: forall t m w a. (Reflex t, Monad m, Semigroup w) => EventWriterT t w m a -> m (a, Event t w)
63runEventWriterT :: forall t m w a. (Reflex t, Monad m, Semigroup w) => EventWriterT t w m a -> m (a, Event t w)
115runEventWriterT (EventWriterT a) = do
64runEventWriterT (EventWriterT a) = do
116− (result, requests) <- runStateT a $ EventWriterState (-1) []
65+ (result, requests) <- runStateT a mempty
117− let combineResults :: DMap (TellId w) Identity -> w
66+ return (result, mconcatCheap $ Deferred.toList requests)
118− combineResults = sconcat
119− . (\(h : t) -> h :| t) -- Unconditional; 'merge' guarantees that it will only fire with non-empty DMaps
120− . DMap.foldlWithKey (\vs tid (Identity v) -> withTellIdRefl tid $ v : vs) [] -- This is where we finally reverse the DMap to get things in the correct order
121− return (result, fmap combineResults $ merge $ DMap.fromDistinctAscList $ _eventWriterState_told requests) --TODO: We can probably make this fromDistinctAscList more efficient by knowing the length in advance, but this will require exposing internals of DMap; also converting it to use a strict list might help
122
67
123instance (Reflex t, Monad m, Semigroup w) => EventWriter t w (EventWriterT t w m) where
68instance (Reflex t, Monad m, Semigroup w) => EventWriter t w (EventWriterT t w m) where
124− tellEvent w = EventWriterT $ modify $ \old ->
69+ tellEvent w = EventWriterT $ modify (<> Deferred.singleton w)
125− let myId = _eventWriterState_nextId old
70+
126− in EventWriterState
71+instance MonadTrans (EventWriterT t w) where
127− { _eventWriterState_nextId = pred myId
72+ lift = EventWriterT . lift
128− , _eventWriterState_told = (tellId myId :=> w) : _eventWriterState_told old
129− }
130
73
131instance MonadSample t m => MonadSample t (EventWriterT t w m) where
74instance MonadSample t m => MonadSample t (EventWriterT t w m) where
132 sample = lift . sample
75 sample = lift . sample
@@ -142,8 +85,6 @@ instance MonadHold t m => MonadHold t (EventWriterT t w m) where
142 buildDynamic a0 = lift . buildDynamic a0
85 buildDynamic a0 = lift . buildDynamic a0
143 {-# INLINABLE headE #-}
86 {-# INLINABLE headE #-}
144 headE = lift . headE
87 headE = lift . headE
145− {-# INLINABLE now #-}
146− now = lift now
147
88
148instance (Reflex t, Adjustable t m, MonadHold t m, Semigroup w) => Adjustable t (EventWriterT t w m) where
89instance (Reflex t, Adjustable t m, MonadHold t m, Semigroup w) => Adjustable t (EventWriterT t w m) where
149 runWithReplace = runWithReplaceEventWriterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'
90 runWithReplace = runWithReplaceEventWriterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'
src/Reflex/FanTag.hsnew file+23
@@ -0,0 +1,23 @@
1+{-# LANGUAGE PolyKinds #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+module Reflex.FanTag
4+ ( EventSelectorTag
5+ , unEventSelectorTag
6+ , fanTag
7+ , selectTag
8+ ) where
9+
10+import Data.Unique.Tag.Local
11+import Data.TagMap
12+import Reflex.Class
13+
14+import GHC.Exts (Any)
15+import Unsafe.Coerce
16+
17+newtype EventSelectorTag t x (v :: k -> *) = EventSelectorTag { unEventSelectorTag :: EventSelectorInt t Any }
18+
19+fanTag :: Reflex t => Event t (TagMap x v) -> EventSelectorTag t x v
20+fanTag = EventSelectorTag . fanInt . fmapCheap unTagMap
21+
22+selectTag :: forall t x v a. Reflex t => EventSelectorTag t x v -> Tag x a -> Event t (v a)
23+selectTag (EventSelectorTag s) = fmapCheap (unsafeCoerce :: Any -> v a) . selectInt s . tagId
src/Reflex/FastWeak.hs−10
@@ -151,16 +151,6 @@ getFastWeakTicket w = do
151
151
152-- | Create a 'FastWeakTicket' directly from a value, creating a 'FastWeak' in the process
152-- | Create a 'FastWeakTicket' directly from a value, creating a 'FastWeak' in the process
153-- which can be obtained with 'getFastWeakTicketValue'.
153-- which can be obtained with 'getFastWeakTicketValue'.
154−--
155−-- This function is marked NOINLINE so it is opaque to GHC.
156−-- If we do not do this, then GHC will sometimes fuse the constructor away
157−-- so any weak references that are attached to the ticket will have their
158−-- finalizer run. Using the opaque constructor, GHC does not see the
159−-- constructor application, so it behaves like an IORef and cannot be fused away.
160−--
161−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
162−-- the weak pointer to it in some cases.
163−{-# NOINLINE mkFastWeakTicket #-}
164mkFastWeakTicket :: a -> IO (FastWeakTicket a)
154mkFastWeakTicket :: a -> IO (FastWeakTicket a)
165-- I think it's fine if this is lazy - it'll retain the 'a', but so would the output; we just need to make sure it's forced before we start relying on the
155-- I think it's fine if this is lazy - it'll retain the 'a', but so would the output; we just need to make sure it's forced before we start relying on the
166-- associated FastWeak to actually be weak
156-- associated FastWeak to actually be weak
src/Reflex/Host/Headless.hsdeleted−128
@@ -1,128 +0,0 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE FlexibleContexts #-}
3−{-# LANGUAGE RankNTypes #-}
4−{-# LANGUAGE TypeFamilies #-}
5−{-# LANGUAGE ConstraintKinds #-}
6−
7−module Reflex.Host.Headless where
8−
9−import Control.Concurrent.Chan (newChan, readChan)
10−import Control.Monad (unless)
11−import Control.Monad.Fix (MonadFix, fix)
12−import Control.Monad.IO.Class (MonadIO, liftIO)
13−import Control.Monad.Primitive (PrimMonad)
14−import Control.Monad.Ref (MonadRef, Ref, readRef)
15−import Data.Dependent.Sum (DSum (..), (==>))
16−import Data.Foldable (for_)
17−import Data.Functor.Identity (Identity(..))
18−import Data.IORef (IORef, readIORef)
19−import Data.Maybe (catMaybes, fromMaybe)
20−import Data.Traversable (for)
21−
22−import Reflex
23−import Reflex.Host.Class
24−
25−type MonadHeadlessApp t m =
26− ( Adjustable t m
27− , MonadFix m
28− , MonadHold t m
29− , MonadIO (HostFrame t)
30− , MonadIO (Performable m)
31− , MonadIO m
32− , MonadRef (HostFrame t)
33− , NotReady t m
34− , PerformEvent t m
35− , PostBuild t m
36− , PrimMonad (HostFrame t)
37− , Ref (HostFrame t) ~ IORef
38− , Ref m ~ IORef
39− , Reflex t
40− , ReflexHost t
41− , TriggerEvent t m
42− )
43−
44−-- | Run a headless FRP network. Inside the action, you will most probably use
45−-- the capabilities provided by the 'TriggerEvent' and 'PerformEvent' type
46−-- classes to interface the FRP network with the outside world. Useful for
47−-- testing. Each headless network runs on its own spider timeline.
48−runHeadlessApp
49− :: (forall t m. MonadHeadlessApp t m => m (Event t ()))
50− -- ^ The action to be run in the headless FRP network. The FRP network is
51− -- closed at the first occurrence of the resulting 'Event'.
52− -> IO ()
53−runHeadlessApp guest =
54− -- We are using the 'Spider' implementation of reflex. Running the host
55− -- allows us to take actions on the FRP timeline.
56− withSpiderTimeline $ runSpiderHostForTimeline $ do
57− -- Create the "post-build" event and associated trigger. This event fires
58− -- once, when the application starts.
59− (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
60− -- Create a queue to which we will write 'Event's that need to be
61− -- processed.
62− events <- liftIO newChan
63− -- Run the "guest" application, providing the appropriate context. We'll
64− -- pure the result of the action, and a 'FireCommand' that will be used to
65− -- trigger events.
66− (result, fc@(FireCommand fire)) <- do
67− hostPerformEventT $ -- Allows the guest app to run
68− -- 'performEvent', so that actions
69− -- (e.g., IO actions) can be run when
70− -- 'Event's fire.
71−
72− flip runPostBuildT postBuild $ -- Allows the guest app to access to
73− -- a "post-build" 'Event'
74−
75− flip runTriggerEventT events $ -- Allows the guest app to create new
76− -- events and triggers and write
77− -- those triggers to a channel from
78− -- which they will be read and
79− -- processed.
80− guest
81−
82− -- Read the trigger reference for the post-build event. This will be
83− -- 'Nothing' if the guest application hasn't subscribed to this event.
84− mPostBuildTrigger <- readRef postBuildTriggerRef
85−
86− -- Subscribe to an 'Event' of that the guest application can use to
87− -- request application shutdown. We'll check whether this 'Event' is firing
88− -- to determine whether to terminate.
89− shutdown <- subscribeEvent result
90−
91− -- When there is a subscriber to the post-build event, fire the event.
92− soa <- for mPostBuildTrigger $ \postBuildTrigger ->
93− fire [postBuildTrigger :=> Identity ()] $ isFiring shutdown
94−
95− -- The main application loop. We wait for new events and fire those that
96− -- have subscribers. If we detect a shutdown request, the application
97− -- terminates.
98− unless (or (fromMaybe [] soa)) $ fix $ \loop -> do
99− -- Read the next event (blocking).
100− ers <- liftIO $ readChan events
101− stop <- do
102− -- Fire events that have subscribers.
103− fireEventTriggerRefs fc ers $
104− -- Check if the shutdown 'Event' is firing.
105− isFiring shutdown
106− if or stop
107− then pure ()
108− else loop
109− where
110− isFiring ev = readEvent ev >>= \case
111− Nothing -> pure False
112− Just _ -> pure True
113− -- Use the given 'FireCommand' to fire events that have subscribers
114− -- and call the callback for the 'TriggerInvocation' of each.
115− fireEventTriggerRefs
116− :: MonadIO m
117− => FireCommand t m
118− -> [DSum (EventTriggerRef t) TriggerInvocation]
119− -> ReadPhase m a
120− -> m [a]
121− fireEventTriggerRefs (FireCommand fire) ers rcb = do
122− mes <- liftIO $
123− for ers $ \(EventTriggerRef er :=> TriggerInvocation a _) -> do
124− me <- readIORef er
125− pure $ fmap (==> a) me
126− a <- fire (catMaybes mes) rcb
127− liftIO $ for_ ers $ \(_ :=> TriggerInvocation _ cb) -> cb
128− pure a
src/Reflex/NotReady/Class.hs+5
@@ -25,6 +25,7 @@ import Reflex.PerformEvent.Base (PerformEventT (..))
25import Reflex.PostBuild.Base (PostBuildT)
25import Reflex.PostBuild.Base (PostBuildT)
26import Reflex.Query.Base (QueryT)
26import Reflex.Query.Base (QueryT)
27import Reflex.Requester.Base (RequesterT)
27import Reflex.Requester.Base (RequesterT)
28+import Reflex.Requester.Base.Internal (RequesterInternalT)
28import Reflex.TriggerEvent.Base (TriggerEventT)
29import Reflex.TriggerEvent.Base (TriggerEventT)
29
30
30class Monad m => NotReady t m | m -> t where
31class Monad m => NotReady t m | m -> t where
@@ -72,6 +73,10 @@ instance NotReady t m => NotReady t (RequesterT t request response m) where
72 notReadyUntil = lift . notReadyUntil
73 notReadyUntil = lift . notReadyUntil
73 notReady = lift notReady
74 notReady = lift notReady
74
75
76+instance NotReady t m => NotReady t (RequesterInternalT s t request response m) where
77+ notReadyUntil = lift . notReadyUntil
78+ notReady = lift notReady
79+
75instance NotReady t m => NotReady t (TriggerEventT t m) where
80instance NotReady t m => NotReady t (TriggerEventT t m) where
76 notReadyUntil = lift . notReadyUntil
81 notReadyUntil = lift . notReadyUntil
77 notReady = lift notReady
82 notReady = lift notReady
src/Reflex/Patch/IntMap.hsnew file+70
@@ -0,0 +1,70 @@
1+{-# LANGUAGE DeriveFoldable #-}
2+{-# LANGUAGE DeriveFunctor #-}
3+{-# LANGUAGE DeriveTraversable #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6+{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE TemplateHaskell #-}
8+{-# LANGUAGE TypeFamilies #-}
9+-- | Module containing 'PatchIntMap', a 'Patch' for 'IntMap' which allows for
10+-- insert/update or delete of associations.
11+module Reflex.Patch.IntMap where
12+
13+import Control.Lens
14+import Data.IntMap.Strict (IntMap)
15+import qualified Data.IntMap.Strict as IntMap
16+import Data.Maybe
17+import Data.Semigroup
18+import Reflex.Patch.Class
19+
20+-- | 'Patch' for 'IntMap' which represents insertion or deletion of keys in the mapping.
21+-- Internally represented by 'IntMap (Maybe a)', where @Just@ means insert/update
22+-- and @Nothing@ means delete.
23+newtype PatchIntMap a = PatchIntMap (IntMap (Maybe a)) deriving (Functor, Foldable, Traversable, Monoid)
24+
25+-- | @a <> b@ will apply the changes of @b@ and then apply the changes of @a@.
26+-- If the same key is modified by both patches, the one on the left will take
27+-- precedence.
28+instance Semigroup (PatchIntMap v) where
29+ PatchIntMap a <> PatchIntMap b = PatchIntMap $ a `mappend` b --TODO: Add a semigroup instance for Map
30+ -- PatchMap is idempotent, so stimes n is id for every n
31+ stimes = stimesIdempotentMonoid
32+
33+makeWrapped ''PatchIntMap
34+
35+-- | Apply the insertions or deletions to a given 'IntMap'.
36+instance Patch (PatchIntMap a) where
37+ type PatchTarget (PatchIntMap a) = IntMap a
38+ apply (PatchIntMap p) v = if IntMap.null p then Nothing else Just $
39+ let removes = IntMap.filter isNothing p
40+ adds = IntMap.mapMaybe id p
41+ in IntMap.union adds $ v `IntMap.difference` removes
42+
43+-- | Map a function @Int -> a -> b@ over all @a@s in the given @'PatchIntMap' a@
44+-- (that is, all inserts/updates), producing a @PatchIntMap b@.
45+mapIntMapPatchWithKey :: (Int -> a -> b) -> PatchIntMap a -> PatchIntMap b
46+mapIntMapPatchWithKey f (PatchIntMap m) = PatchIntMap $ IntMap.mapWithKey (\ k mv -> f k <$> mv) m
47+
48+instance FunctorWithIndex Int PatchIntMap
49+instance FoldableWithIndex Int PatchIntMap
50+instance TraversableWithIndex Int PatchIntMap where
51+ itraversed = _Wrapped . itraversed . traversed
52+
53+-- | Map an effectful function @Int -> a -> f b@ over all @a@s in the given @'PatchIntMap' a@
54+-- (that is, all inserts/updates), producing a @f (PatchIntMap b)@.
55+traverseIntMapPatchWithKey :: Applicative f => (Int -> a -> f b) -> PatchIntMap a -> f (PatchIntMap b)
56+traverseIntMapPatchWithKey f (PatchIntMap m) = PatchIntMap <$> IntMap.traverseWithKey (\k mv -> traverse (f k) mv) m
57+
58+-- | Extract all @a@s inserted/updated by the given @'PatchIntMap' a@.
59+patchIntMapNewElements :: PatchIntMap a -> [a]
60+patchIntMapNewElements (PatchIntMap m) = catMaybes $ IntMap.elems m
61+
62+-- | Convert the given @'PatchIntMap' a@ into an @'IntMap' a@ with all
63+-- the inserts/updates in the given patch.
64+patchIntMapNewElementsMap :: PatchIntMap a -> IntMap a
65+patchIntMapNewElementsMap (PatchIntMap m) = IntMap.mapMaybe id m
66+
67+-- | Subset the given @'IntMap' a@ to contain only the keys that would be
68+-- deleted by the given @'PatchIntMap' a@.
69+getDeletions :: PatchIntMap v -> IntMap v' -> IntMap v'
70+getDeletions (PatchIntMap m) v = IntMap.intersection v m
src/Reflex/PerformEvent/Base.hs+82−36
@@ -28,8 +28,10 @@ import Reflex.Class
28import Reflex.Adjustable.Class
28import Reflex.Adjustable.Class
29import Reflex.Host.Class
29import Reflex.Host.Class
30import Reflex.PerformEvent.Class
30import Reflex.PerformEvent.Class
31−import Reflex.Requester.Base
31+import Reflex.Requester.Base.Internal
32import Reflex.Requester.Class
32import Reflex.Requester.Class
33+import Reflex.EventWriter.Class
34+import Reflex.EventWriter.Base
33
35
34import Control.Lens
36import Control.Lens
35import Control.Monad.Exception
37import Control.Monad.Exception
@@ -37,13 +39,21 @@ import Control.Monad.Identity
37import Control.Monad.Primitive
39import Control.Monad.Primitive
38import Control.Monad.Reader
40import Control.Monad.Reader
39import Control.Monad.Ref
41import Control.Monad.Ref
40−import Data.Coerce
41import Data.Dependent.Map (DMap)
42import Data.Dependent.Map (DMap)
42import qualified Data.Dependent.Map as DMap
43import qualified Data.Dependent.Map as DMap
43import Data.Dependent.Sum
44import Data.Dependent.Sum
45+import Data.Functor.Compose
46+import Data.Functor.Misc
44import Data.IntMap.Strict (IntMap)
47import Data.IntMap.Strict (IntMap)
45import qualified Data.IntMap.Strict as IntMap
48import qualified Data.IntMap.Strict as IntMap
49+import Data.List.NonEmpty (NonEmpty (..))
50+import Data.List.NonEmpty.Deferred (NonEmptyDeferred)
51+import Data.Map (Map)
52+import qualified Data.Map as Map
53+import Data.Semigroup (Semigroup (sconcat))
46import qualified Data.Semigroup as S
54import qualified Data.Semigroup as S
55+import Data.Unique.Tag.Local
56+import Data.Tuple
47
57
48-- | A function that fires events for the given 'EventTrigger's and then runs
58-- | A function that fires events for the given 'EventTrigger's and then runs
49-- any followup actions provided via 'PerformEvent'. The given 'ReadPhase'
59-- any followup actions provided via 'PerformEvent'. The given 'ReadPhase'
@@ -68,7 +78,7 @@ instance (PrimMonad (HostFrame t), ReflexHost t) => PrimMonad (PerformEventT t m
68 type PrimState (PerformEventT t m) = PrimState (HostFrame t)
78 type PrimState (PerformEventT t m) = PrimState (HostFrame t)
69 primitive = PerformEventT . lift . primitive
79 primitive = PerformEventT . lift . primitive
70
80
71−instance (ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) where
81+instance (ReflexHost t, Ref m ~ Ref IO, PrimMonad (HostFrame t)) => PerformEvent t (PerformEventT t m) where
72 type Performable (PerformEventT t m) = HostFrame t
82 type Performable (PerformEventT t m) = HostFrame t
73 {-# INLINABLE performEvent_ #-}
83 {-# INLINABLE performEvent_ #-}
74 performEvent_ = PerformEventT . requesting_
84 performEvent_ = PerformEventT . requesting_
@@ -76,37 +86,74 @@ instance (ReflexHost t, Ref m ~ Ref IO) => PerformEvent t (PerformEventT t m) wh
76 performEvent = PerformEventT . requestingIdentity
86 performEvent = PerformEventT . requestingIdentity
77
87
78instance (ReflexHost t, PrimMonad (HostFrame t)) => Adjustable t (PerformEventT t m) where
88instance (ReflexHost t, PrimMonad (HostFrame t)) => Adjustable t (PerformEventT t m) where
79− runWithReplace outerA0 outerA' = PerformEventT $ runWithReplaceRequesterTWith f (coerce outerA0) (coerceEvent outerA')
89+ {-# INLINE runWithReplace #-}
80− where f :: HostFrame t a -> Event t (HostFrame t b) -> RequesterT t (HostFrame t) Identity (HostFrame t) (a, Event t b)
90+ runWithReplace a0 a' = PerformEventT $ RequesterT $ do
81− f a0 a' = do
91+ env@(_, _ :: TagGen (PrimState (HostFrame t)) FakeRequesterStatePhantom) <- RequesterInternalT ask
82− result0 <- lift a0
92+ let runA :: forall a. PerformEventT t m a -> HostFrame t (a, Event t (NonEmptyDeferred (RequestEnvelope FakeRequesterStatePhantom (HostFrame t))))
93+ runA (PerformEventT (RequesterT a)) = runEventWriterT $ runReaderT (unRequesterInternalT a) env
94+ (result0, requests0) <- lift $ runA a0
95+ newA <- requestingIdentity $ runA <$> a'
96+ requests <- switchHoldPromptOnly requests0 $ fmapCheap snd newA
97+ --TODO: promptly *prevent* events, then sign up the new ones; this is a serious breaking change to PerformEvent
98+ RequesterInternalT $ tellEvent requests
99+ pure (result0, fmapCheap fst newA)
100+ {-# INLINE traverseIntMapWithKeyWithAdjust #-}
101+ traverseIntMapWithKeyWithAdjust f a0 a' = PerformEventT $ RequesterT $ do
102+ env@(_, _ :: TagGen (PrimState (HostFrame t)) FakeRequesterStatePhantom) <- RequesterInternalT ask
103+ let runA :: forall a. PerformEventT t m a -> HostFrame t (a, Event t (NonEmptyDeferred (RequestEnvelope FakeRequesterStatePhantom (HostFrame t))))
104+ runA (PerformEventT (RequesterT a)) = runEventWriterT $ runReaderT (unRequesterInternalT a) env
83− result' <- requestingIdentity a'
105+ children' <- requestingIdentity $ itraverse (\k -> runA . f k) <$> a'
84− return (result0, result')
106+ children0 <- lift $ itraverse (\k -> runA . f k) a0
85− traverseIntMapWithKeyWithAdjust f outerDm0 outerDm' = PerformEventT $ traverseIntMapWithKeyWithAdjustRequesterTWith (defaultAdjustIntBase traverseIntMapPatchWithKey) patchIntMapNewElementsMap mergeIntIncremental (\k v -> unPerformEventT $ f k v) (coerce outerDm0) (coerceEvent outerDm')
107+ let results0 = fmap fst children0
86− traverseDMapWithKeyWithAdjust f outerDm0 outerDm' = PerformEventT $ traverseDMapWithKeyWithAdjustRequesterTWith (defaultAdjustBase traversePatchDMapWithKey) mapPatchDMap weakenPatchDMapWith patchMapNewElementsMap mergeMapIncremental (\k v -> unPerformEventT $ f k v) (coerce outerDm0) (coerceEvent outerDm')
108+ requests0 = fmap snd children0
87− traverseDMapWithKeyWithAdjustWithMove f outerDm0 outerDm' = PerformEventT $ traverseDMapWithKeyWithAdjustRequesterTWith (defaultAdjustBase traversePatchDMapWithMoveWithKey) mapPatchDMapWithMove weakenPatchDMapWithMoveWith patchMapWithMoveNewElementsMap mergeMapIncrementalWithMove (\k v -> unPerformEventT $ f k v) (coerce outerDm0) (coerceEvent outerDm')
109+ results' = fmap fst <$> children'
88−
110+ requests' = fmap snd `fmapCheap` children'
89−defaultAdjustBase :: forall t v v2 k' p. (Monad (HostFrame t), PrimMonad (HostFrame t), Reflex t)
111+ requests <- switchHoldPromptOnlyIncremental mergeIntIncremental coincidencePatchIntMap requests0 requests'
90− => ((forall a. k' a -> v a -> HostFrame t (v2 a)) -> p k' v -> HostFrame t (p k' v2))
112+ --TODO: promptly *prevent* events, then sign up the new ones; this is a serious breaking change to PerformEvent
91− -> (forall a. k' a -> v a -> HostFrame t (v2 a))
113+ RequesterInternalT $ tellEvent $ fforMaybeCheap requests concatIntMapMaybe
92− -> DMap k' v
114+ pure (results0, results')
93− -> Event t (p k' v)
115+ {-# INLINE traverseDMapWithKeyWithAdjust #-}
94− -> RequesterT t (HostFrame t) Identity (HostFrame t) (DMap k' v2, Event t (p k' v2))
116+ traverseDMapWithKeyWithAdjust (f :: forall a. k a -> v a -> PerformEventT t m (v' a)) (a0 :: DMap k v) a' = PerformEventT $ RequesterT $ do
95−defaultAdjustBase traversePatchWithKey f' dm0 dm' = do
117+ env@(_, _ :: TagGen (PrimState (HostFrame t)) FakeRequesterStatePhantom) <- RequesterInternalT ask
96− result0 <- lift $ DMap.traverseWithKey f' dm0
118+ let runA :: forall a. k a -> v a -> HostFrame t (Compose ((,) (Event t (NonEmptyDeferred (RequestEnvelope FakeRequesterStatePhantom (HostFrame t))))) v' a)
97− result' <- requestingIdentity $ ffor dm' $ traversePatchWithKey f'
119+ runA k v = fmap (Compose . swap) $ runEventWriterT $ runReaderT (unRequesterInternalT a) env
98− return (result0, result')
120+ where (PerformEventT (RequesterT a)) = f k v
99−
121+ children' <- requestingIdentity $ traversePatchDMapWithKey runA <$> a'
100−defaultAdjustIntBase :: forall t v v2 p. (Monad (HostFrame t), PrimMonad (HostFrame t), Reflex t)
122+ children0 <- lift $ DMap.traverseWithKey runA a0
101− => ((IntMap.Key -> v -> HostFrame t v2) -> p v -> HostFrame t (p v2))
123+ let results0 = DMap.map (snd . getCompose) children0
102− -> (IntMap.Key -> v -> HostFrame t v2)
124+ requests0 = weakenDMapWith (fst . getCompose) children0
103− -> IntMap v
125+ results' = mapPatchDMap (snd . getCompose) <$> children'
104− -> Event t (p v)
126+ requests' = weakenPatchDMapWith (fst . getCompose) `fmapCheap` children'
105− -> RequesterT t (HostFrame t) Identity (HostFrame t) (IntMap v2, Event t (p v2))
127+ requests <- switchHoldPromptOnlyIncremental mergeMapIncremental coincidencePatchMap requests0 requests'
106−defaultAdjustIntBase traversePatchWithKey f' dm0 dm' = do
128+ --TODO: promptly *prevent* events, then sign up the new ones; this is a serious breaking change to PerformEvent
107− result0 <- lift $ IntMap.traverseWithKey f' dm0
129+ RequesterInternalT $ tellEvent $ fforMaybeCheap requests concatMapMaybe
108− result' <- requestingIdentity $ ffor dm' $ traversePatchWithKey f'
130+ pure (results0, results')
109− return (result0, result')
131+ {-# INLINE traverseDMapWithKeyWithAdjustWithMove #-}
132+ traverseDMapWithKeyWithAdjustWithMove (f :: forall a. k a -> v a -> PerformEventT t m (v' a)) (a0 :: DMap k v) a' = PerformEventT $ RequesterT $ do
133+ env@(_, _ :: TagGen (PrimState (HostFrame t)) FakeRequesterStatePhantom) <- RequesterInternalT ask
134+ let runA :: forall a. k a -> v a -> HostFrame t (Compose ((,) (Event t (NonEmptyDeferred (RequestEnvelope FakeRequesterStatePhantom (HostFrame t))))) v' a)
135+ runA k v = fmap (Compose . swap) $ runEventWriterT $ runReaderT (unRequesterInternalT a) env
136+ where (PerformEventT (RequesterT a)) = f k v
137+ children' <- requestingIdentity $ traversePatchDMapWithMoveWithKey runA <$> a'
138+ children0 <- lift $ DMap.traverseWithKey runA a0
139+ let results0 = DMap.map (snd . getCompose) children0
140+ requests0 = weakenDMapWith (fst . getCompose) children0
141+ results' = mapPatchDMapWithMove (snd . getCompose) <$> children'
142+ requests' = weakenPatchDMapWithMoveWith (fst . getCompose) `fmapCheap` children'
143+ requests <- switchHoldPromptOnlyIncremental mergeMapIncrementalWithMove coincidencePatchMapWithMove requests0 requests'
144+ --TODO: promptly *prevent* events, then sign up the new ones; this is a serious breaking change to PerformEvent
145+ RequesterInternalT $ tellEvent $ fforMaybeCheap requests concatMapMaybe
146+ pure (results0, results')
147+
148+concatIntMapMaybe :: Semigroup a => IntMap a -> Maybe a
149+concatIntMapMaybe m = case IntMap.elems m of
150+ [] -> Nothing
151+ h : t -> Just $ sconcat $ h :| t
152+
153+concatMapMaybe :: Semigroup a => Map k a -> Maybe a
154+concatMapMaybe m = case Map.elems m of
155+ [] -> Nothing
156+ h : t -> Just $ sconcat $ h :| t
110
157
111instance ReflexHost t => MonadReflexCreateTrigger t (PerformEventT t m) where
158instance ReflexHost t => MonadReflexCreateTrigger t (PerformEventT t m) where
112 {-# INLINABLE newEventWithTrigger #-}
159 {-# INLINABLE newEventWithTrigger #-}
@@ -124,6 +171,7 @@ hostPerformEventT :: forall t m a.
124 , MonadReflexHost t m
171 , MonadReflexHost t m
125 , MonadRef m
172 , MonadRef m
126 , Ref m ~ Ref IO
173 , Ref m ~ Ref IO
174+ , PrimMonad (HostFrame t)
127 )
175 )
128 => PerformEventT t m a
176 => PerformEventT t m a
129 -> m (a, FireCommand t m)
177 -> m (a, FireCommand t m)
@@ -164,8 +212,6 @@ instance (ReflexHost t, MonadHold t m) => MonadHold t (PerformEventT t m) where
164 buildDynamic getV0 v' = PerformEventT $ lift $ buildDynamic getV0 v'
212 buildDynamic getV0 v' = PerformEventT $ lift $ buildDynamic getV0 v'
165 {-# INLINABLE headE #-}
213 {-# INLINABLE headE #-}
166 headE = PerformEventT . lift . headE
214 headE = PerformEventT . lift . headE
167− {-# INLINABLE now #-}
168− now = PerformEventT . lift $ now
169
215
170instance (MonadRef (HostFrame t), ReflexHost t) => MonadRef (PerformEventT t m) where
216instance (MonadRef (HostFrame t), ReflexHost t) => MonadRef (PerformEventT t m) where
171 type Ref (PerformEventT t m) = Ref (HostFrame t)
217 type Ref (PerformEventT t m) = Ref (HostFrame t)
src/Reflex/PerformEvent/Class.hs+1−6
@@ -8,6 +8,7 @@
8{-# LANGUAGE RankNTypes #-}
8{-# LANGUAGE RankNTypes #-}
9{-# LANGUAGE ScopedTypeVariables #-}
9{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE TypeFamilies #-}
10{-# LANGUAGE TypeFamilies #-}
11+{-# LANGUAGE TypeOperators #-}
11{-# LANGUAGE UndecidableInstances #-}
12{-# LANGUAGE UndecidableInstances #-}
12#ifdef USE_REFLEX_OPTIMIZER
13#ifdef USE_REFLEX_OPTIMIZER
13{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
14{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -21,7 +22,6 @@ import Reflex.Class
21import Reflex.TriggerEvent.Class
22import Reflex.TriggerEvent.Class
22
23
23import Control.Monad.Reader
24import Control.Monad.Reader
24−import Control.Monad.Trans.Maybe (MaybeT (..))
25
25
26-- | 'PerformEvent' represents actions that can trigger other actions based on
26-- | 'PerformEvent' represents actions that can trigger other actions based on
27-- 'Event's.
27-- 'Event's.
@@ -61,8 +61,3 @@ instance PerformEvent t m => PerformEvent t (ReaderT r m) where
61 performEvent e = do
61 performEvent e = do
62 r <- ask
62 r <- ask
63 lift $ performEvent $ flip runReaderT r <$> e
63 lift $ performEvent $ flip runReaderT r <$> e
64−
65−instance PerformEvent t m => PerformEvent t (MaybeT m) where
66− type Performable (MaybeT m) = MaybeT (Performable m)
67− performEvent_ = lift . performEvent_ . fmapCheap (void . runMaybeT)
68− performEvent = lift . fmap (fmapMaybe id) . performEvent . fmapCheap runMaybeT
src/Reflex/PostBuild/Base.hs+1−2
@@ -9,6 +9,7 @@
9{-# LANGUAGE RecursiveDo #-}
9{-# LANGUAGE RecursiveDo #-}
10{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE ScopedTypeVariables #-}
11{-# LANGUAGE TypeFamilies #-}
11{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE TypeOperators #-}
12{-# LANGUAGE UndecidableInstances #-}
13{-# LANGUAGE UndecidableInstances #-}
13#ifdef USE_REFLEX_OPTIMIZER
14#ifdef USE_REFLEX_OPTIMIZER
14{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
15{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -83,8 +84,6 @@ instance MonadHold t m => MonadHold t (PostBuildT t m) where
83 buildDynamic a0 = lift . buildDynamic a0
84 buildDynamic a0 = lift . buildDynamic a0
84 {-# INLINABLE headE #-}
85 {-# INLINABLE headE #-}
85 headE = lift . headE
86 headE = lift . headE
86− {-# INLINABLE now #-}
87− now = lift now
88
87
89instance PerformEvent t m => PerformEvent t (PostBuildT t m) where
88instance PerformEvent t m => PerformEvent t (PostBuildT t m) where
90 type Performable (PostBuildT t m) = Performable m
89 type Performable (PostBuildT t m) = Performable m
src/Reflex/PostBuild/Class.hs+1
@@ -6,6 +6,7 @@
6{-# LANGUAGE FunctionalDependencies #-}
6{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE TypeFamilies #-}
8{-# LANGUAGE TypeFamilies #-}
9+{-# LANGUAGE TypeOperators #-}
9{-# LANGUAGE UndecidableInstances #-}
10{-# LANGUAGE UndecidableInstances #-}
10#ifdef USE_REFLEX_OPTIMIZER
11#ifdef USE_REFLEX_OPTIMIZER
11{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
12{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
src/Reflex/Profiled.hs+4−59
@@ -26,10 +26,8 @@ import Control.Monad.Primitive
26import Control.Monad.Reader
26import Control.Monad.Reader
27import Control.Monad.Ref
27import Control.Monad.Ref
28import Control.Monad.State.Strict (StateT, execStateT, modify)
28import Control.Monad.State.Strict (StateT, execStateT, modify)
29−import Data.Bifunctor
30import Data.Coerce
29import Data.Coerce
31−import Data.Dependent.Map (DMap)
30+import Data.Dependent.Map (DMap, GCompare)
32−import Data.GADT.Compare (GCompare)
33import Data.FastMutableIntMap
31import Data.FastMutableIntMap
34import Data.IORef
32import Data.IORef
35import Data.List
33import Data.List
@@ -44,18 +42,9 @@ import Foreign.Ptr
44import GHC.Foreign
42import GHC.Foreign
45import GHC.IO.Encoding
43import GHC.IO.Encoding
46import GHC.Stack
44import GHC.Stack
47−import Reflex.Adjustable.Class
48−import Reflex.BehaviorWriter.Class
49import Reflex.Class
45import Reflex.Class
50−import Reflex.DynamicWriter.Class
51−import Reflex.EventWriter.Class
52import Reflex.Host.Class
46import Reflex.Host.Class
53−import Reflex.NotReady.Class
54import Reflex.PerformEvent.Class
47import Reflex.PerformEvent.Class
55−import Reflex.PostBuild.Class
56−import Reflex.Query.Class
57−import Reflex.Requester.Class
58−import Reflex.TriggerEvent.Class
59
48
60import System.IO.Unsafe
49import System.IO.Unsafe
61
50
@@ -147,7 +136,7 @@ instance Reflex t => Reflex (ProfiledTimeline t) where
147 pushCheap f (Event_Profiled e) = coerce $ pushCheap (coerce f) $ profileEvent e
136 pushCheap f (Event_Profiled e) = coerce $ pushCheap (coerce f) $ profileEvent e
148 pull = Behavior_Profiled . pull . coerce
137 pull = Behavior_Profiled . pull . coerce
149 fanG (Event_Profiled e) = EventSelectorG $ coerce $ selectG (fanG $ profileEvent e)
138 fanG (Event_Profiled e) = EventSelectorG $ coerce $ selectG (fanG $ profileEvent e)
150− mergeG :: forall z (k :: z -> *) q v. GCompare k
139+ mergeG :: forall (k :: z -> *) q v. GCompare k
151 => (forall a. q a -> Event (ProfiledTimeline t) (v a))
140 => (forall a. q a -> Event (ProfiledTimeline t) (v a))
152 -> DMap k q -> Event (ProfiledTimeline t) (DMap k v)
141 -> DMap k q -> Event (ProfiledTimeline t) (DMap k v)
153 mergeG nt = Event_Profiled #. mergeG (coerce nt)
142 mergeG nt = Event_Profiled #. mergeG (coerce nt)
@@ -157,8 +146,8 @@ instance Reflex t => Reflex (ProfiledTimeline t) where
157 updated (Dynamic_Profiled d) = coerce $ profileEvent $ updated d
146 updated (Dynamic_Profiled d) = coerce $ profileEvent $ updated d
158 unsafeBuildDynamic (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildDynamic a0 a'
147 unsafeBuildDynamic (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildDynamic a0 a'
159 unsafeBuildIncremental (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildIncremental a0 a'
148 unsafeBuildIncremental (ProfiledM a0) (Event_Profiled a') = coerce $ unsafeBuildIncremental a0 a'
160− mergeIncrementalG nt res = Event_Profiled $ mergeIncrementalG (coerce nt) (coerce res)
149+ mergeIncrementalG nt = (Event_Profiled . coerce) #. mergeIncrementalG nt
161− mergeIncrementalWithMoveG nt res = Event_Profiled $ mergeIncrementalWithMoveG (coerce nt) (coerce res)
150+ mergeIncrementalWithMoveG nt = (Event_Profiled . coerce) #. mergeIncrementalWithMoveG nt
162 currentIncremental (Incremental_Profiled i) = coerce $ currentIncremental i
151 currentIncremental (Incremental_Profiled i) = coerce $ currentIncremental i
163 updatedIncremental (Incremental_Profiled i) = coerce $ profileEvent $ updatedIncremental i
152 updatedIncremental (Incremental_Profiled i) = coerce $ profileEvent $ updatedIncremental i
164 incrementalToDynamic (Incremental_Profiled i) = coerce $ incrementalToDynamic i
153 incrementalToDynamic (Incremental_Profiled i) = coerce $ incrementalToDynamic i
@@ -184,21 +173,10 @@ instance MonadHold t m => MonadHold (ProfiledTimeline t) (ProfiledM m) where
184 holdIncremental v0 (Event_Profiled v') = ProfiledM $ Incremental_Profiled <$> holdIncremental v0 v'
173 holdIncremental v0 (Event_Profiled v') = ProfiledM $ Incremental_Profiled <$> holdIncremental v0 v'
185 buildDynamic (ProfiledM v0) (Event_Profiled v') = ProfiledM $ Dynamic_Profiled <$> buildDynamic v0 v'
174 buildDynamic (ProfiledM v0) (Event_Profiled v') = ProfiledM $ Dynamic_Profiled <$> buildDynamic v0 v'
186 headE (Event_Profiled e) = ProfiledM $ Event_Profiled <$> headE e
175 headE (Event_Profiled e) = ProfiledM $ Event_Profiled <$> headE e
187− now = ProfiledM $ Event_Profiled <$> now
188
176
189instance MonadSample t m => MonadSample (ProfiledTimeline t) (ProfiledM m) where
177instance MonadSample t m => MonadSample (ProfiledTimeline t) (ProfiledM m) where
190 sample (Behavior_Profiled b) = ProfiledM $ sample b
178 sample (Behavior_Profiled b) = ProfiledM $ sample b
191
179
192−instance Adjustable t m => Adjustable (ProfiledTimeline t) (ProfiledM m) where
193− runWithReplace a0 a' = (fmap . fmap) coerce . lift $
194− runWithReplace (coerce a0) (coerce $ coerce <$> a')
195− traverseIntMapWithKeyWithAdjust f dm0 dm' = (fmap . fmap) coerce . lift $
196− traverseIntMapWithKeyWithAdjust (\k v -> coerce $ f k v) dm0 (coerce dm')
197− traverseDMapWithKeyWithAdjust f dm0 dm' = (fmap . fmap) coerce . lift $
198− traverseDMapWithKeyWithAdjust (\k v -> coerce $ f k v) dm0 (coerce dm')
199− traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = (fmap . fmap) coerce . lift $
200− traverseDMapWithKeyWithAdjustWithMove (\k v -> coerce $ f k v) dm0 (coerce dm')
201−
202instance MonadTrans ProfiledM where
180instance MonadTrans ProfiledM where
203 lift = ProfiledM
181 lift = ProfiledM
204
182
@@ -210,39 +188,6 @@ instance PerformEvent t m => PerformEvent (ProfiledTimeline t) (ProfiledM m) whe
210 performEvent_ = lift . performEvent_ . coerce
188 performEvent_ = lift . performEvent_ . coerce
211 performEvent = lift . fmap coerce . performEvent . coerce
189 performEvent = lift . fmap coerce . performEvent . coerce
212
190
213−instance TriggerEvent t m => TriggerEvent (ProfiledTimeline t) (ProfiledM m) where
214− newTriggerEvent = first coerce <$> lift newTriggerEvent
215− newTriggerEventWithOnComplete = first coerce <$> lift newTriggerEventWithOnComplete
216− newEventWithLazyTriggerWithOnComplete f = coerce <$> lift (newEventWithLazyTriggerWithOnComplete f)
217−
218−instance PostBuild t m => PostBuild (ProfiledTimeline t) (ProfiledM m) where
219− getPostBuild = coerce <$> lift getPostBuild
220−
221−instance NotReady t m => NotReady (ProfiledTimeline t) (ProfiledM m) where
222− notReady = lift notReady
223− notReadyUntil = lift . notReadyUntil . coerce
224−
225−instance BehaviorWriter t w m => BehaviorWriter (ProfiledTimeline t) w (ProfiledM m) where
226− tellBehavior = lift . tellBehavior . coerce
227−
228−instance DynamicWriter t w m => DynamicWriter (ProfiledTimeline t) w (ProfiledM m) where
229− tellDyn = lift . tellDyn . coerce
230−
231−instance EventWriter t w m => EventWriter (ProfiledTimeline t) w (ProfiledM m) where
232− tellEvent = lift . tellEvent . coerce
233−
234−instance MonadQuery t q m => MonadQuery (ProfiledTimeline t) q (ProfiledM m) where
235− tellQueryIncremental = lift . tellQueryIncremental . coerce
236− askQueryResult = coerce <$> lift askQueryResult
237− queryIncremental = fmap coerce . lift . queryIncremental . coerce
238−
239−instance Requester t m => Requester (ProfiledTimeline t) (ProfiledM m) where
240− type Request (ProfiledM m) = Request m
241− type Response (ProfiledM m) = Response m
242−
243− requesting = fmap coerce . lift . requesting . coerce
244− requesting_ = lift . requesting_ . coerce
245−
246instance MonadRef m => MonadRef (ProfiledM m) where
191instance MonadRef m => MonadRef (ProfiledM m) where
247 type Ref (ProfiledM m) = Ref m
192 type Ref (ProfiledM m) = Ref m
248 newRef = lift . newRef
193 newRef = lift . newRef
src/Reflex/Pure.hs+1−6
@@ -32,8 +32,7 @@ module Reflex.Pure
32 ) where
32 ) where
33
33
34import Control.Monad
34import Control.Monad
35−import Data.Dependent.Map (DMap)
35+import Data.Dependent.Map (DMap, GCompare)
36−import Data.GADT.Compare (GCompare)
37import qualified Data.Dependent.Map as DMap
36import qualified Data.Dependent.Map as DMap
38import Data.IntMap (IntMap)
37import Data.IntMap (IntMap)
39import qualified Data.IntMap as IntMap
38import qualified Data.IntMap as IntMap
@@ -211,7 +210,3 @@ instance (Enum t, HasTrie t, Ord t) => MonadHold (Pure t) ((->) t) where
211 Just x -> fromMaybe lastValue $ apply x lastValue
210 Just x -> fromMaybe lastValue $ apply x lastValue
212
211
213 headE = slowHeadE
212 headE = slowHeadE
214− now t = Event $ guard . (t ==)
215−
216−
217−
src/Reflex/Query/Base.hs+3−9
@@ -22,19 +22,16 @@ module Reflex.Query.Base
22import Control.Applicative (liftA2)
22import Control.Applicative (liftA2)
23import Control.Monad.Exception
23import Control.Monad.Exception
24import Control.Monad.Fix
24import Control.Monad.Fix
25−import Control.Monad.Morph
26import Control.Monad.Primitive
25import Control.Monad.Primitive
27import Control.Monad.Reader
26import Control.Monad.Reader
28import Control.Monad.Ref
27import Control.Monad.Ref
29import Control.Monad.State.Strict
28import Control.Monad.State.Strict
30import Data.Align
29import Data.Align
31−import Data.Dependent.Map (DMap)
30+import Data.Dependent.Map (DMap, DSum (..))
32import qualified Data.Dependent.Map as DMap
31import qualified Data.Dependent.Map as DMap
33−import Data.Dependent.Sum (DSum(..))
34import Data.Foldable
32import Data.Foldable
35import Data.Functor.Compose
33import Data.Functor.Compose
36import Data.Functor.Misc
34import Data.Functor.Misc
37−import Data.GADT.Compare (GCompare)
38import Data.IntMap (IntMap)
35import Data.IntMap (IntMap)
39import qualified Data.IntMap as IntMap
36import qualified Data.IntMap as IntMap
40import Data.Map (Map)
37import Data.Map (Map)
@@ -138,7 +135,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t
138 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
135 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
139 return (liftedResult0, liftedResult')
136 return (liftedResult0, liftedResult')
140
137
141− traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))
138+ traverseDMapWithKeyWithAdjust :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMap k v) -> QueryT t q m (DMap k v', Event t (PatchDMap k v'))
142 traverseDMapWithKeyWithAdjust f dm0 dm' = do
139 traverseDMapWithKeyWithAdjust f dm0 dm' = do
143 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
140 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
144 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
141 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
@@ -183,7 +180,7 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t
183 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
180 tellQueryIncremental $ unsafeBuildIncremental (fold <$> mapM sampleBs liftedBs0) qpatch
184 return (liftedResult0, liftedResult')
181 return (liftedResult0, liftedResult')
185
182
186− traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))
183+ traverseDMapWithKeyWithAdjustWithMove :: forall (k :: * -> *) v v'. (DMap.GCompare k) => (forall a. k a -> v a -> QueryT t q m (v' a)) -> DMap k v -> Event t (PatchDMapWithMove k v) -> QueryT t q m (DMap k v', Event t (PatchDMapWithMove k v'))
187 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = do
184 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = do
188 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
185 let f' :: forall a. k a -> v a -> EventWriterT t q (ReaderT (Dynamic t (QueryResult q)) m) (Compose (QueryTLoweredResult t q) v' a)
189 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
186 f' k v = fmap (Compose . QueryTLoweredResult) $ flip runStateT [] $ unQueryT $ f k v
@@ -240,9 +237,6 @@ instance (Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q, MonadHold t
240instance MonadTrans (QueryT t q) where
237instance MonadTrans (QueryT t q) where
241 lift = QueryT . lift . lift . lift
238 lift = QueryT . lift . lift . lift
242
239
243−instance MFunctor (QueryT t q) where
244− hoist = mapQueryT
245−
246instance PrimMonad m => PrimMonad (QueryT t q m) where
240instance PrimMonad m => PrimMonad (QueryT t q m) where
247 type PrimState (QueryT t q m) = PrimState m
241 type PrimState (QueryT t q m) = PrimState m
248 primitive = lift . primitive
242 primitive = lift . primitive
src/Reflex/Query/Class.hs+5−5
@@ -125,7 +125,7 @@ instance Group SelectedCount where
125
125
126instance Additive SelectedCount
126instance Additive SelectedCount
127
127
128−-- | The Semigroup\/Monoid\/Group instances for a Query containing 'SelectedCount's should use
128+-- | The Semigroup/Monoid/Group instances for a Query containing 'SelectedCount's should use
129-- this function which returns Nothing if the result is 0. This allows the pruning of leaves
129-- this function which returns Nothing if the result is 0. This allows the pruning of leaves
130-- of the 'Query' that are no longer wanted.
130-- of the 'Query' that are no longer wanted.
131combineSelectedCounts :: SelectedCount -> SelectedCount -> Maybe SelectedCount
131combineSelectedCounts :: SelectedCount -> SelectedCount -> Maybe SelectedCount
@@ -133,12 +133,12 @@ combineSelectedCounts (SelectedCount i) (SelectedCount j) = if i == negate j the
133
133
134-- | A class that allows sending of 'Query's and retrieval of 'QueryResult's. See 'queryDyn' for a commonly
134-- | A class that allows sending of 'Query's and retrieval of 'QueryResult's. See 'queryDyn' for a commonly
135-- used interface.
135-- used interface.
136−class (Group q, Additive q, Query q, Monad m) => MonadQuery t q m | m -> q t where
136+class (Group q, Additive q, Query q) => MonadQuery t q m | m -> q t where
137 tellQueryIncremental :: Incremental t (AdditivePatch q) -> m ()
137 tellQueryIncremental :: Incremental t (AdditivePatch q) -> m ()
138 askQueryResult :: m (Dynamic t (QueryResult q))
138 askQueryResult :: m (Dynamic t (QueryResult q))
139 queryIncremental :: Incremental t (AdditivePatch q) -> m (Dynamic t (QueryResult q))
139 queryIncremental :: Incremental t (AdditivePatch q) -> m (Dynamic t (QueryResult q))
140
140
141−instance MonadQuery t q m => MonadQuery t q (ReaderT r m) where
141+instance (Monad m, MonadQuery t q m) => MonadQuery t q (ReaderT r m) where
142 tellQueryIncremental = lift . tellQueryIncremental
142 tellQueryIncremental = lift . tellQueryIncremental
143 askQueryResult = lift askQueryResult
143 askQueryResult = lift askQueryResult
144 queryIncremental = lift . queryIncremental
144 queryIncremental = lift . queryIncremental
@@ -148,11 +148,11 @@ tellQueryDyn :: (Reflex t, MonadQuery t q m) => Dynamic t q -> m ()
148tellQueryDyn d = tellQueryIncremental $ unsafeBuildIncremental (sample (current d)) $ attachWith (\old new -> AdditivePatch $ new ~~ old) (current d) (updated d)
148tellQueryDyn d = tellQueryIncremental $ unsafeBuildIncremental (sample (current d)) $ attachWith (\old new -> AdditivePatch $ new ~~ old) (current d) (updated d)
149
149
150-- | Retrieve 'Dynamic'ally updating 'QueryResult's for a 'Dynamic'ally updating 'Query'.
150-- | Retrieve 'Dynamic'ally updating 'QueryResult's for a 'Dynamic'ally updating 'Query'.
151−queryDyn :: (Reflex t, MonadQuery t q m) => Dynamic t q -> m (Dynamic t (QueryResult q))
151+queryDyn :: (Reflex t, Monad m, MonadQuery t q m) => Dynamic t q -> m (Dynamic t (QueryResult q))
152queryDyn q = do
152queryDyn q = do
153 tellQueryDyn q
153 tellQueryDyn q
154 zipDynWith crop q <$> askQueryResult
154 zipDynWith crop q <$> askQueryResult
155
155
156-- | Use a query morphism to operate on a smaller version of a query.
156-- | Use a query morphism to operate on a smaller version of a query.
157−subQuery :: (Reflex t, MonadQuery t q2 m) => QueryMorphism q1 q2 -> Dynamic t q1 -> m (Dynamic t (QueryResult q1))
157+subQuery :: (Reflex t, MonadQuery t q2 m, Monad m) => QueryMorphism q1 q2 -> Dynamic t q1 -> m (Dynamic t (QueryResult q1))
158subQuery (QueryMorphism f g) x = fmap g <$> queryDyn (fmap f x)
158subQuery (QueryMorphism f g) x = fmap g <$> queryDyn (fmap f x)
src/Reflex/Requester/Base.hs+13−597
@@ -1,607 +1,23 @@
1-- | This module provides 'RequesterT', the standard implementation of
1-- | This module provides 'RequesterT', the standard implementation of
2-- 'Requester'.
2-- 'Requester'.
3−{-# LANGUAGE AllowAmbiguousTypes #-}
4−{-# LANGUAGE ApplicativeDo #-}
5−{-# LANGUAGE CPP #-}
6−{-# LANGUAGE EmptyDataDecls #-}
7−{-# LANGUAGE ExistentialQuantification #-}
8−{-# LANGUAGE FlexibleInstances #-}
9−{-# LANGUAGE GADTs #-}
10−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11−{-# LANGUAGE MultiParamTypeClasses #-}
12−{-# LANGUAGE Rank2Types #-}
13−{-# LANGUAGE RecursiveDo #-}
14−{-# LANGUAGE ScopedTypeVariables #-}
15−{-# LANGUAGE StandaloneDeriving #-}
16−{-# LANGUAGE TypeFamilies #-}
17−{-# LANGUAGE TypeOperators #-}
18−{-# LANGUAGE UndecidableInstances #-}
19−#ifdef USE_REFLEX_OPTIMIZER
20−{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
21−#endif
22module Reflex.Requester.Base
3module Reflex.Requester.Base
23 ( RequesterT (..)
4 ( RequesterT (..)
5+ , RequestData (..)
6+ , ResponseData (..)
7+ , RequestEnvelope (..)
24 , runRequesterT
8 , runRequesterT
25− , withRequesterT
9+-- , withRequesterT
26− , runWithReplaceRequesterTWith
27− , traverseIntMapWithKeyWithAdjustRequesterTWith
28− , traverseDMapWithKeyWithAdjustRequesterTWith
29− , RequesterData
10+-- , RequesterData
30− , RequesterDataKey
11+-- , RequesterDataKey
31 , traverseRequesterData
12 , traverseRequesterData
32 , forRequesterData
13 , forRequesterData
33− , requesterDataToList
14+ , requestEnvelopesToDSums
34− , singletonRequesterData
15+ , singletonRequestData
16+ , singletonResponseData
35 , matchResponsesWithRequests
17 , matchResponsesWithRequests
36− , matchResponseMapWithRequests
37− , multiEntry
18+-- , multiEntry
38− , unMultiEntry
19+-- , unMultiEntry
39− , requesting'
20+-- , requesting'
40 ) where
21 ) where
41
22
42−import Reflex.Class
23+import Reflex.Requester.Base.Internal
43−import Reflex.Adjustable.Class
44−import Reflex.Dynamic
45−import Reflex.Host.Class
46−import Reflex.PerformEvent.Class
47−import Reflex.PostBuild.Class
48−import Reflex.Requester.Class
49−import Reflex.TriggerEvent.Class
50−
51−import Control.Applicative (liftA2)
52−import Control.Monad.Exception
53−import Control.Monad.Identity
54−import Control.Monad.Morph
55−import Control.Monad.Primitive
56−import Control.Monad.Reader
57−import Control.Monad.Ref
58−import Control.Monad.State.Strict
59−import Data.Bits
60−import Data.Coerce
61−import Data.Constraint
62−import Data.Dependent.Map (DMap)
63−import qualified Data.Dependent.Map as DMap
64−import Data.Dependent.Sum (DSum (..))
65−import Data.Functor.Compose
66−import Data.Functor.Misc
67−import Data.IntMap.Strict (IntMap)
68−import qualified Data.IntMap.Strict as IntMap
69−import Data.Map (Map)
70−import qualified Data.Map as Map
71−import Data.Monoid ((<>))
72−import Data.Proxy
73−import qualified Data.Semigroup as S
74−import Data.Some (Some(Some))
75−import Data.Type.Equality
76−import Data.Unique.Tag
77−
78−import GHC.Exts (Any)
79−import Unsafe.Coerce
80−
81−--TODO: Make this module type-safe
82−
83−newtype TagMap (f :: * -> *) = TagMap (IntMap Any)
84−
85−newtype RequesterData f = RequesterData (TagMap (Entry f))
86−
87−emptyRequesterData :: RequesterData f
88−emptyRequesterData = RequesterData $ TagMap IntMap.empty
89−
90−data RequesterDataKey a where
91− RequesterDataKey_Single :: {-# UNPACK #-} !(MyTag (Single a)) -> RequesterDataKey a
92− RequesterDataKey_Multi :: {-# UNPACK #-} !(MyTag Multi) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a --TODO: Don't put a second Int here (or in the other Multis); use a single Int instead
93− RequesterDataKey_Multi2 :: GCompare k => {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
94− RequesterDataKey_Multi3 :: {-# UNPACK #-} !(MyTag Multi3) -> {-# UNPACK #-} !Int -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
95−
96−singletonRequesterData :: RequesterDataKey a -> f a -> RequesterData f
97−singletonRequesterData rdk v = case rdk of
98− RequesterDataKey_Single k -> RequesterData $ singletonTagMap k $ Entry v
99− RequesterDataKey_Multi k k' k'' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ singletonRequesterData k'' v
100− RequesterDataKey_Multi2 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ Multi2Contents
101− { _multi2Contents_values = Map.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
102− , _multi2Contents_dict = Dict
103− }
104− RequesterDataKey_Multi3 k k' k'' k''' -> RequesterData $ singletonTagMap k $ Entry $ IntMap.singleton k' $ IntMap.singleton k'' $ singletonRequesterData k''' v
105−
106−mergeRequesterData :: RequesterData f -> RequesterData f -> RequesterData f
107−mergeRequesterData (RequesterData a) (RequesterData b) = RequesterData $ mergeTagMap a b
108−
109−mergeTagMap :: forall f. TagMap (Entry f) -> TagMap (Entry f) -> TagMap (Entry f)
110−mergeTagMap (TagMap m) (TagMap n) =
111− TagMap $ IntMap.unionWithKey (g' combiner) m n
112− where
113− combiner :: forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a
114− combiner k (Entry a) (Entry b) = Entry $ case myKeyType k of
115− MyTagType_Single -> a
116− MyTagType_Multi -> IntMap.unionWith mergeRequesterData a b
117− MyTagType_Multi2 -> case _multi2Contents_dict a of
118− Dict -> Multi2Contents
119− { _multi2Contents_values = Map.unionWith (IntMap.unionWith mergeRequesterData) (_multi2Contents_values a) (_multi2Contents_values b)
120− , _multi2Contents_dict = Dict
121− }
122− MyTagType_Multi3 -> IntMap.unionWith (IntMap.unionWith mergeRequesterData) a b
123− g' :: (forall a. MyTag a -> Entry f a -> Entry f a -> Entry f a) -> Int -> Any -> Any -> Any
124− g' f rawKey a b =
125− let k = MyTag rawKey :: MyTag a
126− fromAny :: Any -> Entry f a
127− fromAny = unsafeCoerce
128− toAny :: Entry f a -> Any
129− toAny = unsafeCoerce
130− in toAny $ f k (fromAny a) (fromAny b)
131−
132−requesterDataToList :: RequesterData f -> [DSum RequesterDataKey f]
133−requesterDataToList (RequesterData m) = do
134− k :=> Entry e <- tagMapToList m
135− case myKeyType k of
136− MyTagType_Single -> return $ RequesterDataKey_Single k :=> e
137− MyTagType_Multi -> do
138− (k', e') <- IntMap.toList e
139− k'' :=> e'' <- requesterDataToList e'
140− return $ RequesterDataKey_Multi k k' k'' :=> e''
141− MyTagType_Multi2 -> case _multi2Contents_dict e of
142− Dict -> do
143− (k', e') <- Map.toList $ _multi2Contents_values e
144− (k'', e'') <- IntMap.toList e'
145− k''' :=> e''' <- requesterDataToList e''
146− return $ RequesterDataKey_Multi2 k k' k'' k''' :=> e'''
147− MyTagType_Multi3 -> do
148− (k', e') <- IntMap.toList e
149− (k'', e'') <- IntMap.toList e'
150− k''' :=> e''' <- requesterDataToList e''
151− return $ RequesterDataKey_Multi3 k k' k'' k''' :=> e'''
152−
153−singletonTagMap :: forall f a. MyTag a -> f a -> TagMap f
154−singletonTagMap (MyTag k) v = TagMap $ IntMap.singleton k $ (unsafeCoerce :: f a -> Any) v
155−
156−tagMapToList :: forall f. TagMap f -> [DSum MyTag f]
157−tagMapToList (TagMap m) = f <$> IntMap.toList m
158− where f :: (Int, Any) -> DSum MyTag f
159− f (k, v) = MyTag k :=> (unsafeCoerce :: Any -> f a) v
160−
161−traverseTagMapWithKey :: forall t f g. Applicative t => (forall a. MyTag a -> f a -> t (g a)) -> TagMap f -> t (TagMap g)
162−traverseTagMapWithKey f (TagMap m) = TagMap <$> IntMap.traverseWithKey g m
163− where
164− g :: Int -> Any -> t Any
165− g k v = (unsafeCoerce :: g a -> Any) <$> f (MyTag k) ((unsafeCoerce :: Any -> f a) v)
166−
167−-- | Runs in reverse to accommodate for the fact that we accumulate it in reverse
168−traverseRequesterData :: forall m request response. Applicative m => (forall a. request a -> m (response a)) -> RequesterData request -> m (RequesterData response)
169−traverseRequesterData f (RequesterData m) = RequesterData <$> traverseTagMapWithKey go m --TODO: reverse this, since our tags are in reverse order
170− where go :: forall x. MyTag x -> Entry request x -> m (Entry response x)
171− go k (Entry request) = Entry <$> case myKeyType k of
172− MyTagType_Single -> f request
173− MyTagType_Multi -> traverse (traverseRequesterData f) request
174− MyTagType_Multi2 -> case request of
175− Multi2Contents { _multi2Contents_values = request', _multi2Contents_dict = Dict } -> do
176− v <- traverse (traverse (traverseRequesterData f)) request'
177− pure $ Multi2Contents
178− { _multi2Contents_values = v
179− , _multi2Contents_dict = Dict
180− }
181− MyTagType_Multi3 -> traverse (traverse (traverseRequesterData f)) request
182−
183−-- | 'traverseRequesterData' with its arguments flipped
184−forRequesterData :: forall request response m. Applicative m => RequesterData request -> (forall a. request a -> m (response a)) -> m (RequesterData response)
185−forRequesterData r f = traverseRequesterData f r
186−
187−data MyTagType :: * -> * where
188− MyTagType_Single :: MyTagType (Single a)
189− MyTagType_Multi :: MyTagType Multi
190− MyTagType_Multi2 :: MyTagType (Multi2 k)
191− MyTagType_Multi3 :: MyTagType Multi3
192−
193−myKeyType :: MyTag x -> MyTagType x
194−myKeyType (MyTag k) = case k .&. 0x3 of
195− 0x0 -> unsafeCoerce MyTagType_Single
196− 0x1 -> unsafeCoerce MyTagType_Multi
197− 0x2 -> unsafeCoerce MyTagType_Multi2
198− 0x3 -> unsafeCoerce MyTagType_Multi3
199− t -> error $ "Reflex.Requester.Base.myKeyType: no such key type" <> show t
200−
201−data Single a
202−data Multi
203−data Multi2 (k :: * -> *)
204−data Multi3
205−
206−class MyTagTypeOffset x where
207− myTagTypeOffset :: proxy x -> Int
208−
209−instance MyTagTypeOffset (Single a) where
210− myTagTypeOffset _ = 0x0
211−
212−instance MyTagTypeOffset Multi where
213− myTagTypeOffset _ = 0x1
214−
215−instance MyTagTypeOffset (Multi2 k) where
216− myTagTypeOffset _ = 0x2
217−
218−instance MyTagTypeOffset Multi3 where
219− myTagTypeOffset _ = 0x3
220−
221−type family EntryContents request a where
222− EntryContents request (Single a) = request a
223− EntryContents request Multi = IntMap (RequesterData request)
224− EntryContents request (Multi2 k) = Multi2Contents k request
225− EntryContents request Multi3 = IntMap (IntMap (RequesterData request))
226−
227−data Multi2Contents k request = Multi2Contents
228− { _multi2Contents_dict :: {-# UNPACK #-} !(Dict (GCompare k)) -- This is a Dict instead of an existential context because we only want to use it in certain circumstances
229− , _multi2Contents_values :: {-# UNPACK #-} !(Map (Some k) (IntMap (RequesterData request)))
230− }
231−
232−newtype Entry request x = Entry { unEntry :: EntryContents request x }
233−
234−{-# INLINE singleEntry #-}
235−singleEntry :: f a -> Entry f (Single a)
236−singleEntry = Entry
237−
238−{-# INLINE multiEntry #-}
239−multiEntry :: IntMap (RequesterData f) -> Entry f Multi
240−multiEntry = Entry
241−
242−{-# INLINE unMultiEntry #-}
243−unMultiEntry :: Entry f Multi -> IntMap (RequesterData f)
244−unMultiEntry = unEntry
245−
246−-- | We use a hack here to pretend we have x ~ request a; we don't want to use a GADT, because GADTs (even with zero-size existential contexts) can't be newtypes
247−-- WARNING: This type should never be exposed. In particular, this is extremely unsound if a MyTag from one run of runRequesterT is ever compared against a MyTag from another
248−newtype MyTag x = MyTag Int deriving (Show, Eq, Ord, Enum)
249−
250−newtype MyTagWrap (f :: * -> *) x = MyTagWrap Int deriving (Show, Eq, Ord, Enum)
251−
252−{-# INLINE castMyTagWrap #-}
253−castMyTagWrap :: MyTagWrap f (Entry f x) -> MyTagWrap g (Entry g x)
254−castMyTagWrap = coerce
255−
256−instance GEq MyTag where
257− (MyTag a) `geq` (MyTag b) =
258− if a == b
259− then Just $ unsafeCoerce Refl
260− else Nothing
261−
262−instance GCompare MyTag where
263− (MyTag a) `gcompare` (MyTag b) =
264− case a `compare` b of
265− LT -> GLT
266− EQ -> unsafeCoerce GEQ
267− GT -> GGT
268−
269−instance GEq (MyTagWrap f) where
270− (MyTagWrap a) `geq` (MyTagWrap b) =
271− if a == b
272− then Just $ unsafeCoerce Refl
273− else Nothing
274−
275−instance GCompare (MyTagWrap f) where
276− (MyTagWrap a) `gcompare` (MyTagWrap b) =
277− case a `compare` b of
278− LT -> GLT
279− EQ -> unsafeCoerce GEQ
280− GT -> GGT
281−
282−data RequesterState t (request :: * -> *) = RequesterState
283− { _requesterState_nextMyTag :: {-# UNPACK #-} !Int -- Starts at -4 and goes down by 4 each time, to accommodate two 'type' bits at the bottom
284− , _requesterState_requests :: ![(Int, Event t Any)]
285− }
286−
287−-- | A basic implementation of 'Requester'.
288−newtype RequesterT t request (response :: * -> *) m a = RequesterT { unRequesterT :: StateT (RequesterState t request) (ReaderT (EventSelectorInt t Any) m) a }
289− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
290−-- MonadAsyncException can't be derived on ghc-8.0.1; we use base-4.9.1 as a proxy for ghc-8.0.2
291−#if MIN_VERSION_base(4,9,1)
292− , MonadAsyncException
293−#endif
294− )
295−
296−deriving instance MonadSample t m => MonadSample t (RequesterT t request response m)
297−deriving instance MonadHold t m => MonadHold t (RequesterT t request response m)
298−deriving instance PostBuild t m => PostBuild t (RequesterT t request response m)
299−deriving instance TriggerEvent t m => TriggerEvent t (RequesterT t request response m)
300−
301−instance PrimMonad m => PrimMonad (RequesterT t request response m) where
302− type PrimState (RequesterT t request response m) = PrimState m
303− primitive = lift . primitive
304−
305−-- TODO: Monoid and Semigroup can likely be derived once StateT has them.
306−instance (Monoid a, Monad m) => Monoid (RequesterT t request response m a) where
307− mempty = pure mempty
308− mappend = liftA2 mappend
309−
310−instance (S.Semigroup a, Monad m) => S.Semigroup (RequesterT t request response m a) where
311− (<>) = liftA2 (S.<>)
312−
313−
314−-- | Run a 'RequesterT' action. The resulting 'Event' will fire whenever
315−-- requests are made, and responses should be provided in the input 'Event'.
316−-- The 'Tag' keys will be used to return the responses to the same place the
317−-- requests were issued.
318−runRequesterT :: (Reflex t, Monad m)
319− => RequesterT t request response m a
320− -> Event t (RequesterData response) --TODO: This DMap will be in reverse order, so we need to make sure the caller traverses it in reverse
321− -> m (a, Event t (RequesterData request)) --TODO: we need to hide these 'MyTag's here, because they're unsafe to mix in the wild
322−runRequesterT (RequesterT a) responses = do
323− (result, s) <- runReaderT (runStateT a $ RequesterState (-4) []) $ fanInt $
324− coerceEvent responses
325− return (result, fmapCheap (RequesterData . TagMap) $ mergeInt $ IntMap.fromDistinctAscList $ _requesterState_requests s)
326−
327−-- | Map a function over the request and response of a 'RequesterT'
328−withRequesterT
329− :: (Reflex t, MonadFix m)
330− => (forall x. req x -> req' x) -- ^ The function to map over the request
331− -> (forall x. rsp' x -> rsp x) -- ^ The function to map over the response
332− -> RequesterT t req rsp m a -- ^ The internal 'RequesterT' whose input and output will be transformed
333− -> RequesterT t req' rsp' m a -- ^ The resulting 'RequesterT'
334−withRequesterT freq frsp child = do
335− rec let rsp = fmap (runIdentity . traverseRequesterData (Identity . frsp)) rsp'
336− (a, req) <- lift $ runRequesterT child rsp
337− rsp' <- fmap (flip selectInt 0 . fanInt . fmapCheap unMultiEntry) $ requesting' $
338− fmapCheap (multiEntry . IntMap.singleton 0) $ fmap (runIdentity . traverseRequesterData (Identity . freq)) req
339− return a
340−
341−instance (Reflex t, Monad m) => Requester t (RequesterT t request response m) where
342− type Request (RequesterT t request response m) = request
343− type Response (RequesterT t request response m) = response
344− requesting = fmap coerceEvent . responseFromTag . castMyTagWrap <=< tagRequest . (coerceEvent :: Event t (request a) -> Event t (Entry request (Single a)))
345− requesting_ = void . tagRequest . fmapCheap singleEntry
346−
347−{-# INLINE tagRequest #-}
348−tagRequest :: forall m x t request response. (Monad m, MyTagTypeOffset x) => Event t (Entry request x) -> RequesterT t request response m (MyTagWrap request (Entry request x))
349−tagRequest req = do
350− old <- RequesterT get
351− let n = _requesterState_nextMyTag old .|. myTagTypeOffset (Proxy :: Proxy x)
352− t = MyTagWrap n
353− RequesterT $ put $ RequesterState
354− { _requesterState_nextMyTag = _requesterState_nextMyTag old - 0x4
355− , _requesterState_requests = (n, (unsafeCoerce :: Event t (Entry request x) -> Event t Any) req) : _requesterState_requests old
356− }
357− return t
358−
359−{-# INLINE responseFromTag #-}
360−responseFromTag :: forall m t request response x. Monad m => MyTagWrap response (Entry response x) -> RequesterT t request response m (Event t (Entry response x))
361−responseFromTag (MyTagWrap t) = do
362− responses :: EventSelectorInt t Any <- RequesterT ask
363− return $ (unsafeCoerce :: Event t Any -> Event t (Entry response x)) $ selectInt responses t
364−
365−instance MonadTrans (RequesterT t request response) where
366− lift = RequesterT . lift . lift
367−
368−instance MFunctor (RequesterT t request response) where
369− hoist f = RequesterT . hoist (hoist f) . unRequesterT
370−
371−instance PerformEvent t m => PerformEvent t (RequesterT t request response m) where
372− type Performable (RequesterT t request response m) = Performable m
373− performEvent_ = lift . performEvent_
374− performEvent = lift . performEvent
375−
376−instance MonadRef m => MonadRef (RequesterT t request response m) where
377− type Ref (RequesterT t request response m) = Ref m
378− newRef = lift . newRef
379− readRef = lift . readRef
380− writeRef r = lift . writeRef r
381−
382−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (RequesterT t request response m) where
383− newEventWithTrigger = lift . newEventWithTrigger
384− newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
385−
386−instance MonadReader r m => MonadReader r (RequesterT t request response m) where
387− ask = lift ask
388− local f (RequesterT a) = RequesterT $ mapStateT (mapReaderT $ local f) a
389− reader = lift . reader
390−
391−instance (Reflex t, Adjustable t m, MonadHold t m, MonadFix m) => Adjustable t (RequesterT t request response m) where
392− runWithReplace = runWithReplaceRequesterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'
393− traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjustRequesterTWith (\f dm0 dm' -> lift $ traverseIntMapWithKeyWithAdjust f dm0 dm') patchIntMapNewElementsMap mergeIntIncremental
394− {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
395− traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjustRequesterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjust f dm0 dm') mapPatchDMap weakenPatchDMapWith patchMapNewElementsMap mergeMapIncremental
396− traverseDMapWithKeyWithAdjustWithMove = traverseDMapWithKeyWithAdjustRequesterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjustWithMove f dm0 dm') mapPatchDMapWithMove weakenPatchDMapWithMoveWith patchMapWithMoveNewElementsMap mergeMapIncrementalWithMove
397−
398−requesting' :: (MyTagTypeOffset x, Monad m) => Event t (Entry request x) -> RequesterT t request response m (Event t (Entry response x))
399−requesting' = responseFromTag . castMyTagWrap <=< tagRequest
400−
401−{-# INLINABLE runWithReplaceRequesterTWith #-}
402−runWithReplaceRequesterTWith :: forall m t request response a b. (Reflex t, MonadHold t m
403− , MonadFix m
404− )
405− => (forall a' b'. m a' -> Event t (m b') -> RequesterT t request response m (a', Event t b'))
406− -> RequesterT t request response m a
407− -> Event t (RequesterT t request response m b)
408− -> RequesterT t request response m (a, Event t b)
409−runWithReplaceRequesterTWith f a0 a' = do
410− rec na' <- numberOccurrencesFrom 1 a'
411− responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requests --TODO: Investigate whether we can really get rid of the prompt stuff here
412− let responses' = fanInt responses
413− ((result0, requests0), v') <- f (runRequesterT a0 (selectInt responses' 0)) $ fmapCheap (\(n, a) -> fmap ((,) n) $ runRequesterT a $ selectInt responses' n) na'
414− requests <- holdDyn (fmapCheap (IntMap.singleton 0) requests0) $ fmapCheap (\(n, (_, reqs)) -> fmapCheap (IntMap.singleton n) reqs) v'
415− return (result0, fmapCheap (fst . snd) v')
416−
417−{-# INLINE traverseIntMapWithKeyWithAdjustRequesterTWith #-}
418−traverseIntMapWithKeyWithAdjustRequesterTWith :: forall t request response m v v' p.
419− ( Reflex t
420− , MonadHold t m
421− , PatchTarget (p (Event t (IntMap (RequesterData request)))) ~ IntMap (Event t (IntMap (RequesterData request)))
422− , Patch (p (Event t (IntMap (RequesterData request))))
423− , Functor p
424− , MonadFix m
425− )
426− => ( (IntMap.Key -> (IntMap.Key, v) -> m (Event t (IntMap (RequesterData request)), v'))
427− -> IntMap (IntMap.Key, v)
428− -> Event t (p (IntMap.Key, v))
429− -> RequesterT t request response m (IntMap (Event t (IntMap (RequesterData request)), v'), Event t (p (Event t (IntMap (RequesterData request)), v')))
430− )
431− -> (p (Event t (IntMap (RequesterData request))) -> IntMap (Event t (IntMap (RequesterData request))))
432− -> (Incremental t (p (Event t (IntMap (RequesterData request)))) -> Event t (IntMap (IntMap (RequesterData request))))
433− -> (IntMap.Key -> v -> RequesterT t request response m v')
434− -> IntMap v
435− -> Event t (p v)
436− -> RequesterT t request response m (IntMap v', Event t (p v'))
437−traverseIntMapWithKeyWithAdjustRequesterTWith base patchNewElements mergePatchIncremental f dm0 dm' = do
438− rec response <- requesting' $ fmapCheap pack $ promptRequests `mappend` mergePatchIncremental requests --TODO: Investigate whether we can really get rid of the prompt stuff here
439− let responses :: EventSelectorInt t (IntMap (RequesterData response))
440− responses = fanInt $ fmapCheap unpack response
441− unpack :: Entry response Multi3 -> IntMap (IntMap (RequesterData response))
442− unpack = unEntry
443− pack :: IntMap (IntMap (RequesterData request)) -> Entry request Multi3
444− pack = Entry
445− f' :: IntMap.Key -> (Int, v) -> m (Event t (IntMap (RequesterData request)), v')
446− f' k (n, v) = do
447− (result, myRequests) <- runRequesterT (f k v) $ mapMaybeCheap (IntMap.lookup n) $ selectInt responses k --TODO: Instead of doing mapMaybeCheap, can we share a fanInt across all instances of a given key, or at least the ones that are adjacent in time?
448− return (fmapCheap (IntMap.singleton n) myRequests, result)
449− ndm' <- numberOccurrencesFrom 1 dm'
450− (children0, children') <- base f' (fmap ((,) 0) dm0) $ fmap (\(n, dm) -> fmap ((,) n) dm) ndm' --TODO: Avoid this somehow, probably by adding some sort of per-cohort information passing to Adjustable
451− let result0 = fmap snd children0
452− result' = fforCheap children' $ fmap snd
453− requests0 :: IntMap (Event t (IntMap (RequesterData request)))
454− requests0 = fmap fst children0
455− requests' :: Event t (p (Event t (IntMap (RequesterData request))))
456− requests' = fforCheap children' $ fmap fst
457− promptRequests :: Event t (IntMap (IntMap (RequesterData request)))
458− promptRequests = coincidence $ fmapCheap (mergeInt . patchNewElements) requests' --TODO: Create a mergeIncrementalPromptly, and use that to eliminate this 'coincidence'
459− requests <- holdIncremental requests0 requests'
460− return (result0, result')
461−
462−{-# INLINE traverseDMapWithKeyWithAdjustRequesterTWith #-}
463−traverseDMapWithKeyWithAdjustRequesterTWith :: forall k t request response m v v' p p'.
464− ( GCompare k
465− , Reflex t
466− , MonadHold t m
467− , PatchTarget (p' (Some k) (Event t (IntMap (RequesterData request)))) ~ Map (Some k) (Event t (IntMap (RequesterData request)))
468− , Patch (p' (Some k) (Event t (IntMap (RequesterData request))))
469− , MonadFix m
470− )
471− => (forall k' v1 v2. GCompare k'
472− => (forall a. k' a -> v1 a -> m (v2 a))
473− -> DMap k' v1
474− -> Event t (p k' v1)
475− -> RequesterT t request response m (DMap k' v2, Event t (p k' v2))
476− )
477− -> (forall v1 v2. (forall a. v1 a -> v2 a) -> p k v1 -> p k v2)
478− -> (forall v1 v2. (forall a. v1 a -> v2) -> p k v1 -> p' (Some k) v2)
479− -> (forall v2. p' (Some k) v2 -> Map (Some k) v2)
480− -> (forall a. Incremental t (p' (Some k) (Event t a)) -> Event t (Map (Some k) a))
481− -> (forall a. k a -> v a -> RequesterT t request response m (v' a))
482− -> DMap k v
483− -> Event t (p k v)
484− -> RequesterT t request response m (DMap k v', Event t (p k v'))
485−traverseDMapWithKeyWithAdjustRequesterTWith base mapPatch weakenPatchWith patchNewElements mergePatchIncremental f dm0 dm' = do
486− rec response <- requesting' $ fmapCheap pack $ promptRequests `mappend` mergePatchIncremental requests --TODO: Investigate whether we can really get rid of the prompt stuff here
487− let responses :: EventSelector t (Const2 (Some k) (IntMap (RequesterData response)))
488− responses = fanMap $ fmapCheap unpack response
489− unpack :: Entry response (Multi2 k) -> Map (Some k) (IntMap (RequesterData response))
490− unpack = _multi2Contents_values . unEntry
491− pack :: Map (Some k) (IntMap (RequesterData request)) -> Entry request (Multi2 k)
492− pack m = Entry $ Multi2Contents { _multi2Contents_values = m, _multi2Contents_dict = Dict }
493− f' :: forall a. k a -> Compose ((,) Int) v a -> m (Compose ((,) (Event t (IntMap (RequesterData request)))) v' a)
494− f' k (Compose (n, v)) = do
495− (result, myRequests) <- runRequesterT (f k v) $ mapMaybeCheap (IntMap.lookup n) $ select responses (Const2 (Some k))
496− return $ Compose (fmapCheap (IntMap.singleton n) myRequests, result)
497− ndm' <- numberOccurrencesFrom 1 dm'
498− (children0, children') <- base f' (DMap.map (\v -> Compose (0, v)) dm0) $ fmap (\(n, dm) -> mapPatch (\v -> Compose (n, v)) dm) ndm'
499− let result0 = DMap.map (snd . getCompose) children0
500− result' = fforCheap children' $ mapPatch $ snd . getCompose
501− requests0 :: Map (Some k) (Event t (IntMap (RequesterData request)))
502− requests0 = weakenDMapWith (fst . getCompose) children0
503− requests' :: Event t (p' (Some k) (Event t (IntMap (RequesterData request))))
504− requests' = fforCheap children' $ weakenPatchWith $ fst . getCompose
505− promptRequests :: Event t (Map (Some k) (IntMap (RequesterData request)))
506− promptRequests = coincidence $ fmapCheap (mergeMap . patchNewElements) requests' --TODO: Create a mergeIncrementalPromptly, and use that to eliminate this 'coincidence'
507− requests <- holdIncremental requests0 requests'
508− return (result0, result')
509−
510−data Decoder rawResponse response =
511− forall a. Decoder (RequesterDataKey a) (rawResponse -> response a)
512−
513−matchResponsesWithRequests
514− :: forall t rawRequest rawResponse request response m.
515− ( MonadFix m
516− , MonadHold t m
517− , Reflex t
518− )
519− => (forall a. request a -> (rawRequest, rawResponse -> response a))
520− -- ^ Given a request (from 'Requester'), produces the wire format of the
521− -- request and a function used to process the associated response
522− -> Event t (RequesterData request)
523− -- ^ The outgoing requests
524− -> Event t (Int, rawResponse)
525− -- ^ The incoming responses, tagged by an identifying key
526− -> m ( Event t (Map Int rawRequest)
527− , Event t (RequesterData response)
528− )
529− -- ^ A map of outgoing wire-format requests and an event of responses keyed
530− -- by the 'RequesterData' key of the associated outgoing request
531−matchResponsesWithRequests f send recv = matchResponseMapWithRequests f send $ uncurry Map.singleton <$> recv
532−
533−-- | Matches incoming responses with previously-sent requests
534−-- and uses the provided request "decoder" function to process
535−-- incoming responses.
536−matchResponseMapWithRequests
537− :: forall t rawRequest rawResponse request response m.
538− ( MonadFix m
539− , MonadHold t m
540− , Reflex t
541− )
542− => (forall a. request a -> (rawRequest, rawResponse -> response a))
543− -- ^ Given a request (from 'Requester'), produces the wire format of the
544− -- request and a function used to process the associated response
545− -> Event t (RequesterData request)
546− -- ^ The outgoing requests
547− -> Event t (Map Int rawResponse)
548− -- ^ A map of incoming responses, tagged by an identifying key
549− -> m ( Event t (Map Int rawRequest)
550− , Event t (RequesterData response)
551− )
552− -- ^ A map of outgoing wire-format requests and an event of responses keyed
553− -- by the 'RequesterData' key of the associated outgoing request
554−matchResponseMapWithRequests f send recv = do
555− rec nextId <- hold 1 $ fmap (\(next, _, _) -> next) outgoing
556− waitingFor :: Incremental t (PatchMap Int (Decoder rawResponse response)) <-
557− holdIncremental mempty $ leftmost
558− [ fmap (\(_, outstanding, _) -> outstanding) outgoing
559− , snd <$> incoming
560− ]
561− let outgoing = processOutgoing nextId send
562− incoming = processIncoming waitingFor recv
563− return (fmap (\(_, _, rawReqs) -> rawReqs) outgoing, fst <$> incoming)
564− where
565− -- Tags each outgoing request with an identifying integer key
566− -- and returns the next available key, a map of response decoders
567− -- for requests for which there are outstanding responses, and the
568− -- raw requests to be sent out.
569− processOutgoing
570− :: Behavior t Int
571− -- The next available key
572− -> Event t (RequesterData request)
573− -- The outgoing request
574− -> Event t ( Int
575− , PatchMap Int (Decoder rawResponse response)
576− , Map Int rawRequest )
577− -- The new next-available-key, a map of requests expecting responses, and the tagged raw requests
578− processOutgoing nextId out = flip pushAlways out $ \dm -> do
579− oldNextId <- sample nextId
580− let (result, newNextId) = flip runState oldNextId $ forM (requesterDataToList dm) $ \(k :=> v) -> do
581− n <- get
582− put $ succ n
583− let (rawReq, rspF) = f v
584− return (n, rawReq, Decoder k rspF)
585− patchWaitingFor = PatchMap $ Map.fromList $
586− (\(n, _, dec) -> (n, Just dec)) <$> result
587− toSend = Map.fromList $ (\(n, rawReq, _) -> (n, rawReq)) <$> result
588− return (newNextId, patchWaitingFor, toSend)
589− -- Looks up the each incoming raw response in a map of response
590− -- decoders and returns the decoded response and a patch that can
591− -- be used to clear the ID of the consumed response out of the queue
592− -- of expected responses.
593− processIncoming
594− :: Incremental t (PatchMap Int (Decoder rawResponse response))
595− -- A map of outstanding expected responses
596− -> Event t (Map Int rawResponse)
597− -- A incoming response paired with its identifying key
598− -> Event t (RequesterData response, PatchMap Int v)
599− -- The decoded response and a patch that clears the outstanding responses queue
600− processIncoming waitingFor inc = flip push inc $ \rspMap -> do
601− wf <- sample $ currentIncremental waitingFor
602− let match rawRsp (Decoder k rspF) =
603− let rsp = rspF rawRsp
604− in singletonRequesterData k rsp
605− matches = Map.intersectionWith match rspMap wf
606− pure $ if Map.null matches then Nothing else Just
607− (Map.foldl' mergeRequesterData emptyRequesterData matches, PatchMap $ Nothing <$ matches)
src/Reflex/Requester/Base/Internal.hsnew file+310
@@ -0,0 +1,310 @@
1+{-# LANGUAGE AllowAmbiguousTypes #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE EmptyDataDecls #-}
4+{-# LANGUAGE ExistentialQuantification #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE GADTs #-}
7+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE Rank2Types #-}
10+{-# LANGUAGE RecursiveDo #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
12+{-# LANGUAGE StandaloneDeriving #-}
13+{-# LANGUAGE TypeApplications #-}
14+{-# LANGUAGE TypeFamilies #-}
15+{-# LANGUAGE TypeOperators #-}
16+{-# LANGUAGE UndecidableInstances #-}
17+{-# LANGUAGE InstanceSigs #-}
18+#ifdef USE_REFLEX_OPTIMIZER
19+{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
20+#endif
21+module Reflex.Requester.Base.Internal where
22+
23+import Reflex.Class
24+import Reflex.Adjustable.Class
25+import Reflex.Host.Class
26+import Reflex.PerformEvent.Class
27+import Reflex.PostBuild.Class
28+import Reflex.Requester.Class
29+import Reflex.TriggerEvent.Class
30+import Reflex.EventWriter.Base
31+import Reflex.EventWriter.Class
32+
33+import Control.Applicative (liftA2)
34+import Control.Monad.Exception
35+import Control.Monad.Fail
36+import Control.Monad.Identity
37+import Control.Monad.Primitive
38+import Control.Monad.Reader
39+import Control.Monad.Ref
40+import Control.Monad.State
41+import Data.Coerce
42+import Data.Dependent.Map (DSum (..))
43+import qualified Data.List.NonEmpty as NonEmpty
44+import Data.List.NonEmpty.Deferred (NonEmptyDeferred)
45+import qualified Data.List.NonEmpty.Deferred as NonEmptyDeferred
46+import Data.Monoid ((<>))
47+import qualified Data.Semigroup as S
48+import Data.Some (Some(Some))
49+import Data.Type.Equality
50+import Data.TagMap (TagMap)
51+import qualified Data.TagMap as TagMap
52+import Reflex.FanTag
53+import Data.Unique.Tag.Local
54+import Data.GADT.Compare
55+import Data.Witherable
56+
57+import Unsafe.Coerce
58+
59+import Debug.Trace
60+
61+import Data.Map (Map)
62+import qualified Data.Map as Map
63+import qualified Data.IntMap as IntMap
64+import GHC.Exts (Any)
65+
66+data RequestData ps request = forall s. RequestData !(TagGen ps s) !(NonEmptyDeferred (RequestEnvelope s request))
67+
68+data RequestEnvelope s request = forall a. RequestEnvelope {-# UNPACK #-} !(Maybe (Tag s a)) !(request a)
69+
70+data ResponseData ps response = forall s. ResponseData !(TagGen ps s) !(TagMap s response)
71+
72+traverseRequesterData :: forall m request response. Applicative m => (forall a. request a -> m (response a)) -> RequestData (PrimState m) request -> m (ResponseData (PrimState m) response)
73+traverseRequesterData f (RequestData tg es) = ResponseData tg . TagMap.fromList <$> wither g (NonEmpty.toList $ NonEmptyDeferred.toNonEmpty es)
74+ where g (RequestEnvelope mt req) = case mt of
75+ Just t -> Just . (t :=>) <$> f req
76+ Nothing -> Nothing <$ f req
77+
78+-- | 'traverseRequesterData' with its arguments flipped
79+forRequesterData :: forall request response m. Applicative m => RequestData (PrimState m) request -> (forall a. request a -> m (response a)) -> m (ResponseData (PrimState m) response)
80+forRequesterData r f = traverseRequesterData f r
81+
82+runRequesterT :: forall t request response m a
83+ . ( Reflex t
84+ , PrimMonad m
85+ , MonadFix m
86+ )
87+ => RequesterT t request response m a
88+ -> Event t (ResponseData (PrimState m) response)
89+ -> m (a, Event t (RequestData (PrimState m) request))
90+runRequesterT (RequesterT a) wrappedResponses = withRequesterInternalT $ \requests -> do
91+ (_, tg) <- RequesterInternalT ask
92+ result <- a
93+ let responses = fforMaybe wrappedResponses $ \(ResponseData tg' m) -> case tg `geq` tg' of
94+ Nothing -> trace ("runRequesterT: bad TagGen: expected " <> show tg <> " but got " <> show tg') Nothing --TODO: Warn somehow
95+ Just Refl -> Just m
96+ pure (responses, (result, fmapCheap (RequestData tg) requests))
97+
98+instance MonadTrans (RequesterInternalT s t request response) where
99+ lift = RequesterInternalT . lift . lift
100+
101+instance MonadTrans (RequesterT t request response) where
102+ lift a = RequesterT $ RequesterInternalT $ lift $ lift a
103+
104+-- | Run a 'RequesterT' action. The resulting 'Event' will fire whenever
105+-- requests are made, and responses should be provided in the input 'Event'.
106+-- The 'Tag' keys will be used to return the responses to the same place the
107+-- requests were issued.
108+withRequesterInternalT
109+ :: forall t m request response a.
110+ ( Reflex t
111+ , PrimMonad m
112+ , MonadFix m
113+ )
114+ => (Event t (NonEmptyDeferred (RequestEnvelope FakeRequesterStatePhantom request)) -> RequesterInternalT FakeRequesterStatePhantom t request response m (Event t (TagMap FakeRequesterStatePhantom response), a))
115+ -> m a
116+withRequesterInternalT f = do
117+ stg <- newTagGen
118+ let tg = case stg of
119+ Some tg' -> (unsafeCoerce :: TagGen (PrimState m) s -> TagGen (PrimState m) FakeRequesterStatePhantom) tg'
120+ rec let RequesterInternalT a = (unsafeCoerce :: RequesterInternalT s t request response m (Event t (TagMap FakeRequesterStatePhantom response), a) -> RequesterInternalT FakeRequesterStatePhantom t request response m (Event t (TagMap FakeRequesterStatePhantom response), a)) $ f requests
121+ ((responses, result), requests) <- runEventWriterT $ runReaderT a (fanTag responses, tg)
122+ pure result
123+
124+-- This is because using forall ruins inlining
125+data FakeRequesterStatePhantom
126+
127+newtype RequesterT t (request :: * -> *) (response :: * -> *) m a = RequesterT { unRequesterT :: RequesterInternalT FakeRequesterStatePhantom t request response m a }
128+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException)
129+
130+newtype RequesterInternalT s t request response m a = RequesterInternalT { unRequesterInternalT :: ReaderT (EventSelectorTag t s response, TagGen (PrimState m) s) (EventWriterT t (NonEmptyDeferred (RequestEnvelope s request)) m) a }
131+ deriving
132+ ( Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
133+#if MIN_VERSION_base(4,9,1)
134+ , MonadAsyncException
135+#endif
136+ )
137+
138+-- I don't think this can actually be supported without unsafeCoercing around the fact that the phantoms don't match up. In fact, implementations could probably supply `unmask` functions that would actually do the wrong thing.
139+-- #if MIN_VERSION_base(4,9,1)
140+-- instance MonadAsyncException m => MonadAsyncException (RequesterT t request response m) where
141+-- mask f = RequesterT $ mask $ \unmask -> unRequesterT $ f $ \x -> RequesterT $ unmask $ unRequesterT x
142+-- #endif
143+
144+deriving instance MonadSample t m => MonadSample t (RequesterT t request response m)
145+deriving instance MonadHold t m => MonadHold t (RequesterT t request response m)
146+deriving instance PostBuild t m => PostBuild t (RequesterT t request response m)
147+deriving instance TriggerEvent t m => TriggerEvent t (RequesterT t request response m)
148+
149+deriving instance MonadSample t m => MonadSample t (RequesterInternalT s t request response m)
150+deriving instance MonadHold t m => MonadHold t (RequesterInternalT s t request response m)
151+deriving instance PostBuild t m => PostBuild t (RequesterInternalT s t request response m)
152+deriving instance TriggerEvent t m => TriggerEvent t (RequesterInternalT s t request response m)
153+
154+instance PrimMonad m => PrimMonad (RequesterT t request response m) where
155+ type PrimState (RequesterT t request response m) = PrimState m
156+ primitive = lift . primitive
157+
158+-- TODO: Monoid and Semigroup can likely be derived once StateT has them.
159+instance (Monoid a, Monad m) => Monoid (RequesterT t request response m a) where
160+ mempty = pure mempty
161+ mappend = liftA2 mappend
162+
163+instance (S.Semigroup a, Monad m) => S.Semigroup (RequesterT t request response m a) where
164+ (<>) = liftA2 (S.<>)
165+
166+instance PerformEvent t m => PerformEvent t (RequesterT t request response m) where
167+ type Performable (RequesterT t request response m) = Performable m
168+ performEvent_ = lift . performEvent_
169+ performEvent = lift . performEvent
170+
171+instance MonadRef m => MonadRef (RequesterT t request response m) where
172+ type Ref (RequesterT t request response m) = Ref m
173+ newRef = lift . newRef
174+ readRef = lift . readRef
175+ writeRef r = lift . writeRef r
176+
177+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (RequesterT t request response m) where
178+ newEventWithTrigger = lift . newEventWithTrigger
179+ newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
180+
181+instance MonadReader r m => MonadReader r (RequesterT t request response m) where
182+ ask = lift ask
183+ local f (RequesterT a) = RequesterT $ RequesterInternalT $ mapReaderT (mapEventWriterT $ local f) $ unRequesterInternalT a
184+ reader = lift . reader
185+
186+instance (Reflex t, PrimMonad m) => Requester t (RequesterT t request response m) where
187+ type Request (RequesterT t request response m) = request
188+ type Response (RequesterT t request response m) = response
189+ requesting e = RequesterT $ requesting e
190+ requesting_ e = RequesterT $ requesting_ e
191+
192+instance (Reflex t, PrimMonad m) => Requester t (RequesterInternalT s t request response m) where
193+ type Request (RequesterInternalT s t request response m) = request
194+ type Response (RequesterInternalT s t request response m) = response
195+ requesting e = RequesterInternalT $ do
196+ (s, tg) <- ask
197+ t <- lift $ lift $ newTag tg
198+ tellEvent $ fmapCheap (NonEmptyDeferred.singleton . RequestEnvelope (Just t)) e
199+ pure $ selectTag s t
200+ requesting_ e = RequesterInternalT $ do
201+ tellEvent $ fmapCheap (NonEmptyDeferred.singleton . RequestEnvelope Nothing) e
202+
203+instance (Adjustable t m, MonadHold t m) => Adjustable t (RequesterInternalT s t request response m) where
204+ {-# INLINE runWithReplace #-}
205+ runWithReplace (RequesterInternalT a0) a' = RequesterInternalT $ runWithReplace a0 (coerceEvent a')
206+ {-# INLINE traverseIntMapWithKeyWithAdjust #-}
207+ traverseIntMapWithKeyWithAdjust f dm0 dm' = RequesterInternalT $ traverseIntMapWithKeyWithAdjust (coerce . f) dm0 dm'
208+ {-# INLINE traverseDMapWithKeyWithAdjust #-}
209+ traverseDMapWithKeyWithAdjust f dm0 dm' = RequesterInternalT $ traverseDMapWithKeyWithAdjust (coerce . f) dm0 dm'
210+ {-# INLINE traverseDMapWithKeyWithAdjustWithMove #-}
211+ traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = RequesterInternalT $ traverseDMapWithKeyWithAdjustWithMove (coerce . f) dm0 dm'
212+
213+instance (Adjustable t m, MonadHold t m) => Adjustable t (RequesterT t request response m) where
214+ {-# INLINE runWithReplace #-}
215+ runWithReplace (RequesterT a0) a' = RequesterT $ runWithReplace a0 (fmapCheap unRequesterT a')
216+ {-# INLINE traverseIntMapWithKeyWithAdjust #-}
217+ traverseIntMapWithKeyWithAdjust f dm0 dm' = RequesterT $ traverseIntMapWithKeyWithAdjust (\k v -> unRequesterT $ f k v) dm0 dm'
218+ {-# INLINE traverseDMapWithKeyWithAdjust #-}
219+ traverseDMapWithKeyWithAdjust f dm0 dm' = RequesterT $ traverseDMapWithKeyWithAdjust (\k v -> unRequesterT $ f k v) dm0 dm'
220+ {-# INLINE traverseDMapWithKeyWithAdjustWithMove #-}
221+ traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = RequesterT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> unRequesterT $ f k v) dm0 dm'
222+
223+
224+data Decoder rawResponse response =
225+ forall s a. Decoder (Tag s a) (rawResponse -> response a)
226+
227+-- | Matches incoming responses with previously-sent requests
228+-- and uses the provided request "decoder" function to process
229+-- incoming responses.
230+matchResponsesWithRequests
231+ :: forall t rawRequest rawResponse request response m.
232+ ( MonadFix m
233+ , MonadHold t m
234+ , PrimMonad m
235+ , Reflex t
236+ )
237+ => (forall a. request a -> (rawRequest, rawResponse -> response a))
238+ -- ^ Given a request (from 'Requester'), produces the wire format of the
239+ -- request and a function used to process the associated response
240+ -> Event t (RequestData (PrimState m) request)
241+ -- ^ The outgoing requests
242+ -> Event t (Int, rawResponse)
243+ -- ^ The incoming responses, tagged by an identifying key
244+ -> m ( Event t (Map Int rawRequest)
245+ , Event t (ResponseData (PrimState m) response)
246+ )
247+ -- ^ A map of outgoing wire-format requests and an event of responses keyed
248+ -- by the 'RequesterData' key of the associated outgoing request
249+matchResponsesWithRequests f send recv = withTagGen $ \tagGen -> mdo
250+ waitingFor <- holdIncremental mempty $
251+ leftmost [ fst <$> outgoing, snd <$> incoming ]
252+ let outgoing = processOutgoing send
253+ incoming = processIncoming waitingFor tagGen recv
254+ return (snd <$> outgoing, fst <$> incoming)
255+ where
256+
257+ -- Tags each outgoing request with an identifying integer key
258+ -- and returns the next available key, a map of response decoders
259+ -- for requests for which there are outstanding responses, and the
260+ -- raw requests to be sent out.
261+ processOutgoing
262+ :: Event t (RequestData (PrimState m) request)
263+ -- The outgoing request
264+ -> Event t ( PatchMap Int (Decoder rawResponse response)
265+ , Map Int rawRequest )
266+ -- A map of requests expecting responses, and the tagged raw requests
267+ processOutgoing eventOutgoingRequest = flip pushAlways eventOutgoingRequest $ \(RequestData _ requestEnvelopes) -> do
268+ let results = ffor (requestEnvelopesToDSums requestEnvelopes) $ \(k :=> v) ->
269+ let (rawRequest, responseDecoder) = f v
270+ in (tagId k, rawRequest, Decoder k responseDecoder)
271+ let patchWaitingFor = PatchMap $ Map.fromList $ (\(n, _, dec) -> (n, Just dec)) <$> results
272+ let toSend = Map.fromList $ (\(n, rawRequest, _) -> (n, rawRequest)) <$> results
273+ return (patchWaitingFor, toSend)
274+
275+ -- Looks up the each incoming raw response in a map of response
276+ -- decoders and returns the decoded response and a patch that can
277+ -- be used to clear the ID of the consumed response out of the queue
278+ -- of expected responses.
279+ processIncoming
280+ :: Incremental t (PatchMap Int (Decoder rawResponse response))
281+ -- A map of outstanding expected responses
282+ -> TagGen (PrimState m) s
283+ -- A tag generator
284+ -> Event t (Int, rawResponse)
285+ -- A incoming response paired with its identifying key
286+ -> Event t (ResponseData (PrimState m) response, PatchMap Int v)
287+ -- The decoded response and a patch that clears the outstanding responses queue
288+ processIncoming incWaitingFor tagGen inc = flip push inc $ \(n, rawRsp) -> do
289+ waitingFor <- sample $ currentIncremental incWaitingFor
290+ case Map.lookup n waitingFor of
291+ Nothing -> return Nothing -- TODO How should lookup failures be handled here? They shouldn't ever happen..
292+ Just (Decoder tag responseDecoder) ->
293+ return $ Just
294+ ( singletonResponseData tagGen (unsafeTagFromId n) (responseDecoder rawRsp)
295+ , PatchMap $ Map.singleton n Nothing
296+ )
297+
298+requestEnvelopesToDSums :: forall s request. NonEmptyDeferred (RequestEnvelope s request) -> [DSum (Tag s) request]
299+requestEnvelopesToDSums requestEnvelopes = catMaybes $ f <$> NonEmptyDeferred.toList requestEnvelopes
300+ where f :: (RequestEnvelope s request) -> Maybe (DSum (Tag s) request)
301+ f (RequestEnvelope (Just tag) v) = Just (tag :=> v)
302+ f (RequestEnvelope Nothing _) = Nothing
303+
304+singletonRequestData :: TagGen ps s -> Maybe (Tag s a) -> request a -> RequestData ps request
305+singletonRequestData tagGen maybeTag request =
306+ RequestData tagGen $ NonEmptyDeferred.singleton $ RequestEnvelope maybeTag request
307+
308+singletonResponseData :: TagGen ps s -> Tag ps s -> response a -> ResponseData ps response
309+singletonResponseData tagGen tag response =
310+ ResponseData tagGen $ TagMap.singletonTagMap tag response
src/Reflex/Requester/Class.hs+1−1
@@ -40,7 +40,7 @@ class (Reflex t, Monad m) => Requester t m | m -> t where
40 requesting :: Event t (Request m a) -> m (Event t (Response m a))
40 requesting :: Event t (Request m a) -> m (Event t (Response m a))
41 -- | Emit a request whenever the given 'Event' fires, and ignore all responses.
41 -- | Emit a request whenever the given 'Event' fires, and ignore all responses.
42 requesting_ :: Event t (Request m a) -> m ()
42 requesting_ :: Event t (Request m a) -> m ()
43−
43+--TODO: Make Requester polykinded, where Request m and Response m both take an argument of the same kind
44
44
45instance Requester t m => Requester t (ReaderT r m) where
45instance Requester t m => Requester t (ReaderT r m) where
46 type Request (ReaderT r m) = Request m
46 type Request (ReaderT r m) = Request m
src/Reflex/Spider/Internal.hs+14−40
@@ -9,6 +9,7 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12+{-# LANGUAGE MultiWayIf #-}
12{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE RoleAnnotations #-}
14{-# LANGUAGE ScopedTypeVariables #-}
15{-# LANGUAGE ScopedTypeVariables #-}
@@ -19,7 +20,6 @@
19{-# LANGUAGE DeriveFunctor #-}
20{-# LANGUAGE DeriveFunctor #-}
20{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE InstanceSigs #-}
22{-# LANGUAGE InstanceSigs #-}
22−{-# LANGUAGE MultiWayIf #-}
23
23
24#ifdef USE_REFLEX_OPTIMIZER
24#ifdef USE_REFLEX_OPTIMIZER
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -46,9 +46,8 @@ import Control.Monad.Fail (MonadFail)
46import qualified Control.Monad.Fail as MonadFail
46import qualified Control.Monad.Fail as MonadFail
47import Data.Align
47import Data.Align
48import Data.Coerce
48import Data.Coerce
49−import Data.Dependent.Map (DMap)
49+import Data.Dependent.Map (DMap, DSum (..))
50import qualified Data.Dependent.Map as DMap
50import qualified Data.Dependent.Map as DMap
51−import Data.Dependent.Sum (DSum (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
51import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
53import qualified Data.FastMutableIntMap as FastMutableIntMap
52import qualified Data.FastMutableIntMap as FastMutableIntMap
54import Data.Foldable hiding (concat, elem, sequence_)
53import Data.Foldable hiding (concat, elem, sequence_)
@@ -307,20 +306,7 @@ data CacheSubscribed x a
307#endif
306#endif
308 }
307 }
309
308
310−nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
309+
311−nowSpiderEventM =
312− SpiderEvent <$> now
313−
314−now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
315− ) => m (Event x ())
316−now = do
317− nowOrNot <- liftIO $ newIORef $ Just ()
318− scheduleClear nowOrNot
319− return . Event $ \_ -> do
320− occ <- liftIO . readIORef $ nowOrNot
321− return ( EventSubscription (return ()) eventSubscribedNow
322− , occ
323− )
324
310
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
311-- | Construct an 'Event' whose value is guaranteed not to be recomputed
326-- repeatedly
312-- repeatedly
@@ -464,6 +450,16 @@ data Subscriber x a = Subscriber
464 , subscriberRecalculateHeight :: !(Height -> IO ())
450 , subscriberRecalculateHeight :: !(Height -> IO ())
465 }
451 }
466
452
453+--TODO: Move this comment to WeakBag
454+-- These function are constructor functions that are marked NOINLINE so they are
455+-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
456+-- so any weak references that are attached to the constructors will have their
457+-- finalizer run. Using the opaque constructor, does not see the
458+-- constructor application, so it behaves like an IORef and cannot be fused away.
459+--
460+-- The result is also evaluated to WHNF, since forcing a thunk invalidates
461+-- the weak pointer to it in some cases.
462+
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
463newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
468newSubscriberHold h = return $ Subscriber
464newSubscriberHold h = return $ Subscriber
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
465 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -607,16 +603,6 @@ eventSubscribedNever = EventSubscribed
607 , eventSubscribedWhoCreated = return ["never"]
603 , eventSubscribedWhoCreated = return ["never"]
608#endif
604#endif
609 }
605 }
610−eventSubscribedNow :: EventSubscribed x
611−eventSubscribedNow = EventSubscribed
612− { eventSubscribedHeightRef = zeroRef
613− , eventSubscribedRetained = toAny ()
614−#ifdef DEBUG_CYCLES
615− , eventSubscribedGetParents = return []
616− , eventSubscribedHasOwnHeightRef = False
617− , eventSubscribedWhoCreated = return ["now"]
618−#endif
619− }
620
606
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
607eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
622eventSubscribedFan !subscribed = EventSubscribed
608eventSubscribedFan !subscribed = EventSubscribed
@@ -2520,8 +2506,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2520 {-# INLINABLE headE #-}
2506 {-# INLINABLE headE #-}
2521 headE = R.slowHeadE
2507 headE = R.slowHeadE
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2508-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523− {-# INLINABLE now #-}
2524− now = nowSpiderEventM
2525
2509
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2510instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2527 {-# INLINABLE sample #-}
2511 {-# INLINABLE sample #-}
@@ -2543,9 +2527,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2543 {-# INLINABLE headE #-}
2527 {-# INLINABLE headE #-}
2544 headE = R.slowHeadE
2528 headE = R.slowHeadE
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2529-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546− {-# INLINABLE now #-}
2547− now = SpiderPushM nowSpiderEventM
2548−
2549
2530
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2531instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2551 {-# INLINE return #-}
2532 {-# INLINE return #-}
@@ -2609,9 +2590,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2590 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2610 {-# INLINABLE headE #-}
2591 {-# INLINABLE headE #-}
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2592 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612− {-# INLINABLE now #-}
2613− now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2614−
2615
2593
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2594instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2595 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2628,8 +2606,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2628 {-# INLINABLE headE #-}
2606 {-# INLINABLE headE #-}
2629 headE = R.slowHeadE
2607 headE = R.slowHeadE
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2608-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631− {-# INLINABLE now #-}
2632− now = SpiderHostFrame Reflex.Class.now
2633
2609
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2610instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2635 {-# INLINABLE sample #-}
2611 {-# INLINABLE sample #-}
@@ -2650,8 +2626,6 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2626 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2651 {-# INLINABLE headE #-}
2627 {-# INLINABLE headE #-}
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2628 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653− {-# INLINABLE now #-}
2654− now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2655
2629
2656--------------------------------------------------------------------------------
2630--------------------------------------------------------------------------------
2657-- Deprecated items
2631-- Deprecated items
@@ -2775,7 +2749,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2749 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2776 {-# INLINABLE mergeG #-}
2750 {-# INLINABLE mergeG #-}
2777 mergeG
2751 mergeG
2778− :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2752+ :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2753 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2780 -> DMap k q
2754 -> DMap k q
2781 -> R.Event (SpiderTimeline x) (DMap k v)
2755 -> R.Event (SpiderTimeline x) (DMap k v)
src/Reflex/TriggerEvent/Base.hs−2
@@ -122,8 +122,6 @@ instance MonadHold t m => MonadHold t (TriggerEventT t m) where
122 buildDynamic a0 = lift . buildDynamic a0
122 buildDynamic a0 = lift . buildDynamic a0
123 {-# INLINABLE headE #-}
123 {-# INLINABLE headE #-}
124 headE = lift . headE
124 headE = lift . headE
125− {-# INLINABLE now #-}
126− now = lift now
127
125
128instance Adjustable t m => Adjustable t (TriggerEventT t m) where
126instance Adjustable t m => Adjustable t (TriggerEventT t m) where
129 {-# INLINABLE runWithReplace #-}
127 {-# INLINABLE runWithReplace #-}
src/Reflex/TriggerEvent/Class.hs−6
@@ -12,7 +12,6 @@ import Reflex.Class
12import Control.Monad.Reader
12import Control.Monad.Reader
13import Control.Monad.State
13import Control.Monad.State
14import qualified Control.Monad.State.Strict as Strict
14import qualified Control.Monad.State.Strict as Strict
15−import Control.Monad.Trans.Maybe (MaybeT)
16
15
17--TODO: Shouldn't have IO hard-coded
16--TODO: Shouldn't have IO hard-coded
18-- | 'TriggerEvent' represents actions that can create 'Event's that can be
17-- | 'TriggerEvent' represents actions that can create 'Event's that can be
@@ -48,8 +47,3 @@ instance TriggerEvent t m => TriggerEvent t (Strict.StateT s m) where
48 newTriggerEvent = lift newTriggerEvent
47 newTriggerEvent = lift newTriggerEvent
49 newTriggerEventWithOnComplete = lift newTriggerEventWithOnComplete
48 newTriggerEventWithOnComplete = lift newTriggerEventWithOnComplete
50 newEventWithLazyTriggerWithOnComplete = lift . newEventWithLazyTriggerWithOnComplete
49 newEventWithLazyTriggerWithOnComplete = lift . newEventWithLazyTriggerWithOnComplete
51−
52−instance TriggerEvent t m => TriggerEvent t (MaybeT m) where
53− newTriggerEvent = lift newTriggerEvent
54− newTriggerEventWithOnComplete = lift newTriggerEventWithOnComplete
55− newEventWithLazyTriggerWithOnComplete = lift . newEventWithLazyTriggerWithOnComplete
test/Adjustable.hs+3−2
@@ -22,7 +22,7 @@ main = do
22 -- If the final counter value in the adjusted widgets corresponds to the number of times it has
22 -- If the final counter value in the adjusted widgets corresponds to the number of times it has
23 -- been incremented, we know that the networks haven't broken.
23 -- been incremented, we know that the networks haven't broken.
24 let expectedCount = length $ ffilter (== Increment) actions
24 let expectedCount = length $ ffilter (== Increment) actions
25− -- let !True = last (last os) == [expectedCount,expectedCount] -- TODO re-enable this test after issue #369 has been resolved
25+ let !True = last (last os) == [expectedCount,expectedCount]
26 return ()
26 return ()
27
27
28data PatchMapTestAction
28data PatchMapTestAction
@@ -59,4 +59,5 @@ testPatchMapWithMove pulse = do
59 (Map.fromList $ zip [0..] "ab")
59 (Map.fromList $ zip [0..] "ab")
60 (fmapMaybe id pulseAction)
60 (fmapMaybe id pulseAction)
61 return ()
61 return ()
62− return result
62+ return result
63+
test/EventWriterT.hs+15−11
@@ -24,26 +24,30 @@ import Test.Run
24
24
25main :: IO ()
25main :: IO ()
26main = do
26main = do
27− os1@[[Just [10,9,8,7,6,5,4,3,2,1]]] <- runApp' (unwrapApp testOrdering) $
27+ os1 <- runApp' (unwrapApp testOrdering) $
28 [ Just ()
28 [ Just ()
29 ]
29 ]
30 print os1
30 print os1
31− os2@[[Just [1,3,5,7,9]],[Nothing,Nothing],[Just [2,4,6,8,10]],[Just [2,4,6,8,10],Nothing]]
32− <- runApp' (unwrapApp testSimultaneous) $ map Just $
31+ os2 <- runApp' (unwrapApp testSimultaneous) $ map Just $
33− [ This ()
32+ [ This ()
34− , That ()
33+ , That ()
35− , This ()
34+ , This ()
36− , These () ()
35+ , These () ()
37− ]
36+ ]
38 print os2
37 print os2
39− os3@[[Nothing, Just [2]]] <- runApp' (unwrapApp testMoribundTellEvent) [Just ()]
38+ os3 <- runApp' (unwrapApp testMoribundTellEvent) [Just ()]
40 print os3
39 print os3
41− os4@[[Nothing, Just [2]]] <- runApp' (unwrapApp testMoribundTellEventDMap) [Just ()]
40+ os4 <- runApp' (unwrapApp testMoribundTellEventDMap) [Just ()]
42 print os4
41 print os4
43− os5@[[Nothing, Just [1, 2]]] <- runApp' (unwrapApp testLiveTellEventDMap) [Just ()]
42+ os5 <- runApp' (unwrapApp testLiveTellEventDMap) [Just ()]
44 print os5
43 print os5
45 os6 <- runApp' (unwrapApp delayedPulse) [Just ()]
44 os6 <- runApp' (unwrapApp delayedPulse) [Just ()]
46 print os6
45 print os6
46+ let ![[Just [10,9,8,7,6,5,4,3,2,1]]] = os1
47+ let ![[Just [1,3,5,7,9]],[Nothing,Nothing],[Just [2,4,6,8,10]],[Just [2,4,6,8,10],Nothing]] = os2
48+ let ![[Nothing, Just [2]]] = os3
49+ let ![[Nothing, Just [2]]] = os4
50+ let ![[Nothing, Just [1, 2]]] = os5
47 let ![[Nothing, Nothing]] = os6
51 let ![[Nothing, Nothing]] = os6
48 return ()
52 return ()
49
53
test/GC.hs−1
@@ -18,7 +18,6 @@ import Data.GADT.Compare
18import Data.IORef
18import Data.IORef
19import Data.Semigroup
19import Data.Semigroup
20import Data.These
20import Data.These
21−import Data.Type.Equality ((:~:)(Refl))
22
21
23import Data.Functor.Misc
22import Data.Functor.Misc
24import Data.Patch
23import Data.Patch
test/Headless.hsdeleted−10
@@ -1,10 +0,0 @@
1−module Main where
2−
3−import Reflex
4−import Reflex.Host.Headless (runHeadlessApp)
5−
6−main :: IO ()
7−main = do
8− runHeadlessApp $ do
9− pb <- getPostBuild
10− performEvent (pure <$> pb)
test/Reflex/Plan/Pure.hs−1
@@ -41,7 +41,6 @@ instance MonadHold (Pure Int) PurePlan where
41 holdIncremental initial = liftPlan . holdIncremental initial
41 holdIncremental initial = liftPlan . holdIncremental initial
42 buildDynamic getInitial = liftPlan . buildDynamic getInitial
42 buildDynamic getInitial = liftPlan . buildDynamic getInitial
43 headE = liftPlan . headE
43 headE = liftPlan . headE
44− now = liftPlan now
45
44
46instance MonadSample (Pure Int) PurePlan where
45instance MonadSample (Pure Int) PurePlan where
47 sample = liftPlan . sample
46 sample = liftPlan . sample
test/Reflex/Test/CrossImpl.hs+8−13
@@ -21,12 +21,11 @@ import Reflex.Dynamic
21import Reflex.Host.Class
21import Reflex.Host.Class
22import qualified Reflex.Pure as P
22import qualified Reflex.Pure as P
23import qualified Reflex.Spider.Internal as S
23import qualified Reflex.Spider.Internal as S
24−import qualified Reflex.Profiled as Prof
25
24
26import Control.Arrow (second, (&&&))
25import Control.Arrow (second, (&&&))
27import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
26import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
28import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
27import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)
29−import Data.Dependent.Sum (DSum (..))
28+import Data.Dependent.Map (DSum (..))
30import Data.Foldable
29import Data.Foldable
31import Data.Map.Strict (Map)
30import Data.Map.Strict (Map)
32import qualified Data.Map.Strict as Map
31import qualified Data.Map.Strict as Map
@@ -36,6 +35,8 @@ import Data.Traversable
36import System.Exit
35import System.Exit
37import System.Mem
36import System.Mem
38
37
38+import System.IO.Unsafe
39+
39mapToPureBehavior :: Map Int a -> Behavior PureReflexDomain a
40mapToPureBehavior :: Map Int a -> Behavior PureReflexDomain a
40mapToPureBehavior m = P.Behavior $ \t -> case Map.lookupLE t m of
41mapToPureBehavior m = P.Behavior $ \t -> case Map.lookupLE t m of
41 Nothing -> error $ "mapToPureBehavior: no value for time " <> show t
42 Nothing -> error $ "mapToPureBehavior: no value for time " <> show t
@@ -72,14 +73,11 @@ instance MapMSignals (Event t a) (Event t' a) t t' where
72instance (MapMSignals a a' t t', MapMSignals b b' t t') => MapMSignals (a, b) (a', b') t t' where
73instance (MapMSignals a a' t t', MapMSignals b b' t t') => MapMSignals (a, b) (a', b') t t' where
73 mapMSignals fb fe (a, b) = liftM2 (,) (mapMSignals fb fe a) (mapMSignals fb fe b)
74 mapMSignals fb fe (a, b) = liftM2 (,) (mapMSignals fb fe a) (mapMSignals fb fe b)
74
75
75−testTimeline
76− :: (forall m t. TestCaseConstraint t m => (Behavior t a, Event t b) -> m (Behavior t c, Event t d))
76+testSpider :: (forall m t. TestCaseConstraint t m => (Behavior t a, Event t b) -> m (Behavior t c, Event t d)) -> (Map Int a, Map Int b) -> (Map Int c, Map Int d)
77− -> (Map Int a, Map Int b)
78− -> (forall m t. (MonadReflexHost t m, MonadIO m, MonadRef m, Ref m ~ Ref IO, MonadSample t m) => m (Map Int c, Map Int d))
79−testTimeline builder (bMap, eMap) = do
77+testSpider builder (bMap, eMap) = unsafePerformIO $ S.runSpiderHost $ do
80 (re, reTrigger) <- newEventWithTriggerRef
78 (re, reTrigger) <- newEventWithTriggerRef
81 (rb, rbTrigger) <- newEventWithTriggerRef
79 (rb, rbTrigger) <- newEventWithTriggerRef
82− b <- runHostFrame $ hold (error "testTimeline: No value for input behavior yet") rb
80+ b <- runHostFrame $ hold (error "testSpider: No value for input behavior yet") rb
83 (b', e') <- runHostFrame $ builder (b, re)
81 (b', e') <- runHostFrame $ builder (b, re)
84 e'Handle <- subscribeEvent e' --TODO: This should be unnecessary
82 e'Handle <- subscribeEvent e' --TODO: This should be unnecessary
85 let times = relevantTestingTimes (bMap, eMap)
83 let times = relevantTestingTimes (bMap, eMap)
@@ -104,11 +102,9 @@ testAgreement :: (Eq c, Eq d, Show c, Show d) => (forall m t. TestCaseConstraint
104testAgreement builder inputs = do
102testAgreement builder inputs = do
105 let identityResult = testPure builder inputs
103 let identityResult = testPure builder inputs
106 tracePerf "---------" $ return ()
104 tracePerf "---------" $ return ()
107− spiderResult <- S.runSpiderHost $ testTimeline builder inputs
105+ let spiderResult = testSpider builder inputs
108− tracePerf "---------" $ return ()
109− profiledResult <- S.runSpiderHost $ Prof.runProfiledM $ testTimeline builder inputs
110 tracePerf "---------" $ return ()
106 tracePerf "---------" $ return ()
111− let resultsAgree = identityResult == spiderResult && identityResult == profiledResult
107+ let resultsAgree = identityResult == spiderResult
112 if resultsAgree
108 if resultsAgree
113 then do --putStrLn "Success:"
109 then do --putStrLn "Success:"
114 --print identityResult
110 --print identityResult
@@ -116,7 +112,6 @@ testAgreement builder inputs = do
116 else do putStrLn "Failure:"
112 else do putStrLn "Failure:"
117 putStrLn $ "Pure result: " <> show identityResult
113 putStrLn $ "Pure result: " <> show identityResult
118 putStrLn $ "Spider result: " <> show spiderResult
114 putStrLn $ "Spider result: " <> show spiderResult
119− putStrLn $ "Profiled result: " <> show profiledResult
120 return resultsAgree
115 return resultsAgree
121
116
122type TestCaseConstraint t m = (Reflex t, MonadSample t m, MonadHold t m, MonadFix m, MonadFix (PushM t))
117type TestCaseConstraint t m = (Reflex t, MonadSample t m, MonadHold t m, MonadFix m, MonadFix (PushM t))
test/Reflex/Test/Micro.hs+2−8
@@ -322,14 +322,8 @@ testCases =
322 let e = never <$ switch b
322 let e = never <$ switch b
323 return $ void e
323 return $ void e
324 lazyHold
324 lazyHold
325− , testE "now-1" $ do
325+
326− e1 <- events1
326+
327− switchHoldPromptly never . pushAlways (\a -> fmap (a <$) now) $ e1
328− , testE "now-2" $ do
329− e1 <- events1
330− let e = pushAlways (\a -> if a == "a" then now else return never) e1
331− x <- accumDyn (<>) never e
332− return . coincidence $ updated x
333 ] where
327 ] where
334
328
335 events1, events2, events3 :: TestPlan t m => m (Event t String)
329 events1, events2, events3 :: TestPlan t m => m (Event t String)
test/RequesterT.hs+56−27
@@ -5,6 +5,7 @@
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE LambdaCase #-}
6{-# LANGUAGE LambdaCase #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE RankNTypes #-}
8{-# LANGUAGE RecursiveDo #-}
9{-# LANGUAGE RecursiveDo #-}
9{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE TemplateHaskell #-}
11{-# LANGUAGE TemplateHaskell #-}
@@ -14,22 +15,20 @@ module Main where
14
15
15import Control.Lens hiding (has)
16import Control.Lens hiding (has)
16import Control.Monad
17import Control.Monad
18+import Control.Monad.Fail (MonadFail)
17import Control.Monad.Fix
19import Control.Monad.Fix
18import Control.Monad.IO.Class (MonadIO)
20import Control.Monad.IO.Class (MonadIO)
21+import Control.Monad.Primitive
19import Data.Constraint.Extras
22import Data.Constraint.Extras
20import Data.Constraint.Extras.TH
23import Data.Constraint.Extras.TH
21import Data.Constraint.Forall
24import Data.Constraint.Forall
22import qualified Data.Dependent.Map as DMap
25import qualified Data.Dependent.Map as DMap
23import Data.Dependent.Sum
26import Data.Dependent.Sum
24import Data.Functor.Misc
27import Data.Functor.Misc
25−import Data.List (words)
26import Data.Map (Map)
28import Data.Map (Map)
27import qualified Data.Map as M
29import qualified Data.Map as M
28−#if !MIN_VERSION_these(4,11,0)
29−import Data.Semigroup ((<>))
30−#endif
31−import Data.Text (Text)
32import Data.These
30import Data.These
31+import Data.List.NonEmpty.Deferred
33import Text.Read (readMaybe)
32import Text.Read (readMaybe)
34
33
35#if defined(MIN_VERSION_these_lens) || (MIN_VERSION_these(0,8,0) && !MIN_VERSION_these(0,9,0))
34#if defined(MIN_VERSION_these_lens) || (MIN_VERSION_these(0,8,0) && !MIN_VERSION_these(0,9,0))
@@ -41,6 +40,8 @@ import Reflex.Requester.Base
41import Reflex.Requester.Class
40import Reflex.Requester.Class
42import Test.Run
41import Test.Run
43
42
43+import Debug.Trace hiding (traceEvent)
44+
44data RequestInt a where
45data RequestInt a where
45 RequestInt :: Int -> RequestInt Int
46 RequestInt :: Int -> RequestInt Int
46
47
@@ -49,7 +50,7 @@ main = do
49 os1 <- runApp' (unwrapApp testOrdering) $
50 os1 <- runApp' (unwrapApp testOrdering) $
50 [ Just ()
51 [ Just ()
51 ]
52 ]
52− print os1
53+ --print os1
53 os2 <- runApp' (unwrapApp testSimultaneous) $ map Just $
54 os2 <- runApp' (unwrapApp testSimultaneous) $ map Just $
54 [ This ()
55 [ This ()
55 , That ()
56 , That ()
@@ -65,31 +66,36 @@ main = do
65 print os5
66 print os5
66 os6 <- runApp' (unwrapApp delayedPulse) [Just ()]
67 os6 <- runApp' (unwrapApp delayedPulse) [Just ()]
67 print os6
68 print os6
68− os7 <- runApp' testMatchRequestsWithResponses [ Just $ TestRequest_Increment 1 ]
69+ os7 <- runApp' testMatchRequestsWithResponses $ map Just [ TestRequest_Increment 1, TestRequest_Increment 2 ]
69 print os7
70 print os7
70− os8 <- runApp' testMatchRequestsWithResponses [ Just $ TestRequest_Reverse "yoyo" ]
71+ os8 <- runApp' testMatchRequestsWithResponses [ Just $ TestRequest_Reverse "abcd" ]
71 print os8
72 print os8
72− let ![[Just [1,2,3,4,5,6,7,8,9,10]]] = os1 -- The order is reversed here: see the documentation for 'runRequesterT'
73+ os9 <- runApp' testMoribundPerformEvent $ map Just [ 1 .. 3 ]
74+ print os9
75+ let ![[Just [10,9,8,7,6,5,4,3,2,1]]] = os1
73− let ![[Just [9,7,5,3,1]],[Nothing,Nothing],[Just [10,8,6,4,2]],[Just [10,8,6,4,2],Nothing]] = os2
76+ let ![[Just [1,3,5,7,9]],[Nothing,Nothing],[Just [2,4,6,8,10]],[Just [2,4,6,8,10],Nothing]] = os2
74 let ![[Nothing, Just [2]]] = os3
77 let ![[Nothing, Just [2]]] = os3
75 let ![[Nothing, Just [2]]] = os4
78 let ![[Nothing, Just [2]]] = os4
76 let ![[Nothing, Just [1, 2]]] = os5
79 let ![[Nothing, Just [1, 2]]] = os5
77− -- let ![[Nothing, Nothing]] = os6 -- TODO re-enable this test after issue #233 has been resolved
80+ let ![[Nothing, Nothing]] = os6 -- TODO re-enable this test after issue #233 has been resolved
78− let !(Just [(1,"2")]) = M.toList <$> head (head os7)
81+ let !(Just [(-9223372036854775808,"2")]) = M.toList <$> head (head os7)
79− let !(Just [(1,"oyoy")]) = M.toList <$> head (head os8)
82+ let !(Just [(-9223372036854775808,"dcba")]) = M.toList <$> head (head os8)
80−
83+ let ![[Nothing,Just "0:1"],[Nothing,Just "1:2"],[Nothing,Just "2:3"]] = os9
81 return ()
84 return ()
82
85
83−unwrapRequest :: DSum tag RequestInt -> Int
86+unwrapApp :: forall t m a.
84−unwrapRequest (_ :=> RequestInt i) = i
85−
86−unwrapApp :: ( Reflex t, Monad m )
87+ ( Reflex t
88+ , MonadFix m
89+ , PrimMonad m
90+ )
87 => (a -> RequesterT t RequestInt Identity m ())
91 => (a -> RequesterT t RequestInt Identity m ())
88 -> a
92 -> a
89 -> m (Event t [Int])
93 -> m (Event t [Int])
90unwrapApp x appIn = do
94unwrapApp x appIn = do
91 ((), e) <- runRequesterT (x appIn) never
95 ((), e) <- runRequesterT (x appIn) never
92− return $ fmap (map unwrapRequest . requesterDataToList) e
96+ let unwrapRequests :: forall x. RequestData (PrimState m) RequestInt -> [Int]
97+ unwrapRequests (RequestData _ es) = fmap (\(RequestEnvelope _ (RequestInt i)) -> i) $ toList es
98+ return $ fmap unwrapRequests e
93
99
94testOrdering :: ( Response m ~ Identity
100testOrdering :: ( Response m ~ Identity
95 , Request m ~ RequestInt
101 , Request m ~ RequestInt
@@ -200,6 +206,11 @@ data TestRequest a where
200 TestRequest_Reverse :: String -> TestRequest String
206 TestRequest_Reverse :: String -> TestRequest String
201 TestRequest_Increment :: Int -> TestRequest Int
207 TestRequest_Increment :: Int -> TestRequest Int
202
208
209+instance Show (TestRequest a) where
210+ show = \case
211+ TestRequest_Reverse str -> "reverse " <> str
212+ TestRequest_Increment i -> "increment " <> show i
213+
203testMatchRequestsWithResponses
214testMatchRequestsWithResponses
204 :: forall m t req a
215 :: forall m t req a
205 . ( MonadFix m
216 . ( MonadFix m
@@ -209,17 +220,21 @@ testMatchRequestsWithResponses
209 , MonadIO (Performable m)
220 , MonadIO (Performable m)
210 , ForallF Show req
221 , ForallF Show req
211 , Has Read req
222 , Has Read req
223+ , PrimMonad m
224+ , Show (req a)
225+ , Show a
226+ , MonadIO m
212 )
227 )
213 => Event t (req a) -> m (Event t (Map Int String))
228 => Event t (req a) -> m (Event t (Map Int String))
214testMatchRequestsWithResponses pulse = mdo
229testMatchRequestsWithResponses pulse = mdo
215 (_, requests) <- runRequesterT (requesting pulse) responses
230 (_, requests) <- runRequesterT (requesting pulse) responses
216− let rawResponses = M.map (\v ->
231+ let rawResponseMap = M.map (\v ->
217 case words v of
232 case words v of
218 ["reverse", str] -> reverse str
233 ["reverse", str] -> reverse str
219 ["increment", i] -> show $ succ $ (read i :: Int)
234 ["increment", i] -> show $ succ $ (read i :: Int)
220 ) <$> rawRequestMap
235 ) <$> rawRequestMap
221− (rawRequestMap, responses) <- matchResponsesWithRequests reqEncoder requests (head . M.toList <$> rawResponses)
236+ (rawRequestMap, responses) <- matchResponsesWithRequests reqEncoder requests (head . M.toList <$> rawResponseMap)
222− pure rawResponses
237+ pure rawResponseMap
223 where
238 where
224 reqEncoder :: forall a. req a -> (String, String -> Maybe a)
239 reqEncoder :: forall a. req a -> (String, String -> Maybe a)
225 reqEncoder r =
240 reqEncoder r =
@@ -227,9 +242,23 @@ testMatchRequestsWithResponses pulse = mdo
227 , \x -> has @Read r $ readMaybe x
242 , \x -> has @Read r $ readMaybe x
228 )
243 )
229
244
230−deriveArgDict ''TestRequest
245+-- If a widget is destroyed, and simultaneously it tries to use performEvent, the event does not get performed.
246+-- TODO Determine whether this is actually the behavior we want.
247+testMoribundPerformEvent
248+ :: forall t m
249+ . ( Adjustable t m
250+ , PerformEvent t m
251+ , MonadHold t m
252+ , Reflex t
253+ )
254+ => Event t Int -> m (Event t String)
255+testMoribundPerformEvent pulse = do
256+ (outputInitial, outputReplaced) <- runWithReplace (performPrint 0 pulse) $ ffor pulse $ \i -> performPrint i pulse
257+ switchHold outputInitial outputReplaced
258+ where
259+ performPrint i evt =
260+ performEvent $ ffor evt $ \output ->
261+ return $ show i <> ":" <> show output
231
262
263+
232−instance Show (TestRequest a) where
264+deriveArgDict ''TestRequest
233− show = \case
234− TestRequest_Reverse str -> "reverse " <> str
235− TestRequest_Increment i -> "increment " <> show i
test/hlint.hs+1−2
@@ -1,7 +1,7 @@
1module Main where
1module Main where
2
2
3import Control.Monad
3import Control.Monad
4−import Language.Haskell.HLint (hlint)
4+import Language.Haskell.HLint3 (hlint)
5import System.Directory
5import System.Directory
6import System.Exit (exitFailure, exitSuccess)
6import System.Exit (exitFailure, exitSuccess)
7import System.FilePath
7import System.FilePath
@@ -22,7 +22,6 @@ main = do
22 , "--ignore=Use unless"
22 , "--ignore=Use unless"
23 , "--ignore=Reduce duplication"
23 , "--ignore=Reduce duplication"
24 , "--cpp-define=USE_TEMPLATE_HASKELL"
24 , "--cpp-define=USE_TEMPLATE_HASKELL"
25− , "--cpp-define=DEBUG"
26 , "--ignore=Use tuple-section"
25 , "--ignore=Use tuple-section"
27 ]
26 ]
28 recurseInto = and <$> sequence
27 recurseInto = and <$> sequence