947b21a · reflex · git.iko.soy

git.iko.soy/reflex

Merge pull request #238 from reflex-frp/eac-reflex-writer-instances

Give [Event|Dynamic]Writer instances of each other

commit947b21ac57f328d320f7ab3e815d0fe51325ee61 authorRyan Trinkle <ryan.trinkle@gmail.com> dateFri 9 Nov 2018, 17:59 (8 years ago) parent16a7133 6229dde

2 files changed+10−2

compare with develop

unifiedsplit

src/Reflex/DynamicWriter/Base.hs+5−1 src/Reflex/EventWriter/Base.hs+5−1

src/Reflex/DynamicWriter/Base.hs+5−1

@@ -38,9 +38,10 @@ import Data.Semigroup

3838import Data.Some (Some)

3939import Data.These

4040

41−import Reflex.Class

4241import Reflex.Adjustable.Class

42+import Reflex.Class

4343import Reflex.DynamicWriter.Class

44+import Reflex.EventWriter.Class (EventWriter, tellEvent)

4445import Reflex.Host.Class

4546import qualified Reflex.Patch.MapWithMove as MapWithMove

4647import Reflex.PerformEvent.Class

@@ -226,3 +227,6 @@ instance (MonadQuery t q m, Monad m) => MonadQuery t q (DynamicWriterT t w m) wh

226227 tellQueryIncremental = lift . tellQueryIncremental

227228 askQueryResult = lift askQueryResult

228229 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

2222 , withEventWriterT

2323 ) where

2424

25−import Reflex.Class

2625import Reflex.Adjustable.Class

26+import Reflex.Class

2727import Reflex.EventWriter.Class (EventWriter, tellEvent)

28+import Reflex.DynamicWriter.Class (MonadDynamicWriter, tellDyn)

2829import Reflex.Host.Class

2930import Reflex.PerformEvent.Class

3031import Reflex.PostBuild.Class

@@ -277,6 +278,9 @@ instance (MonadQuery t q m, Monad m) => MonadQuery t q (EventWriterT t w m) wher

277278 askQueryResult = lift askQueryResult

278279 queryIncremental = lift . queryIncremental

279280

281+instance MonadDynamicWriter t w m => MonadDynamicWriter t w (EventWriterT t v m) where

282+ tellDyn = lift . tellDyn

283+

280284instance PrimMonad m => PrimMonad (EventWriterT t w m) where

281285 type PrimState (EventWriterT t w m) = PrimState m

282286 primitive = lift . primitive