diff options
author | Jakob Odersky <jakob@odersky.com> | 2018-12-26 18:31:23 +0100 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-12-26 18:31:23 +0100 |
commit | 149b917dfe95887b1c46cb7bbf45a6ddbe32ca1b (patch) | |
tree | 57378e2d6f009ddf7c608cf4bea1a91a14bf74ff /shared | |
parent | 3c59af848c37e1530876e95f7321c8757855d030 (diff) | |
download | escale-master.tar.gz escale-master.tar.bz2 escale-master.zip |
Diffstat (limited to 'shared')
-rw-r--r-- | shared/src/main/scala/escale/api.scala | 3 | ||||
-rw-r--r-- | shared/src/test/scala/escale/SyntaxTest.scala | 4 |
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" |