767faa1 · patch · git.iko.soy

git.iko.soy/patch

Rename MonadDynamicWriter

commit767faa134dc57ac83445e89fc03f4a42d699cd53 authorAli Abrar <aliabrar@gmail.com> dateThu 21 Mar 2019, 13:53 (8 years ago) parentd1e2cb6

5 files changed+15−9

compare with develop

unifiedsplit

ChangeLog.md+1 src/Reflex/DynamicWriter/Base.hs+2−2 src/Reflex/DynamicWriter/Class.hs+9−4 src/Reflex/EventWriter/Base.hs+2−2 src/Reflex/Query/Base.hs+1−1

ChangeLog.md+1

@@ -3,6 +3,7 @@

33## 0.6.0.0 -- 2019-03-20

55* Deprecate FunctorMaybe in favor of Data.Witherable.Filterable. We still export fmapMaybe, ffilter, etc., but they all rely on Filterable now.

6+* Rename MonadDynamicWriter to DynamicWriter and add a deprecation for the old name.

67* Remove many deprecated functions

78* Add a Num instance for Dynamic

89* Add matchRequestsWithResponses to make it easier to use Requester with protocols that don't do this matching for you

src/Reflex/DynamicWriter/Base.hs+2−2

@@ -88,7 +88,7 @@ mergeDynIncrementalWithMove a = unsafeBuildIncremental (mapM (sample . current)

8888 noLongerMovedMap = Map.fromList $ fmap (, ()) noLongerMoved

8989 in Map.differenceWith (\e _ -> Just $ MapWithMove.nodeInfoSetTo Nothing e) pWithNewVals noLongerMovedMap --TODO: Check if any in the second map are not covered?

9090

91−-- | A basic implementation of 'MonadDynamicWriter'.

91+-- | A basic implementation of 'DynamicWriter'.

9292newtype DynamicWriterT t w m a = DynamicWriterT { unDynamicWriterT :: StateT [Dynamic t w] m a }

9393 deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadAsyncException, MonadException) -- The list is kept in reverse order

9494

@@ -116,7 +116,7 @@ runDynamicWriterT (DynamicWriterT a) = do

116116 (result, ws) <- runStateT a []

117117 return (result, mconcat $ reverse ws)

118118

119−instance (Monad m, Monoid w, Reflex t) => MonadDynamicWriter t w (DynamicWriterT t w m) where

119+instance (Monad m, Monoid w, Reflex t) => DynamicWriter t w (DynamicWriterT t w m) where

120120 tellDyn w = DynamicWriterT $ modify (w :)

121121

122122instance MonadReader r m => MonadReader r (DynamicWriterT t w m) where

src/Reflex/DynamicWriter/Class.hs+9−4

@@ -1,4 +1,5 @@

1−-- | This module defines the 'MonadDynamicWriter' class.

1+-- | This module defines the 'DynamicWriter' class.

2+{-# LANGUAGE ConstraintKinds #-}

23{-# LANGUAGE CPP #-}

34{-# LANGUAGE FlexibleInstances #-}

45{-# LANGUAGE FunctionalDependencies #-}

@@ -8,17 +9,21 @@

89{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

910#endif

1011module Reflex.DynamicWriter.Class

11− ( MonadDynamicWriter (..)

12+ ( MonadDynamicWriter

13+ , DynamicWriter(..)

1214 ) where

1315

1416import Control.Monad.Reader (ReaderT, lift)

1517import Reflex.Class (Dynamic)

1618

19+{-# DEPRECATED MonadDynamicWriter "Use 'DynamicWriter' instead" #-}

20+type MonadDynamicWriter = DynamicWriter

21+

1722-- | 'MonadDynamicWriter' efficiently collects 'Dynamic' values using 'tellDyn'

1823-- and combines them monoidally to provide a 'Dynamic' result.

19−class (Monad m, Monoid w) => MonadDynamicWriter t w m | m -> t w where

24+class (Monad m, Monoid w) => DynamicWriter t w m | m -> t w where

2025 tellDyn :: Dynamic t w -> m ()

2126

22−instance MonadDynamicWriter t w m => MonadDynamicWriter t w (ReaderT r m) where

27+instance DynamicWriter t w m => DynamicWriter t w (ReaderT r m) where

2328 tellDyn = lift . tellDyn

2429

src/Reflex/EventWriter/Base.hs+2−2

@@ -25,7 +25,7 @@ module Reflex.EventWriter.Base

2525import Reflex.Adjustable.Class

2626import Reflex.Class

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

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

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

2929import Reflex.Host.Class

3030import Reflex.PerformEvent.Class

3131import Reflex.PostBuild.Class

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

278278 askQueryResult = lift askQueryResult

279279 queryIncremental = lift . queryIncremental

280280

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

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

282282 tellDyn = lift . tellDyn

283283

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

src/Reflex/Query/Base.hs+1−1

@@ -340,5 +340,5 @@ instance Requester t m => Requester t (QueryT t q m) where

340340instance EventWriter t w m => EventWriter t w (QueryT t q m) where

341341 tellEvent = lift . tellEvent

342342

343−instance MonadDynamicWriter t w m => MonadDynamicWriter t w (QueryT t q m) where

343+instance DynamicWriter t w m => DynamicWriter t w (QueryT t q m) where

344344 tellDyn = lift . tellDyn