git.iko.soy/patch
on develop help sign in
Give [Event|Dynamic]Writer instances of each other
6229ddeElliot Cameron
src/Reflex/DynamicWriter/Base.hs+5−1
compare with develop
unifiedsplit
@@ -38,9 +38,10 @@ import Data.Semigroup
38import Data.Some (Some)
38import Data.Some (Some)
39import Data.These
39import Data.These
40
40
41−import Reflex.Class
42import Reflex.Adjustable.Class
41import Reflex.Adjustable.Class
42+import Reflex.Class
43import Reflex.DynamicWriter.Class
43import Reflex.DynamicWriter.Class
44+import Reflex.EventWriter.Class (EventWriter, tellEvent)
44import Reflex.Host.Class
45import Reflex.Host.Class
45import qualified Reflex.Patch.MapWithMove as MapWithMove
46import qualified Reflex.Patch.MapWithMove as MapWithMove
46import Reflex.PerformEvent.Class
47import Reflex.PerformEvent.Class
@@ -226,3 +227,6 @@ instance (MonadQuery t q m, Monad m) => MonadQuery t q (DynamicWriterT t w m) wh
226 tellQueryIncremental = lift . tellQueryIncremental
227 tellQueryIncremental = lift . tellQueryIncremental
227 askQueryResult = lift askQueryResult
228 askQueryResult = lift askQueryResult
228 queryIncremental = lift . queryIncremental
229 queryIncremental = lift . queryIncremental
230+
231+instance EventWriter t w m => EventWriter t w (DynamicWriterT t v m) where
232+ tellEvent = lift . tellEvent
src/Reflex/EventWriter/Base.hs+5−1
@@ -22,9 +22,10 @@ module Reflex.EventWriter.Base
22 , withEventWriterT
22 , withEventWriterT
23 ) where
23 ) where
24
24
25−import Reflex.Class
26import Reflex.Adjustable.Class
25import Reflex.Adjustable.Class
26+import Reflex.Class
27import Reflex.EventWriter.Class (EventWriter, tellEvent)
27import Reflex.EventWriter.Class (EventWriter, tellEvent)
28+import Reflex.DynamicWriter.Class (MonadDynamicWriter, tellDyn)
28import Reflex.Host.Class
29import Reflex.Host.Class
29import Reflex.PerformEvent.Class
30import Reflex.PerformEvent.Class
30import Reflex.PostBuild.Class
31import Reflex.PostBuild.Class
@@ -267,6 +268,9 @@ instance (MonadQuery t q m, Monad m) => MonadQuery t q (EventWriterT t w m) wher
267 askQueryResult = lift askQueryResult
268 askQueryResult = lift askQueryResult
268 queryIncremental = lift . queryIncremental
269 queryIncremental = lift . queryIncremental
269
270
271+instance MonadDynamicWriter t w m => MonadDynamicWriter t w (EventWriterT t v m) where
272+ tellDyn = lift . tellDyn
273+
270instance PrimMonad m => PrimMonad (EventWriterT t w m) where
274instance PrimMonad m => PrimMonad (EventWriterT t w m) where
271 type PrimState (EventWriterT t w m) = PrimState m
275 type PrimState (EventWriterT t w m) = PrimState m
272 primitive = lift . primitive
276 primitive = lift . primitive