foldselect save branch

Author: rssh

src/main/scala/gopher/channels/Channel.scala

@@ -19,28 +19,17 @@ trait Channel[A] extends InputOutput[A]
    def close(): Unit
 
    // override some operations
-   
-   override def filter(p:A=>Boolean): Channel[A] =
-   {
-    val filteredInput = super.filter(p)
-    new Channel[A] {
-         def cbread[B](f:
-              ContRead[A,B]=>Option[
-                    ContRead.In[A]=>Future[Continuated[B]]
-            ],
-            ft: FlowTermination[B]): Unit = filteredInput.cbread(f,ft)
-
-         def  cbwrite[B](f: ContWrite[A,B] => Option[
-                   (A,Future[Continuated[B]])
-                  ],
-                  ft: FlowTermination[B]): Unit =
-            thisChannel.cbwrite(f,ft)  // TODO: optimize by filteredOutput.cbwrite() ?
 
-        def api = thisChannel.api
+   class Filtered(p:A=>Boolean) extends super.Filtered(p)
+                                    with Channel[A]
+   {
+     def  cbwrite[B](f: ContWrite[A,B] => Option[(A,Future[Continuated[B]])],ft: FlowTermination[B]):Unit =
+       thisChannel.cbwrite(f,ft)
 
-        def close() = thisChannel.close()
-    }
+     def close() = thisChannel.close()
    }
+   
+   override def filter(p:A=>Boolean): Channel[A] = new Filtered(p)
 
 }
 

src/main/scala/gopher/channels/Continuated.scala

@@ -18,6 +18,20 @@ sealed trait FlowContinuated[A] extends Continuated[A]
   def flowTermination: FlowTermination[A]
 }
 
+sealed trait ReadyTestResult[+A]
+
+object ReadyTestResult
+{
+  sealed trait NotReady[+A] extends ReadyTestResult[A]
+  case object WillBeCheckedLater extends NotReady[Nothing]
+  case class CheckOther[A,B](other:A=>ReadyTestResult[B]) extends NotReady[B]
+
+  case class Ready[A](value:A) extends ReadyTestResult[A]
+
+}
+
+
+
 case class Done[A](result:A, override val flowTermination: FlowTermination[A]) extends FlowContinuated[A]
 
 /**
@@ -38,6 +52,7 @@ case class ContRead[A,B](
 object ContRead
 {
 
+
   sealed trait In[+A]
   case class Value[+A](a:A) extends In[A]
   case object Skip extends In[Nothing]

src/main/scala/gopher/channels/EffectedChannel.scala

@@ -41,7 +41,7 @@ class SinglethreadedEffectedChannel[A](ch:Channel[A]) extends SinglethreadedEffe
 
   def api: GopherAPI = v.api
 
-  override def filter(p:A=>Boolean):Channel[A] = new SinglethreadedEffectedChannel(v.filter(p))
+  //override def filter(p:A=>Boolean):Channel[A] = new SinglethreadedEffectedChannel(v.filter(p))
 
 }