summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-11-24 09:25:00 +0000
committerMartin Odersky <odersky@gmail.com>2011-11-24 09:25:00 +0000
commit5fb26c6a889cf1609823338df8783bf880769b3f (patch)
tree652d5c036465b669dc09039392ce79ab8f4b7759 /src/actors
parent32a753546e0f7ef30e3e9c08b39a503ea93bc95a (diff)
downloadscala-5fb26c6a889cf1609823338df8783bf880769b3f.tar.gz
scala-5fb26c6a889cf1609823338df8783bf880769b3f.tar.bz2
scala-5fb26c6a889cf1609823338df8783bf880769b3f.zip
Fast PartialFunction # orElse.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Actor.scala2
-rw-r--r--src/actors/scala/actors/Future.scala2
-rw-r--r--src/actors/scala/actors/Reactor.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index b2cd69e914..b746f68268 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -247,7 +247,7 @@ object Actor extends Combinators {
private class RecursiveProxyHandler(a: ReplyReactor, f: PartialFunction[Any, Unit])
extends scala.runtime.AbstractPartialFunction[Any, Unit] {
- def isDefinedAt(m: Any): Boolean =
+ def _isDefinedAt(m: Any): Boolean =
true // events are immediately removed from the mailbox
def apply(m: Any) {
if (f.isDefinedAt(m)) f(m)
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
index 4de73507fb..eec43013d3 100644
--- a/src/actors/scala/actors/Future.scala
+++ b/src/actors/scala/actors/Future.scala
@@ -201,7 +201,7 @@ object Futures {
def awaitWith(partFuns: Seq[PartialFunction[Any, Pair[Int, Any]]]) {
val reaction: PartialFunction[Any, Unit] = new scala.runtime.AbstractPartialFunction[Any, Unit] {
- def isDefinedAt(msg: Any) = msg match {
+ def _isDefinedAt(msg: Any) = msg match {
case TIMEOUT => true
case _ => partFuns exists (_ isDefinedAt msg)
}
diff --git a/src/actors/scala/actors/Reactor.scala b/src/actors/scala/actors/Reactor.scala
index 8f0492f149..7d21e9f91e 100644
--- a/src/actors/scala/actors/Reactor.scala
+++ b/src/actors/scala/actors/Reactor.scala
@@ -39,7 +39,7 @@ private[actors] object Reactor {
}
val waitingForNone: PartialFunction[Any, Unit] = new scala.runtime.AbstractPartialFunction[Any, Unit] {
- def isDefinedAt(x: Any) = false
+ def _isDefinedAt(x: Any) = false
def apply(x: Any) {}
}
}