summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2006-10-17 10:18:10 +0000
committerPhilipp Haller <hallerp@gmail.com>2006-10-17 10:18:10 +0000
commit2be267a788e24b25011ab1b9593a1b5728a983d8 (patch)
treea78df63b1650f7d9c8f0fd7cdaa2dd7bafd3bb9d /src
parentbcf35077a2f375c38ac12da44a67bd3e1791af3d (diff)
downloadscala-2be267a788e24b25011ab1b9593a1b5728a983d8.tar.gz
scala-2be267a788e24b25011ab1b9593a1b5728a983d8.tar.bz2
scala-2be267a788e24b25011ab1b9593a1b5728a983d8.zip
Added ? operator.
Diffstat (limited to 'src')
-rw-r--r--src/actors/scala/actors/Actor.scala2
-rw-r--r--src/actors/scala/actors/Channel.scala2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 319f1d4bbd..b44326fe53 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -66,6 +66,8 @@ object Actor {
}
*/
+ def ? : Any = self.in.?
+
/**
* Receives a message from the mailbox of
* <code>self</code>. Blocks if no message matching any of the
diff --git a/src/actors/scala/actors/Channel.scala b/src/actors/scala/actors/Channel.scala
index 3638253cdc..c064d96c73 100644
--- a/src/actors/scala/actors/Channel.scala
+++ b/src/actors/scala/actors/Channel.scala
@@ -77,6 +77,8 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] {
*/
def !(msg: Msg): unit = send(msg, Actor.self)
+ def ? : Msg = receive { case any => any }
+
/**
* Sends <code>msg</code> to this <code>Channel</code> and
* awaits reply.