git.iko.soy/reflex
on develop help sign in
Rename unlessE -> difference
commit0fbe5c22ea72ab778e74d564a83452aca905e300 authorLennart Spitzner <lsp@informatik.uni-kiel.de> dateTue 18 Oct 2016, 22:06 (10 years ago) parent61c2268
3 files changed+16−14
compare with develop
unifiedsplit
Quickref.md+9−9 src/Reflex/Class.hs+5−3 test/Reflex/Test/Micro.hs+2−2
Quickref.md+9−9
@@ -48,15 +48,15 @@ Since MonadHold depends on MonadSample, any [S] function also runs in [H] contex
4848[ ] attachPromptlyDynWithMaybe :: (a -> b -> Maybe c) -> Dynamic a -> Event b -> Event c
4949
5050-- Combine multiple Events
51−[ ] <> :: Monoid a => Event a -> Event a -> Event a
52−[ ] unlessE :: Event a -> Event b -> Event a
53−[ ] align :: Event a -> Event b -> Event (These a b)
54−[ ] alignWith :: (These a b -> c) -> Event a -> Event b -> Event c
55−[ ] mergeWith :: (a -> a -> a) -> [Event a] -> Event a
56−[ ] leftmost :: [Event a] -> Event a
57−[ ] mergeList :: [Event a] -> Event (NonEmpty a)
58−[ ] merge :: GCompare k => DMap (WrapArg Event k) -> Event (DMap k)
59−[ ] mergeMap :: Ord k => Map k (Event a) -> Event (Map k a)
51+[ ] <> :: Semigroup a => Event a -> Event a -> Event a
52+[ ] difference :: Event a -> Event b -> Event a
53+[ ] align :: Event a -> Event b -> Event (These a b)
54+[ ] alignWith :: (These a b -> c) -> Event a -> Event b -> Event c
55+[ ] mergeWith :: (a -> a -> a) -> [Event a] -> Event a
56+[ ] leftmost :: [Event a] -> Event a
57+[ ] mergeList :: [Event a] -> Event (NonEmpty a)
58+[ ] merge :: GCompare k => DMap (WrapArg Event k) -> Event (DMap k)
59+[ ] mergeMap :: Ord k => Map k (Event a) -> Event (Map k a)
6060
6161-- Efficient one-to-many fanout
6262[ ] fanMap :: Ord k => Event (Map k a) -> EventSelector (Const2 k a)
src/Reflex/Class.hs+5−3
@@ -34,7 +34,7 @@ module Reflex.Class
3434 , mergeMap
3535 , mergeList
3636 , mergeWith
37− , unlessE
37+ , difference
3838 -- ** Breaking up 'Event's
3939 , splitE
4040 , fanEither
@@ -720,8 +720,10 @@ distributeListOverDynWith f = fmap (f . map (\(Const2 _ :=> Identity v) -> v) .
720720
721721-- | Create a new 'Event' that occurs when the first supplied 'Event' occurs
722722-- unless the second supplied 'Event' occurs simultaneously.
723−unlessE :: Reflex t => Event t a -> Event t b -> Event t a
724−unlessE = alignWithMaybe $ \case { This a -> Just a ; _ -> Nothing }
723+difference :: Reflex t => Event t a -> Event t b -> Event t a
724+difference = alignWithMaybe $ \case
725+ This a -> Just a
726+ _ -> Nothing
725727
726728-- (intentially not exported, for now)
727729alignWithMaybe
test/Reflex/Test/Micro.hs+2−2
@@ -242,10 +242,10 @@ testCases =
242242 f <- fanMap . fmap toMap <$> events1
243243 return $ toList <$> mergeList [ select f (Const2 'b'), select f (Const2 'b'), select f (Const2 'e'), select f (Const2 'e') ]
244244
245− , testE "unlessE" $ do
245+ , testE "difference" $ do
246246 e1 <- events1
247247 e2 <- events2
248− return $ e1 `unlessE ` e2
248+ return $ e1 `difference ` e2
249249
250250 ] where
251251