diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 21:59:54 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-03 21:59:54 +1000 |
commit | 953559988a698d6663ac983ee7d9944e05bd861d (patch) | |
tree | d2b12610d04c9a510e9d5c2b0242118521fa1a15 /src/library | |
parent | 6ecb997fa8eb305bf547ec8a6106ba2fd777a594 (diff) | |
parent | bf599bc72a1fff4aa812e6d8962b2cabe14725ab (diff) | |
download | scala-953559988a698d6663ac983ee7d9944e05bd861d.tar.gz scala-953559988a698d6663ac983ee7d9944e05bd861d.tar.bz2 scala-953559988a698d6663ac983ee7d9944e05bd861d.zip |
Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203
Conflicts:
src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala
src/compiler/scala/tools/nsc/transform/Constructors.scala
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala
src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/Byte.scala | 8 | ||||
-rw-r--r-- | src/library/scala/Char.scala | 8 | ||||
-rw-r--r-- | src/library/scala/Int.scala | 8 | ||||
-rw-r--r-- | src/library/scala/Long.scala | 8 | ||||
-rw-r--r-- | src/library/scala/Short.scala | 8 | ||||
-rw-r--r-- | src/library/scala/collection/JavaConverters.scala | 5 | ||||
-rw-r--r-- | src/library/scala/collection/Searching.scala | 12 | ||||
-rw-r--r-- | src/library/scala/collection/convert/DecorateAsJava.scala | 12 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/Vector.scala | 4 | ||||
-rw-r--r-- | src/library/scala/concurrent/duration/Duration.scala | 4 | ||||
-rw-r--r-- | src/library/scala/math/package.scala | 12 |
11 files changed, 53 insertions, 36 deletions
diff --git a/src/library/scala/Byte.scala b/src/library/scala/Byte.scala index 413231c0d1..fb662911b3 100644 --- a/src/library/scala/Byte.scala +++ b/src/library/scala/Byte.scala @@ -79,8 +79,8 @@ final abstract class Byte private extends AnyVal { */ def >>>(x: Long): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 @@ -90,8 +90,8 @@ final abstract class Byte private extends AnyVal { */ def >>(x: Int): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 diff --git a/src/library/scala/Char.scala b/src/library/scala/Char.scala index ec2d48c181..9f06503569 100644 --- a/src/library/scala/Char.scala +++ b/src/library/scala/Char.scala @@ -79,8 +79,8 @@ final abstract class Char private extends AnyVal { */ def >>>(x: Long): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 @@ -90,8 +90,8 @@ final abstract class Char private extends AnyVal { */ def >>(x: Int): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 diff --git a/src/library/scala/Int.scala b/src/library/scala/Int.scala index 72e5ebf81b..3bd3775eba 100644 --- a/src/library/scala/Int.scala +++ b/src/library/scala/Int.scala @@ -79,8 +79,8 @@ final abstract class Int private extends AnyVal { */ def >>>(x: Long): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 @@ -90,8 +90,8 @@ final abstract class Int private extends AnyVal { */ def >>(x: Int): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 diff --git a/src/library/scala/Long.scala b/src/library/scala/Long.scala index 1bd0fe88b1..b27a66647f 100644 --- a/src/library/scala/Long.scala +++ b/src/library/scala/Long.scala @@ -79,8 +79,8 @@ final abstract class Long private extends AnyVal { */ def >>>(x: Long): Long /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 @@ -90,8 +90,8 @@ final abstract class Long private extends AnyVal { */ def >>(x: Int): Long /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 diff --git a/src/library/scala/Short.scala b/src/library/scala/Short.scala index 36b9ec4df9..2cbbf3cc59 100644 --- a/src/library/scala/Short.scala +++ b/src/library/scala/Short.scala @@ -79,8 +79,8 @@ final abstract class Short private extends AnyVal { */ def >>>(x: Long): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 @@ -90,8 +90,8 @@ final abstract class Short private extends AnyVal { */ def >>(x: Int): Int /** - * Returns this value bit-shifted left by the specified number of bits, - * filling in the right bits with the same value as the left-most bit of this. + * Returns this value bit-shifted right by the specified number of bits, + * filling in the left bits with the same value as the left-most bit of this. * The effect of this is to retain the sign of the value. * @example {{{ * -21 >> 3 == -3 diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala index 875f6e1c02..86e86d4584 100644 --- a/src/library/scala/collection/JavaConverters.scala +++ b/src/library/scala/collection/JavaConverters.scala @@ -52,7 +52,10 @@ import convert._ * - `scala.collection.Set` => `java.util.Set` * - `scala.collection.Map` => `java.util.Map` * - * @author Martin Odersky + * The following one way conversion is provided via `asScala`: + * + * - `java.util.Properties` => `scala.collection.mutable.Map` + * * @since 2.8.1 */ object JavaConverters extends DecorateAsJava with DecorateAsScala diff --git a/src/library/scala/collection/Searching.scala b/src/library/scala/collection/Searching.scala index b68124b3f8..25e8b5e253 100644 --- a/src/library/scala/collection/Searching.scala +++ b/src/library/scala/collection/Searching.scala @@ -36,12 +36,12 @@ object Searching { class SearchImpl[A, Repr](val coll: SeqLike[A, Repr]) { /** Search the sorted sequence for a specific element. If the sequence is an - * `IndexedSeq`, a binary search is used. Otherwise, a linear search is used. + * `IndexedSeqLike`, a binary search is used. Otherwise, a linear search is used. * * The sequence should be sorted with the same `Ordering` before calling; otherwise, * the results are undefined. * - * @see [[scala.collection.IndexedSeq]] + * @see [[scala.collection.IndexedSeqLike]] * @see [[scala.math.Ordering]] * @see [[scala.collection.SeqLike]], method `sorted` * @@ -54,18 +54,18 @@ object Searching { */ final def search[B >: A](elem: B)(implicit ord: Ordering[B]): SearchResult = coll match { - case _: IndexedSeq[A] => binarySearch(elem, 0, coll.length)(ord) + case _: IndexedSeqLike[A, Repr] => binarySearch(elem, 0, coll.length)(ord) case _ => linearSearch(coll.view, elem, 0)(ord) } /** Search within an interval in the sorted sequence for a specific element. If the - * sequence is an IndexedSeq, a binary search is used. Otherwise, a linear search + * sequence is an `IndexedSeqLike`, a binary search is used. Otherwise, a linear search * is used. * * The sequence should be sorted with the same `Ordering` before calling; otherwise, * the results are undefined. * - * @see [[scala.collection.IndexedSeq]] + * @see [[scala.collection.IndexedSeqLike]] * @see [[scala.math.Ordering]] * @see [[scala.collection.SeqLike]], method `sorted` * @@ -81,7 +81,7 @@ object Searching { final def search[B >: A](elem: B, from: Int, to: Int) (implicit ord: Ordering[B]): SearchResult = coll match { - case _: IndexedSeq[A] => binarySearch(elem, from, to)(ord) + case _: IndexedSeqLike[A, Repr] => binarySearch(elem, from, to)(ord) case _ => linearSearch(coll.view(from, to), elem, from)(ord) } diff --git a/src/library/scala/collection/convert/DecorateAsJava.scala b/src/library/scala/collection/convert/DecorateAsJava.scala index 6658b6feea..e6aa5da067 100644 --- a/src/library/scala/collection/convert/DecorateAsJava.scala +++ b/src/library/scala/collection/convert/DecorateAsJava.scala @@ -16,7 +16,7 @@ import WrapAsJava._ import scala.language.implicitConversions -/** A collection of decorators that allow to convert between +/** A collection of decorators that allow converting between * Scala and Java collections using `asScala` and `asJava` methods. * * The following conversions are supported via `asJava`, `asScala` @@ -38,8 +38,8 @@ import scala.language.implicitConversions * val sl2 : scala.collection.mutable.Buffer[Int] = jl.asScala * assert(sl eq sl2) * }}} - * The following conversions also are supported, but the - * direction Scala to Java is done my a more specifically named method: + * The following conversions are also supported, but the + * direction from Scala to Java is done by the more specifically named methods: * `asJavaCollection`, `asJavaEnumeration`, `asJavaDictionary`. * * - `scala.collection.Iterable` <=> `java.util.Collection` @@ -53,10 +53,12 @@ import scala.language.implicitConversions * - `scala.collection.Set` => `java.util.Set` * - `scala.collection.Map` => `java.util.Map` * - * @author Martin Odersky + * The following one way conversion is provided via `asScala`: + * + * - `java.util.Properties` => `scala.collection.mutable.Map` + * * @since 2.8.1 */ - trait DecorateAsJava { /** * Adds an `asJava` method that implicitly converts a Scala `Iterator` to a diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index cd2d3f843b..5a9734a99e 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -156,7 +156,7 @@ override def companion: GenericCompanion[Vector] = Vector override def take(n: Int): Vector[A] = { if (n <= 0) Vector.empty - else if (startIndex + n < endIndex) + else if (startIndex < endIndex - n) dropBack0(startIndex + n) else this @@ -165,7 +165,7 @@ override def companion: GenericCompanion[Vector] = Vector override def drop(n: Int): Vector[A] = { if (n <= 0) this - else if (startIndex + n < endIndex) + else if (startIndex < endIndex - n) dropFront0(startIndex + n) else Vector.empty diff --git a/src/library/scala/concurrent/duration/Duration.scala b/src/library/scala/concurrent/duration/Duration.scala index 8b7d81d1c4..a905ef345c 100644 --- a/src/library/scala/concurrent/duration/Duration.scala +++ b/src/library/scala/concurrent/duration/Duration.scala @@ -94,7 +94,7 @@ object Duration { timeUnitLabels flatMap { case (unit, names) => expandLabels(names) map (_ -> unit) } toMap /** - * Extract length and time unit out of a string, where the format must match the description for [[Duration$.apply(String):Duration apply(String)]]. + * Extract length and time unit out of a string, where the format must match the description for [[Duration$.apply(s:String)* apply(String)]]. * The extractor will not match for malformed strings or non-finite durations. */ def unapply(s: String): Option[(Long, TimeUnit)] = @@ -355,7 +355,7 @@ object Duration { * - isomorphic to `java.lang.Double` when it comes to infinite or undefined values * * The conversion between Duration and Double is done using [[Duration.toUnit]] (with unit NANOSECONDS) - * and [[Duration$.fromNanos(Double):Duration Duration.fromNanos(Double)]]. + * and [[Duration$.fromNanos(nanos:Double)* Duration.fromNanos(Double)]] * * <h2>Ordering</h2> * diff --git a/src/library/scala/math/package.scala b/src/library/scala/math/package.scala index b6593d6661..54c81ed613 100644 --- a/src/library/scala/math/package.scala +++ b/src/library/scala/math/package.scala @@ -58,7 +58,19 @@ package object math { * logarithms. */ def exp(x: Double): Double = java.lang.Math.exp(x) + + /** Returns the natural logarithm of a `double` value. + * + * @param x the number to take the natural logarithm of + * @return the value `logₑ(x)` where `e` is Eulers number + */ def log(x: Double): Double = java.lang.Math.log(x) + + /** Returns the square root of a `double` value. + * + * @param x the number to take the square root of + * @return the value √x + */ def sqrt(x: Double): Double = java.lang.Math.sqrt(x) def IEEEremainder(x: Double, y: Double): Double = java.lang.Math.IEEEremainder(x, y) |