summaryrefslogtreecommitdiff
path: root/shared/src
diff options
context:
space:
mode:
Diffstat (limited to 'shared/src')
-rw-r--r--shared/src/main/scala/escale/api.scala3
-rw-r--r--shared/src/test/scala/escale/SyntaxTest.scala4
2 files changed, 3 insertions, 4 deletions
diff --git a/shared/src/main/scala/escale/api.scala b/shared/src/main/scala/escale/api.scala
index ac475ae..8a72cea 100644
--- a/shared/src/main/scala/escale/api.scala
+++ b/shared/src/main/scala/escale/api.scala
@@ -5,6 +5,7 @@ import scala.annotation.tailrec
import scala.collection.mutable
import scala.concurrent.{Future, Promise}
+// https://vimeo.com/100518968
class Channel[A](capacity: Int) {
require(capacity >= 0, "capacity must be >= 0")
import Channel._
@@ -88,8 +89,6 @@ object Channel {
c
}
- //def select(ops: Op[_]*): Unit = ???
-
def select(channels: Channel[_]*): Future[(Channel[_], Any)] = {
val flag = new Flag
val result = Promise[(Channel[_], Any)]
diff --git a/shared/src/test/scala/escale/SyntaxTest.scala b/shared/src/test/scala/escale/SyntaxTest.scala
index fffcbe9..6225839 100644
--- a/shared/src/test/scala/escale/SyntaxTest.scala
+++ b/shared/src/test/scala/escale/SyntaxTest.scala
@@ -30,8 +30,8 @@ object SyntaxTest extends TestSuite {
val Ch1 = chan[Int]()
val Ch2 = chan[Int]()
- go {/*Thread.sleep(1);*/ Ch1 !< 1}
- go {/*Thread.sleep(1);*/ Ch2 !< 1}
+ go {Thread.sleep(1); Ch1 !< 1}
+ go {Thread.sleep(1); Ch2 !< 1}
select(Ch1, Ch2) match {
case (Ch1, _) => "ch1 was first"