diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-05-11 18:33:06 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-05-11 18:33:06 +0200 |
| commit | 22dc67b8001f339e11a454c20c2dc48dfcb4aa55 (patch) | |
| tree | 34e495c7f2daad4456a02f53764c1fd2d584a620 /src/library | |
| parent | 4f0df0bd103be83cec7ed71232a2060fa348e045 (diff) | |
| parent | b523827ecb11ae671da92fbb4853d83e25852ad4 (diff) | |
| download | scala-22dc67b8001f339e11a454c20c2dc48dfcb4aa55.tar.gz scala-22dc67b8001f339e11a454c20c2dc48dfcb4aa55.tar.bz2 scala-22dc67b8001f339e11a454c20c2dc48dfcb4aa55.zip | |
Merge pull request #3740 from tvierling/trait-instantiation
Make PartialFunction.OrElse extend AbstractPartialFunction.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/PartialFunction.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/PartialFunction.scala b/src/library/scala/PartialFunction.scala index 7f4a9dc45d..a0b18f7f33 100644 --- a/src/library/scala/PartialFunction.scala +++ b/src/library/scala/PartialFunction.scala @@ -156,10 +156,10 @@ trait PartialFunction[-A, +B] extends (A => B) { self => object PartialFunction { /** Composite function produced by `PartialFunction#orElse` method */ - private class OrElse[-A, +B] (f1: PartialFunction[A, B], f2: PartialFunction[A, B]) extends PartialFunction[A, B] { + private class OrElse[-A, +B] (f1: PartialFunction[A, B], f2: PartialFunction[A, B]) extends scala.runtime.AbstractPartialFunction[A, B] { def isDefinedAt(x: A) = f1.isDefinedAt(x) || f2.isDefinedAt(x) - def apply(x: A): B = f1.applyOrElse(x, f2) + override def apply(x: A): B = f1.applyOrElse(x, f2) override def applyOrElse[A1 <: A, B1 >: B](x: A1, default: A1 => B1): B1 = { val z = f1.applyOrElse(x, checkFallback[B]) |