- adapted to current Scala version

1 files changed, 25 insertions, 21 deletions

diff --git a/sources/examples/boundedbuffer.scala b/sources/examples/boundedbuffer.scala
index 6f71f72cf5..fdc6feb9b4 100644
--- a/sources/examples/boundedbuffer.scala
+++ b/sources/examples/boundedbuffer.scala
@@ -1,30 +1,34 @@
 package examples;
 
-import concurrent.ops._;
+object boundedbuffer {
 
-class BoundedBuffer[a](N: Int) extends Monitor() {
-  var in = 0, out = 0, n = 0;
-  val elems = new Array[a](N);
+  import concurrent.ops._;
 
-  def put(x: a) = synchronized {
-    await (n < N);
-    elems(in) = x ; in = (in + 1) % N ; n = n + 1;
-    if (n == 1) notifyAll();
+  class BoundedBuffer[a](N: Int) extends Monitor() {
+    var in = 0, out = 0, n = 0;
+    val elems = new Array[a](N);
+
+    def put(x: a) = synchronized {
+      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();
+      x
+    }
   }
 
-  def get: a = synchronized {
-    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;
+    def produceString = { cnt = cnt + 1; cnt.toString() }
+    def consumeString(ss: String) = System.out.println(ss);
+    spawn { while (true) { val ssss = produceString; buf.put(ssss) } }
+    spawn { while (true) { val s = buf.get; consumeString(s) } }
   }
-}
 
-module test {
-  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) } }
-  spawn { while (True) { val s = buf.get ; consumeString(s) } }
 }