Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Control/FRPNow/EvStream.hs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ newtype EvStream a = S { getEs :: Behavior (Event [a]) }
instance Functor EvStream where
fmap f (S b) = S $ (fmap f <$>) <$> b

instance Semigroup (EvStream a) where
(<>) = merge

instance Monoid (EvStream a) where
mempty = emptyEs
mappend = merge
Expand Down Expand Up @@ -309,7 +312,7 @@ callbackStream = do mv <- sync $ newIORef ([], Nothing)
return (S s, func mv) where
loop :: IORef ( [a], Maybe (() -> IO ()) ) -> Now ([a], Behavior (Event [a]))
loop mv =
do (l, Nothing) <- sync $ readIORef mv
do (l, _) <- sync $ readIORef mv
(e,cb) <- callback
sync $ writeIORef mv ([], Just cb)
es <- planNow $ loop mv <$ e
Expand Down