summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2008-04-02 16:42:48 +0000
committerMartin Odersky <odersky@gmail.com>2008-04-02 16:42:48 +0000
commit1258a12712ca48907e70c4e870571eff30f4bfbb (patch)
tree654bdcd292485429a62238cd489118ed6a1934fd /src/library
parentfd417cfa960542d72e54cafd44eff8941fff8f1e (diff)
downloadscala-1258a12712ca48907e70c4e870571eff30f4bfbb.tar.gz
scala-1258a12712ca48907e70c4e870571eff30f4bfbb.tar.bz2
scala-1258a12712ca48907e70c4e870571eff30f4bfbb.zip
removed contractiveness requirement for implici...
removed contractiveness requirement for implicit methods
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/Predef.scala16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 6db07a6bd6..74409b1e4b 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -126,6 +126,14 @@ object Predef {
def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x)
}
+ class Ensuring[A](x: A) {
+ def ensuring(cond: Boolean): A = { assert(cond); x }
+ def ensuring(cond: Boolean, msg: Any): A = { assert(cond, msg); x }
+ def ensuring(cond: A => Boolean): A = { assert(cond(x)); x }
+ def ensuring(cond: A => Boolean, msg: Any): A = { assert(cond(x), msg); x }
+ }
+ implicit def any2Ensuring[A](x: A): Ensuring[A] = new Ensuring(x)
+
class ArrowAssoc[A](x: A) {
def -> [B](y: B): Tuple2[A, B] = Tuple2(x, y)
}
@@ -183,14 +191,6 @@ object Predef {
implicit def any2stringadd(x: Any) = new runtime.StringAdd(x)
- class Ensuring[A](x: A) {
- def ensuring(cond: Boolean): A = { assert(cond); x }
- def ensuring(cond: Boolean, msg: Any): A = { assert(cond, msg); x }
- def ensuring(cond: A => Boolean): A = { assert(cond(x)); x }
- def ensuring(cond: A => Boolean, msg: Any): A = { assert(cond(x), msg); x }
- }
- implicit def any2Ensuring[A](x: A): Ensuring[A] = new Ensuring(x)
-
implicit def exceptionWrapper(exc: Throwable) = new runtime.RichException(exc)
implicit def unit2ordered(x: Unit): Ordered[Unit] = new Ordered[Unit] with Proxy {