Merge pull request #7 from purescript/0.7

Readable names for class members

Author: paf31

docs/Control.Biapply.md

@@ -15,11 +15,19 @@ the style of `Applicative`:
 bipure f g <<$>> x <<*>> y
 ```
 
+#### `(<<*>>)`
+
+``` purescript
+(<<*>>) :: forall w a b c d. (Biapply w) => w (a -> b) (c -> d) -> w a c -> w b d
+```
+
+An infix version of `biapply`.
+
 #### `Biapply`
 
 ``` purescript
 class (Bifunctor w) <= Biapply w where
-  (<<*>>) :: forall a b c d. w (a -> b) (c -> d) -> w a c -> w b d
+  biapply :: forall a b c d. w (a -> b) (c -> d) -> w a c -> w b d
 ```
 
 `Biapply` captures type constructors of two arguments which support lifting of

src/Control/Biapply.purs

@@ -16,10 +16,14 @@ infixl 4 *>>
 (<<$>>) :: forall a b. (a -> b) -> a -> b
 (<<$>>) = id
 
+-- | An infix version of `biapply`.
+(<<*>>) :: forall w a b c d. (Biapply w) => w (a -> b) (c -> d) -> w a c -> w b d
+(<<*>>) = biapply
+
 -- | `Biapply` captures type constructors of two arguments which support lifting of
 -- | functions of one or more arguments, in the sense of `Apply`.
 class (Bifunctor w) <= Biapply w where
-  (<<*>>) :: forall a b c d. w (a -> b) (c -> d) -> w a c -> w b d
+  biapply :: forall a b c d. w (a -> b) (c -> d) -> w a c -> w b d
 
 -- | Keep the results of the second computation
 (*>>) :: forall w a b c d. (Biapply w) => w a b -> w c d -> w c d

src/Data/Bifunctor/Clown.purs

@@ -11,13 +11,13 @@ runClown :: forall f a b. Clown f a b -> f a
 runClown (Clown fa) = fa
 
 instance clownBifunctor :: (Functor f) => Bifunctor (Clown f) where
-  bimap f _ = Clown <<< ((<$>) f) <<< runClown
+  bimap f _ = Clown <<< map f <<< runClown
 
 instance clownFunctor :: Functor (Clown f a) where
-  (<$>) _ = Clown <<< runClown
+  map _ = Clown <<< runClown
 
 instance clownBiapply :: (Apply f) => Biapply (Clown f) where
-  (<<*>>) (Clown fg) (Clown xy) = Clown (fg <*> xy)
+  biapply (Clown fg) (Clown xy) = Clown (fg <*> xy)
 
 instance clownBiapplicative :: (Applicative f) => Biapplicative (Clown f) where
   bipure a _ = Clown (pure a)

src/Data/Bifunctor/Flip.purs

@@ -12,13 +12,13 @@ runFlip :: forall p a b. Flip p a b -> p b a
 runFlip (Flip pba) = pba
 
 instance flipBifunctor :: (Bifunctor p) => Bifunctor (Flip p) where
-  bimap f g = Flip <<< (bimap g f) <<< runFlip
+  bimap f g = Flip <<< bimap g f <<< runFlip
 
 instance flipFunctor :: (Bifunctor p) => Functor (Flip p a) where
-  (<$>) f = Flip <<< lmap f <<< runFlip
+  map f = Flip <<< lmap f <<< runFlip
 
 instance flipBiapply :: (Biapply p) => Biapply (Flip p) where
-  (<<*>>) (Flip fg) (Flip xy) = Flip (fg <<*>> xy)
+  biapply (Flip fg) (Flip xy) = Flip (fg <<*>> xy)
 
 instance flipBiapplicative :: (Biapplicative p) => Biapplicative (Flip p) where
   bipure a b = Flip (bipure b a)

src/Data/Bifunctor/Join.purs

@@ -13,10 +13,10 @@ runJoin :: forall p a. Join p a -> p a a
 runJoin (Join paa) = paa
 
 instance joinFunctor :: (Bifunctor p) => Functor (Join p) where
-  (<$>) f = Join <$> bimap f f <<< runJoin
+  map f = Join <$> bimap f f <<< runJoin
 
 instance joinApply :: (Biapply p) => Apply (Join p) where
-  (<*>) (Join f) (Join a) = Join (f <<*>> a)
+  apply (Join f) (Join a) = Join (f <<*>> a)
 
 instance joinApplicative :: (Biapplicative p) => Applicative (Join p) where
   pure a = Join (bipure a a)

src/Data/Bifunctor/Joker.purs

@@ -11,13 +11,13 @@ runJoker :: forall g a b. Joker g a b -> g b
 runJoker (Joker gb) = gb
 
 instance jokerBifunctor :: (Functor g) => Bifunctor (Joker g) where
-  bimap _ g = Joker <<< ((<$>) g) <<< runJoker
+  bimap _ g = Joker <<< map g <<< runJoker
 
 instance jokerFunctor :: (Functor g) => Functor (Joker g a) where
-  (<$>) g = Joker <<< ((<$>) g) <<< runJoker
+  map g = Joker <<< map g <<< runJoker
 
 instance jokerBiapply :: (Apply g) => Biapply (Joker g) where
-  (<<*>>) (Joker fg) (Joker xy) = Joker (fg <*> xy)
+  biapply (Joker fg) (Joker xy) = Joker (fg <*> xy)
 
 instance jokerBiapplicative :: (Applicative g) => Biapplicative (Joker g) where
   bipure _ b = Joker (pure b)

src/Data/Bifunctor/Product.purs

@@ -11,7 +11,7 @@ instance productBifunctor :: (Bifunctor f, Bifunctor g) => Bifunctor (Product f
   bimap f g (Pair x y) = Pair (bimap f g x) (bimap f g y)
 
 instance productBiapply :: (Biapply f, Biapply g) => Biapply (Product f g) where
-  (<<*>>) (Pair w x) (Pair y z) = Pair (w <<*>> y) (x <<*>> z)
+  biapply (Pair w x) (Pair y z) = Pair (biapply w y) (biapply x z)
 
 instance productBiapplicative :: (Biapplicative f, Biapplicative g) => Biapplicative (Product f g) where
   bipure a b = Pair (bipure a b) (bipure a b)

src/Data/Bifunctor/Wrap.purs

@@ -13,13 +13,13 @@ unwrap :: forall p a b. Wrap p a b -> p a b
 unwrap (Wrap pab) = pab
 
 instance wrapBifunctor :: (Bifunctor p) => Bifunctor (Wrap p) where
-  bimap f g = Wrap <<< (bimap f g) <<< unwrap
+  bimap f g = Wrap <<< bimap f g <<< unwrap
 
 instance wrapFunctor :: (Bifunctor p) => Functor (Wrap p a) where
-  (<$>) f = Wrap <<< rmap f <<< unwrap
+  map f = Wrap <<< rmap f <<< unwrap
 
 instance wrapBiapply :: (Biapply p) => Biapply (Wrap p) where
-  (<<*>>) (Wrap fg) (Wrap xy) = Wrap (fg <<*>> xy)
+  biapply (Wrap fg) (Wrap xy) = Wrap (fg <<*>> xy)
 
 instance wrapBiapplicative :: (Biapplicative p) => Biapplicative (Wrap p) where
   bipure a b = Wrap (bipure a b)