diff options
author | michelou <michelou@epfl.ch> | 2006-02-22 17:54:31 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-02-22 17:54:31 +0000 |
commit | 96ae92e4f6f830a9a4e55768c3de0328a2a030ba (patch) | |
tree | 0b84d247c1693bf186787aaa8f0c75d89fea9be3 /docs/examples/pilib/elasticBuffer.scala | |
parent | c1e184a3657d970a8fba6e3c7049f20a2e466bf0 (diff) | |
download | scala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.tar.gz scala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.tar.bz2 scala-96ae92e4f6f830a9a4e55768c3de0328a2a030ba.zip |
adapted code to Scala 2 syntax in files src/exa...
adapted code to Scala 2 syntax in files src/examples/**/*.scala
Diffstat (limited to 'docs/examples/pilib/elasticBuffer.scala')
-rw-r--r-- | docs/examples/pilib/elasticBuffer.scala | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/docs/examples/pilib/elasticBuffer.scala b/docs/examples/pilib/elasticBuffer.scala index 5e52a0fdce..e156cafbc2 100644 --- a/docs/examples/pilib/elasticBuffer.scala +++ b/docs/examples/pilib/elasticBuffer.scala @@ -1,76 +1,76 @@ -package examples.pilib; +package examples.pilib object elasticBuffer { - import scala.concurrent.pilib._; + import scala.concurrent.pilib._ /** - * Recursive type for channels that carry a "String" channel and - * an object of the type we define. - */ - class MetaChan extends Chan[Pair[Chan[String], MetaChan]]; + * Recursive type for channels that carry a "String" channel and + * an object of the type we define. + */ + class MetaChan extends Chan[Pair[Chan[String], MetaChan]] - def Buffer(put: Chan[String], get: Chan[String]): unit = { + def Buffer(put: Chan[String], get: Chan[String]): Unit = { /** - * An empty buffer cell, ready to pass on (o,r) to the left. - */ + * An empty buffer cell, ready to pass on (o,r) to the left. + */ def Bl(i:Chan[String], l: MetaChan, - o: Chan[String], r: MetaChan): unit = - choice ( - l(Pair(o,r)) * (System.out.println("Removed one cell.")), - i * (inp => Cl(i, l, o, r, inp)) - ); + o: Chan[String], r: MetaChan): unit = + choice ( + l(Pair(o,r)) * (System.out.println("Removed one cell.")), + i * (inp => Cl(i, l, o, r, inp)) + ) /** - * A buffer cell containing a value, ready to receive (o,r) from the right. - */ + * A buffer cell containing a value, ready to receive (o,r) from the right. + */ def Cl(i: Chan[String], l: MetaChan, - o: Chan[String], r: MetaChan, content: String): unit = - choice ( - o(content) * (Bl(i,l,o,r)), - i * (inp => Dl(i,l,o,r,content, inp)), - r * ( { case Pair(newo, newr) => Cl(i,l,newo,newr,content) }) - ); + o: Chan[String], r: MetaChan, content: String): Unit = + choice ( + o(content) * (Bl(i,l,o,r)), + i * (inp => Dl(i,l,o,r,content, inp)), + r * ( { case Pair(newo, newr) => Cl(i,l,newo,newr,content) }) + ) /** - * Two joined buffer cells, of type Cl. - */ + * Two joined buffer cells, of type Cl + */ def Dl(i: Chan[String], l: MetaChan, - o: Chan[String], r: MetaChan, - content: String, inp: String): unit = { - val newlr = new MetaChan; - val newio = new Chan[String]; - spawn < Cl(i, l, newio, newlr, inp) | Cl(newio, newlr, o, r,content) >; + o: Chan[String], r: MetaChan, + content: String, inp: String): Unit = { + val newlr = new MetaChan + val newio = new Chan[String] + spawn < Cl(i, l, newio, newlr, inp) | Cl(newio, newlr, o, r, content) > } // l and r channels for the leftmost and rightmost cell, respectively. - val unused1 = new MetaChan; - val unused2 = new MetaChan; + val unused1 = new MetaChan + val unused2 = new MetaChan - Bl(put, unused1, get, unused2); + Bl(put, unused1, get, unused2) } - val random = new java.util.Random(); + val random = new java.util.Random() - def Producer(n: int, put: Chan[String]): unit = { - Thread.sleep(1 + random.nextInt(1000)); - val msg = "object " + n; - put.write(msg); - System.out.println("Producer gave " + msg); + def Producer(n: int, put: Chan[String]): Unit = { + Thread.sleep(1 + random.nextInt(1000)) + val msg = "object " + n + put.write(msg) + System.out.println("Producer gave " + msg) Producer(n + 1, put) } - def Consumer(get: Chan[String]): unit = { - Thread.sleep(1 + random.nextInt(1000)); - val msg = get.read; - System.out.println("Consummer took " + msg); + def Consumer(get: Chan[String]): Unit = { + Thread.sleep(1 + random.nextInt(1000)) + val msg = get.read + System.out.println("Consummer took " + msg) Consumer(get) } - def main(args: Array[String]): unit = { - val put = new Chan[String]; - val get = new Chan[String]; + def main(args: Array[String]): Unit = { + val put = new Chan[String] + val get = new Chan[String] spawn < Producer(0, put) | Consumer(get) | Buffer(put, get) > } |