Merge pull request #4 from garyb/generalise

Generalise from Aff to MonadAff

Author: paf31

.gitignore

@@ -1,3 +1,3 @@
+.*
 output
-.psci*
 bower_components

docs/Control/Coroutine/Aff.md

@@ -14,7 +14,7 @@ produce :: forall a r eff. ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff
 
 Create a `Producer` using an asynchronous callback.
 
-The callback should provide zero or more values of type `a`, which will be 
+The callback should provide zero or more values of type `a`, which will be
 emitted by the `Producer`, terminated by an optional value of type `r`. No values
 should be provided after a value of type `r` has been provided.
 
@@ -28,4 +28,13 @@ produce \emit -> do
   emit (Right "finished")
 ```
 
+#### `produce'`
+
+``` purescript
+produce' :: forall a r m eff. (Monad m, MonadAff (avar :: AVAR | eff) m) => ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff (avar :: AVAR | eff) Unit) -> Producer a m r
+```
+
+A version of `produce` that creates a `Producer` with an underlying
+`MonadAff`, rather than `Aff` specifically.
+
 

src/Control/Coroutine/Aff.purs

@@ -11,10 +11,12 @@ import Prelude
 import Data.Either (Either())
 
 import Control.Coroutine (Producer(), producer)
-import Control.Monad.Eff (Eff())
-import Control.Monad.Eff.Class (liftEff)
 import Control.Monad.Aff (Aff(), runAff)
 import Control.Monad.Aff.AVar (AVAR(), makeVar, takeVar, putVar)
+import Control.Monad.Aff.Class (MonadAff, liftAff)
+import Control.Monad.Eff (Eff())
+import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Free.Trans (hoistFreeT)
 import Control.Monad.Trans (lift)
 
 -- | Create a `Producer` using an asynchronous callback.
@@ -32,8 +34,20 @@ import Control.Monad.Trans (lift)
 -- |   log "Done!"
 -- |   emit (Right "finished")
 -- | ```
-produce :: forall a r eff. ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff (avar :: AVAR | eff) Unit) -> Producer a (Aff (avar :: AVAR | eff)) r
-produce recv = do
+produce
+  :: forall a r eff
+   . ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff (avar :: AVAR | eff) Unit)
+  -> Producer a (Aff (avar :: AVAR | eff)) r
+produce recv = hoistFreeT liftAff do
   v <- lift makeVar
   lift $ liftEff $ recv $ runAff (const (return unit)) return <<< putVar v
   producer (takeVar v)
+
+-- | A version of `produce` that creates a `Producer` with an underlying
+-- | `MonadAff`, rather than `Aff` specifically.
+produce'
+  :: forall a r m eff
+   . (Monad m, MonadAff (avar :: AVAR | eff) m)
+  => ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff (avar :: AVAR | eff) Unit)
+  -> Producer a m r
+produce' = hoistFreeT liftAff <<< produce