diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2010-01-12 16:55:26 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2010-01-12 16:55:26 +0000 |
commit | d75264a14a560e1655c59dcfa1152882f2bad807 (patch) | |
tree | 17789181cc31132e3cfae178577c498c3f41a118 /src/library | |
parent | 335f62ba638b462976cef74e43276c71b5f0fbc8 (diff) | |
download | scala-d75264a14a560e1655c59dcfa1152882f2bad807.tar.gz scala-d75264a14a560e1655c59dcfa1152882f2bad807.tar.bz2 scala-d75264a14a560e1655c59dcfa1152882f2bad807.zip |
Updated attempt at removing @inline warnings:
- fixed a bug in closure elimination causing VerifyErrors
- fixed a broken assert in GenICode that fired when -Ydebug was used
- added final modifiers
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/Predef.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/StringOps.scala | 2 | ||||
-rw-r--r-- | src/library/scala/collection/mutable/PriorityQueue.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 1b9f4b75ba..5684c91aaa 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -117,7 +117,7 @@ object Predef extends LowPriorityImplicits { throw new IllegalArgumentException("requirement failed: "+ message) } - class Ensuring[A](x: A) { + final class Ensuring[A](val 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 } @@ -139,7 +139,7 @@ object Predef extends LowPriorityImplicits { def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x) } - class ArrowAssoc[A](x: A) { + final class ArrowAssoc[A](val x: A) { @inline def -> [B](y: B): Tuple2[A, B] = Tuple2(x, y) def →[B](y: B): Tuple2[A, B] = ->(y) } diff --git a/src/library/scala/collection/immutable/StringOps.scala b/src/library/scala/collection/immutable/StringOps.scala index 9138c2bbac..db6479742b 100644 --- a/src/library/scala/collection/immutable/StringOps.scala +++ b/src/library/scala/collection/immutable/StringOps.scala @@ -17,7 +17,7 @@ import mutable.StringBuilder /** * @since 2.8 */ -class StringOps(override val repr: String) extends StringLike[String] { +final class StringOps(override val repr: String) extends StringLike[String] { override protected[this] def thisCollection: WrappedString = new WrappedString(repr) override protected[this] def toCollection(repr: String): WrappedString = new WrappedString(repr) diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index 203f1eee15..c4dac9effb 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -35,7 +35,7 @@ class PriorityQueue[A](implicit ord: Ordering[A]) { import ord._ - private class ResizableArrayAccess[A] extends ResizableArray[A] { + private final class ResizableArrayAccess[A] extends ResizableArray[A] { @inline def p_size0 = size0 @inline def p_size0_=(s: Int) = size0 = s @inline def p_array = array |