TypeCompose 0.9.1 → 0.9.3

raw patch · 2 files changed

+32/−15 lines, 2 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

+ Control.Compose: instance Eq (g (f a)) => Eq ((:.) g f a)

+ Control.Compose: joinComposeT :: (Monad m, Monad n, Traversable n, Applicative m) => (m :. n) ((m :. n) a) -> (m :. n) a

+ Control.Compose: joinMMT :: (Monad m, Monad n, Traversable n, Applicative m) => m (n (m (n a))) -> m (n a)

- Control.Compose: (~>*) :: Functor f => (a' -> a) -> (b -> b') -> (f a -> f b) -> (f a' -> f b')

+ Control.Compose: (~>*) :: (Functor p, Functor q) => (a' -> a) -> (b -> b') -> (p a -> q b) -> (p a' -> q b')

- Control.Compose: argument :: (a' -> a) -> ((a -> b) -> (a' -> b))

+ Control.Compose: argument :: Category --> => (a' --> a) -> ((a --> b) -> (a' --> b))

- Control.Compose: result :: (b -> b') -> ((a -> b) -> (a -> b'))

+ Control.Compose: result :: Category --> => (b --> b') -> ((a --> b) -> (a --> b'))

Files

TypeCompose.cabal +3/−3
src/Control/Compose.hs +29/−12

TypeCompose.cabal view

@@ -1,5 +1,5 @@ Name:                TypeCompose-Version:             0.9.1+Version:             0.9.3 Synopsis: 	     Type composition classes & instances Category:            Composition, Control Description:@@ -8,12 +8,12 @@   .   Please see the project wiki page: <http://haskell.org/haskellwiki/TypeCompose>   .-  &#169; 2007-2011 by Conal Elliott; BSD3 license.+  &#169; 2007-2012 by Conal Elliott; BSD3 license. Author:              Conal Elliott  Maintainer:          conal@conal.net Homepage:            http://haskell.org/haskellwiki/TypeCompose Package-Url:	     http://code.haskell.org/~conal/code/TypeCompose-Copyright:           (c) 2007-2011 by Conal Elliott+Copyright:           (c) 2007-2012 by Conal Elliott License:             BSD3 Stability:           provisional build-type:	     Simple

src/Control/Compose.hs view

@@ -11,7 +11,7 @@ ---------------------------------------------------------------------- -- | -- Module      :  Control.Compose--- Copyright   :  (c) Conal Elliott 2007+-- Copyright   :  (c) Conal Elliott 2007-2012 -- License     :  BSD3 --  -- Maintainer  :  conal@conal.net@@ -37,6 +37,7 @@   , oPure, oFmap, oLiftA2, oLiftA3   , fmapFF, fmapCC, contraFmapFC, contraFmapCF   -- , DistribM(..), joinMM+  , joinMMT, joinComposeT   -- * Type composition   -- ** Unary\/binary   , OO(..)@@ -79,6 +80,7 @@ import Data.Foldable import Data.Traversable import Control.Applicative+import Control.Monad (join)  -- import Test.QuickCheck -- for Endo @@ -97,9 +99,9 @@     Value transformers ----------------------------------------------------------} --- |Unary functions+-- | Unary functions type Unop  a = a -> a--- |Binary functions+-- | Binary functions type Binop a = a -> a -> a  @@ -110,11 +112,12 @@ --------------------------------------------------------------------}  -- | Add pre-processing-argument :: (a' -> a) -> ((a -> b) -> (a' -> b))+-- argument :: (a' -> a) -> ((a -> b) -> (a' -> b))+argument :: Category (-->) => (a' --> a) -> ((a --> b) -> (a' --> b)) argument = flip (.)  -- | Add post-processing-result :: (b -> b') -> ((a -> b) -> (a -> b'))+result :: Category (-->) => (b --> b') -> ((a --> b) -> (a --> b')) result = (.)  infixr 1 ~>, ~>*@@ -122,17 +125,20 @@ -- | Add pre- and post processing (~>) :: Category (-->) =>         (a' --> a) -> (b --> b') -> ((a --> b) -> (a' --> b'))-(f ~> h) g = h . g . f--- f ~> h = result h . argument f+-- (f ~> h) g = h . g . f+f ~> h = result h . argument f  -- If I add argument back to DeepArrow, we can get a different generalization: --  -- (~>) :: DeepArrow (-->) => (a' --> a) -> (b --> b') -> ((a -> b) --> (a' -> b')) --- | Like '(~>)' but specialized to functors-(~>*) :: Functor f => (a' -> a) -> (b -> b') -> (f a -> f b) -> (f a' -> f b')+-- | Like '(~>)' but specialized to functors and functions.+(~>*) :: (Functor p, Functor q) => +         (a' -> a) -> (b -> b') -> (p a -> q b) -> (p a' -> q b') f ~>* g = fmap f ~> fmap g +-- (~>*) could be generalized to other categories (beside functions) if we use a+-- more general Functor, as in the "categories" package.  {----------------------------------------------------------     Contravariant functors@@ -189,7 +195,7 @@ constraints, rather than just matching instance heads.  -}-newtype (g :. f) a = O (g (f a)) deriving Show+newtype (g :. f) a = O (g (f a)) deriving (Eq,Show)  -- newtype (g :. f) a = O { unO :: g (f a) } deriving Show @@ -292,7 +298,6 @@ oLiftA3 = inO3 . liftA3  - -- | Used for the @Functor :. Functor@ instance of 'Functor' fmapFF :: (  Functor g,   Functor f) => (a -> b) -> (g :. f) a -> (g :. f) b fmapFF = inO.fmap.fmap@@ -309,8 +314,10 @@  -- | Used for the @ContraFunctor :. Functor@ instance of 'Functor' contraFmapCF :: (ContraFunctor g, Functor f) => (b -> a) -> (g :. f) a -> (g :. f) b-contraFmapCF h (O gf) = O (contraFmap (fmap h) gf)+contraFmapCF = inO.contraFmap.fmap +-- contraFmapCF h (O gf) = O (contraFmap (fmap h) gf)+ instance (Applicative g, Applicative f) => Applicative (g :. f) where   pure  = O . pure . pure   (<*>) = (inO2.liftA2) (<*>)@@ -370,6 +377,16 @@ --   --> (m :. n) a           -- O  -}++-- | 'join'-like function for implicitly composed monads+joinMMT :: (Monad m, Monad n, Traversable n, Applicative m) =>+           m (n (m (n a))) -> m (n a)+joinMMT = fmap join . join . fmap sequenceA++-- | 'join'-like function for explicitly composed monads+joinComposeT :: (Monad m, Monad n, Traversable n, Applicative m) =>+                (m :. n) ((m :. n) a) -> (m :. n) a+joinComposeT = O . joinMMT . unO . fmap unO   {----------------------------------------------------------