Yampa 0.10.2 → 0.10.3

raw patch · 3 files changed

+38/−3 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGELOG +4/−0
• Yampa.cabal +1/−1
• src/FRP/Yampa/Event.hs +33/−2

@@ -1,3 +1,7 @@+2015-10-02 Ivan Perez <ivan.perez@keera.co.uk>+        * src:/ Event instances of Applicative and Alternative.+        * Yampa.cabal: Version bump (0.10.3).+ 2015-06-19 Ivan Perez <ivan.perez@keera.co.uk>         * src:/ instances of DeepSeq (see #5).         * Yampa.cabal: Deepseq added to dependencies. Version bump (0.10.2).

@@ -1,5 +1,5 @@ name: Yampa-version: 0.10.2+version: 0.10.3 cabal-version: >= 1.8 license: BSD3 license-file: LICENSE

@@ -78,7 +78,9 @@ -- (==)     :: Event a -> Event a -> Bool -- (<=) :: Event a -> Event a -> Bool +import Control.Applicative import Control.DeepSeq (NFData(..))+import Data.Functor  import FRP.Yampa.Diagnostics import FRP.Yampa.Forceable@@ -156,6 +158,26 @@   ------------------------------------------------------------------------------+-- Applicative instance+------------------------------------------------------------------------------++instance Applicative Event where+    pure = Event+    NoEvent <*> _ = NoEvent+    Event f <*> x = f <$> x+++------------------------------------------------------------------------------+-- Alternative instance+------------------------------------------------------------------------------++instance Alternative Event where+    empty = NoEvent+    NoEvent <|> r = r+    l       <|> _ = l+++------------------------------------------------------------------------------ -- Forceable instance ------------------------------------------------------------------------------ @@ -211,11 +233,17 @@ ------------------------------------------------------------------------------  -- | Tags an (occurring) event with a value ("replacing" the old value).+--+-- Applicative-based definition:+--  tag = ($>) tag :: Event a -> b -> Event b e `tag` b = fmap (const b) e  -- | Tags an (occurring) event with a value ("replacing" the old value). Same -- as 'tag' with the arguments swapped.+--+-- Applicative-based definition:+-- tagWith = (<$) tagWith :: b -> Event a -> Event b tagWith = flip tag @@ -238,12 +266,12 @@  -- | Left-biased event merge (always prefer left event, if present). lMerge :: Event a -> Event a -> Event a-le `lMerge` re = event re Event le+lMerge = (<|>)   -- | Right-biased event merge (always prefer right event, if present). rMerge :: Event a -> Event a -> Event a-le `rMerge` re = event le Event re+rMerge = flip (<|>)   -- | Unbiased event merge: simultaneous occurrence is an error.@@ -252,6 +280,9 @@   -- | Event merge parameterized by a conflict resolution function.+--+-- Applicative-based definition:+-- mergeBy f re le = (f <$> re <*> le) <|> re <|> le mergeBy :: (a -> a -> a) -> Event a -> Event a -> Event a mergeBy _       NoEvent      NoEvent      = NoEvent mergeBy _       le@(Event _) NoEvent      = le