Cleaned-up actor examples. Added OrElse example.

4 files changed, 21 insertions, 4 deletions

diff --git a/docs/examples/actors/Links.scala b/docs/examples/actors/Links.scala
index 77ba80cbee..cbf69a5d0a 100644
--- a/docs/examples/actors/Links.scala
+++ b/docs/examples/actors/Links.scala
@@ -1,7 +1,7 @@
 package examples.actors
 
-import scala.actors.Actor._
 import scala.actors.Actor
+import scala.actors.Actor._
 
 case object Stop
 
@@ -18,7 +18,7 @@ object Links extends Application {
 
   def top(a: Actor, n: int): Actor = actor {
     Console.println("starting actor " + n + " (" + Thread.currentThread() + ")")
-    //self.trapExit = true
+    self.trapExit = true
     link(a)
     while (true) {
       receive {
diff --git a/docs/examples/actors/Message.scala b/docs/examples/actors/Message.scala
index 7ec1d503f9..8768c99c3e 100644
--- a/docs/examples/actors/Message.scala
+++ b/docs/examples/actors/Message.scala
@@ -1,4 +1,3 @@
-// Modified by Philipp Haller to use Scala's event-based actors.
 package examples.actors
 
 import scala.actors._
diff --git a/docs/examples/actors/OrElse.scala b/docs/examples/actors/OrElse.scala
new file mode 100644
index 0000000000..cd31de11a6
--- /dev/null
+++ b/docs/examples/actors/OrElse.scala
@@ -0,0 +1,19 @@
+package examples.actors
+
+import scala.actors._
+import scala.actors.Actor._
+
+object OrElse {
+  def main(args: Array[String]) = {
+    actor {
+      val b1 = new Channel[int]
+      val b2 = new Channel[int]
+      b2 ! 42
+      val item = { b1.receive {case any => any}
+                 } orElse {
+                   b2.receive {case any => any} }
+
+      Console.println("" + item)
+    }
+  }
+}
diff --git a/docs/examples/actors/Seq.scala b/docs/examples/actors/Seq.scala
index fe9f2bf7bf..a709456f6d 100644
--- a/docs/examples/actors/Seq.scala
+++ b/docs/examples/actors/Seq.scala
@@ -16,7 +16,6 @@ object Seq extends Application {
       react {
         case A => scala.Console.println("2nd reactor got A")
       }
-      ()
     }
   }
   a ! A