Added yields.

Author: DDC

.gitignore

@@ -18,3 +18,4 @@ cabal.sandbox.config
 .stack-work/
 cabal.project.local
 .HTF/
+Session.vim

streamy-pipes/lib/Streamy/Pipes.hs

@@ -36,6 +36,7 @@ module Streamy.Pipes (
         , Streamy.Pipes.group
         , Streamy.Pipes.maps
         , Streamy.Pipes.concats
+        , Streamy.Pipes.yields
     ) where
 
 import qualified Data.List
@@ -46,6 +47,7 @@ import qualified Pipes.Group as PG
 
 import Control.Monad
 import Control.Monad.Trans.Class
+import Control.Monad.Trans.Free (liftF)
 import Control.Monad.IO.Class
 
 import Lens.Micro.Extras (view)
@@ -158,3 +160,5 @@ maps f (Groups gs) = Groups $ PG.maps f gs
 concats :: Monad m => Groups a m r -> Stream a m r
 concats (Groups gs) = PG.concats gs
 
+yields :: Monad m => Stream a m r -> Groups a m r
+yields producer = Groups $ liftF producer

streamy-sig/README.md

@@ -29,7 +29,8 @@ package.
 
 ## Feature matrix
 
-There are gaps in coverage in implementation of functions.  Below is a feature matrix saying which functions are supported by which libraries.
+There are gaps in coverage in implementation of functions.  Below is a feature
+matrix saying which functions are supported by which libraries.
 
     Key | Module name
     ----|--------------------------
@@ -85,5 +86,5 @@ There are gaps in coverage in implementation of functions.  Below is a feature m
     | group           | X | X |   |
     | maps            | X | X |   |
     | concats         | X | X |   |
-
+    | yields          | X | X |   |
 

streamy-sig/sig/Streamy.hsig

@@ -85,4 +85,6 @@ maps :: Monad m => (forall x. Stream a m x -> Stream b m x) -> Groups a m r -> G
 
 concats :: Monad m => Groups a m r -> Stream a m r
 
+yields :: Monad m => Stream a m r -> Groups a m r
+
 

streamy-streaming/lib/Streamy/Streaming.hs

@@ -37,6 +37,7 @@ module Streamy.Streaming (
         , Streamy.Streaming.group
         , Streamy.Streaming.maps
         , Streamy.Streaming.concats
+        , Streamy.Streaming.yields
     ) where
 
 import Control.Monad
@@ -161,6 +162,9 @@ maps f (Groups gs) = Groups $ Q.maps (getStream . f . Stream) gs
 concats :: Monad m => Groups a m r -> Stream a m r
 concats (Groups gs) = Stream $ Q.concats gs
 
+yields :: Monad m => Stream a m r -> Groups a m r
+yields (Stream s) = Groups $ Q.yields s
+
 --
 toTup :: Of a r -> (a,r)
 toTup = \(a :> r) -> (a,r)

streamy-testsuite/lib/Test/Grouping.hs

@@ -20,9 +20,17 @@ import Data.IORef
 grouping :: [TestTree]
 grouping = 
     [ testCase "group-map-concats" basic 
+    , testCase "yields" testYields
     ]
 
 basic :: Assertion
 basic = do
    r <- Y.toList_ . Y.concats . Y.maps (\s -> Y.yield '<' *> s <* Y.yield '>') . Y.group $ Y.each "aabbcc"
    assertEqual "" "<aa><bb><cc>" r
+
+testYields :: Assertion
+testYields = do
+   r <- Y.toList_ . Y.concats . Y.yields $ Y.each "aaa" *> Y.each "bbb"
+   assertEqual "" "aaabbb" r
+
+

streamy-testsuite/lib/Test/Grouping/Streamy.hsig

@@ -32,6 +32,7 @@ signature Test.Grouping.Streamy (
         , group
         , maps
         , concats
+        , yields
     ) where
 
 import Prelude () -- weird confusions otherwise