From 95b623a3ebaa115b6ef889032854b355a010a037 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 5 Aug 2016 15:51:20 +0200 Subject: cleanup --- events/src/Events/Types/NDT.hs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'events/src/Events/Types/NDT.hs') diff --git a/events/src/Events/Types/NDT.hs b/events/src/Events/Types/NDT.hs index a417029..c37d47c 100644 --- a/events/src/Events/Types/NDT.hs +++ b/events/src/Events/Types/NDT.hs @@ -12,22 +12,16 @@ module Events.Types.NDT import Data.Monoid import Data.Foldable (foldr) -import Data.Maybe -import Data.Either import Data.Bool (bool) import Control.Applicative (Alternative) import qualified Control.Applicative as Alt (Alternative(..)) import Control.Monad -import Control.Monad.Identity import Control.Monad.Trans import Control.Monad.Reader (MonadReader(..)) -import Control.Monad.Trans.Maybe import Control.Monad.Catch (MonadThrow(..)) -import Debug.Trace - data NDT m a where NDTBind :: NDT m a -> (a -> NDT m b) -> NDT m b NDTCons :: m (Maybe (a, NDT m a)) -> NDT m a @@ -37,7 +31,7 @@ instance Functor m => Functor (NDT m) where fmap f (NDTCons x) = NDTCons $ fmap f' x where f' Nothing = Nothing - f' (Just (x, xs)) = Just (f x, fmap f xs) + f' (Just (x', xs)) = Just (f x', fmap f xs) instance Applicative m => Applicative (NDT m) where pure x = NDTCons . pure $ Just (x, empty) @@ -49,7 +43,7 @@ instance Applicative m => Monad (NDT m) where instance Monad m => Monoid (NDT m a) where mempty = empty - mappend (NDTCons x) y'@(NDTCons y) = NDTCons $ maybe y (\(x, xs) -> return $ Just (x, xs <> y')) =<< x + mappend (NDTCons x) y'@(NDTCons y) = NDTCons $ maybe y (\(x', xs) -> return $ Just (x', xs <> y')) =<< x mappend (NDTBind x f) (NDTBind y g) = NDTBind (fmap Left x <> fmap Right y) (either f g) mappend x@(NDTBind _ _) y = x <> NDTBind y return mappend x y@(NDTBind _ _) = NDTBind x return <> y -- cgit v1.2.3