git.iko.soy/reflex
on develop help sign in
Merge pull request #400 from endgame/monad-query-superclass
6a1fdf1Elliot Cameron
ChangeLog.md+1
compare with develop
unifiedsplit
@@ -2,6 +2,7 @@
2
2
3## Unreleased
3## Unreleased
4
4
5+* Class `MonadQuery t q m` now has a `Monad m` superclass constraint.
5* Rename class `MonadBehaviorWriter` -> `BehaviorWriter` for
6* Rename class `MonadBehaviorWriter` -> `BehaviorWriter` for
6 consistency with `EventWriter`/`DynamicWriter`.
7 consistency with `EventWriter`/`DynamicWriter`.
7* Introduce deprecated alias `MonadBehaviorWriter = BehaviorWriter`.
8* Introduce deprecated alias `MonadBehaviorWriter = BehaviorWriter`.
src/Reflex/Query/Class.hs+4−4
@@ -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) => MonadQuery t q m | m -> q t where
136+class (Group q, Additive q, Query q, Monad m) => 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 (Monad m, MonadQuery t q m) => MonadQuery t q (ReaderT r m) where
141+instance 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, Monad m, MonadQuery t q m) => Dynamic t q -> m (Dynamic t (QueryResult q))
151+queryDyn :: (Reflex t, 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, Monad m) => QueryMorphism q1 q2 -> Dynamic t q1 -> m (Dynamic t (QueryResult q1))
157+subQuery :: (Reflex t, MonadQuery t q2 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)