947b21a · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

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

947b21aRyan Trinkle8 years ago

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

compare with develop

unifiedsplit

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

38import Data.Some (Some)

39import Data.These

41−import Reflex.Class

42import Reflex.Adjustable.Class

41import Reflex.Adjustable.Class

42+import Reflex.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

23 ) where

25−import Reflex.Class

26import Reflex.Adjustable.Class

25import Reflex.Adjustable.Class

26+import Reflex.Class

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

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

277 askQueryResult = lift askQueryResult

278 askQueryResult = lift askQueryResult

278 queryIncremental = lift . queryIncremental

279 queryIncremental = lift . queryIncremental

279

280

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

282+ tellDyn = lift . tellDyn

283+

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

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

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

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

282 primitive = lift . primitive

286 primitive = lift . primitive