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/boundedbuffer.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/boundedbuffer.scala')
-rw-r--r-- | docs/examples/boundedbuffer.scala | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/examples/boundedbuffer.scala b/docs/examples/boundedbuffer.scala index 983a3a7bf5..89ad811c65 100644 --- a/docs/examples/boundedbuffer.scala +++ b/docs/examples/boundedbuffer.scala @@ -1,32 +1,32 @@ -package examples; +package examples object boundedbuffer { - import concurrent.ops._; + import concurrent.ops._ class BoundedBuffer[a](N: Int) { - var in, out, n = 0; - val elems = new Array[a](N); + var in, out, n = 0 + val elems = new Array[a](N) def await(cond: => Boolean) = while (!cond) { wait() } def put(x: a) = synchronized { - await (n < N); - elems(in) = x; in = (in + 1) % N; n = n + 1; - if (n == 1) notifyAll(); + await (n < N) + elems(in) = x; in = (in + 1) % N; n = n + 1 + if (n == 1) notifyAll() } def get: a = synchronized { - await (n != 0); - val x = elems(out); out = (out + 1) % N ; n = n - 1; - if (n == N - 1) notifyAll(); + await (n != 0) + val x = elems(out); out = (out + 1) % N ; n = n - 1 + if (n == N - 1) notifyAll() x } } def main(args: Array[String]) = { - val buf = new BoundedBuffer[String](10); - var cnt = 0; + val buf = new BoundedBuffer[String](10) + var cnt = 0 def produceString = { cnt = cnt + 1; cnt.toString() } def consumeString(ss: String) = System.out.println(ss); spawn { while (true) { val ssss = produceString; buf.put(ssss) } } |