diff options
author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
---|---|---|
committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
commit | cc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch) | |
tree | 94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /src/dotnet-library | |
parent | 4b8be5d8bec86358276407d6521c41702ccda835 (diff) | |
download | scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2 scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip |
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).
Diffstat (limited to 'src/dotnet-library')
-rw-r--r-- | src/dotnet-library/scala/Console.scala | 2 | ||||
-rw-r--r-- | src/dotnet-library/scala/Ordering.scala | 4 | ||||
-rw-r--r-- | src/dotnet-library/scala/Predef.scala | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dotnet-library/scala/Console.scala b/src/dotnet-library/scala/Console.scala index 3df51dcd20..47b96d3180 100644 --- a/src/dotnet-library/scala/Console.scala +++ b/src/dotnet-library/scala/Console.scala @@ -279,7 +279,7 @@ object Console { // private def textParams(s: Seq[Any]): Array[AnyRef] = { // val res = new Array[AnyRef](s.length) // var i: Int = 0 -// val iter = s.elements +// val iter = s.iterator // while (iter.hasNext) { // res(i) = iter.next match { // case x: Boolean => java.lang.Boolean.valueOf(x) diff --git a/src/dotnet-library/scala/Ordering.scala b/src/dotnet-library/scala/Ordering.scala index 625f5977aa..e248fb7eeb 100644 --- a/src/dotnet-library/scala/Ordering.scala +++ b/src/dotnet-library/scala/Ordering.scala @@ -160,8 +160,8 @@ object Ordering implicit def Iterable[T](implicit ord : Ordering[T]) : Ordering[Iterable[T]] = new Ordering[Iterable[T]] { def compare(x : Iterable[T], y : Iterable[T]) : Int = { - val xe = x.elements; - val ye = y.elements; + val xe = x.iterator; + val ye = y.iterator; while (xe.hasNext && ye.hasNext){ val res = ord.compare(xe.next, ye.next); diff --git a/src/dotnet-library/scala/Predef.scala b/src/dotnet-library/scala/Predef.scala index eae88b94bc..bfcbc461b3 100644 --- a/src/dotnet-library/scala/Predef.scala +++ b/src/dotnet-library/scala/Predef.scala @@ -211,8 +211,8 @@ object Predef { val self = xs def compare(that: Iterable[A]): Int = { var res = 0 - val these = xs.elements - val those = that.elements + val these = xs.iterator + val those = that.iterator while (res == 0 && these.hasNext) res = if (those.hasNext) these.next compare those.next else 1 if (res == 0) { |