summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-07-27 14:54:11 +0000
committermichelou <michelou@epfl.ch>2007-07-27 14:54:11 +0000
commit5327a60d2007cdbb0ddf7cab29027e8e8c6698c3 (patch)
treea41cd82044d920515aae773be13ccc47898a18f0
parentd3f33a44f8644b757d378fc9e13f7035ced874b0 (diff)
downloadscala-5327a60d2007cdbb0ddf7cab29027e8e8c6698c3.tar.gz
scala-5327a60d2007cdbb0ddf7cab29027e8e8c6698c3.tar.bz2
scala-5327a60d2007cdbb0ddf7cab29027e8e8c6698c3.zip
Iterator -> Iterable
-rw-r--r--docs/examples/fors.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/fors.scala b/docs/examples/fors.scala
index f872980f28..b840de5eca 100644
--- a/docs/examples/fors.scala
+++ b/docs/examples/fors.scala
@@ -28,10 +28,10 @@ object fors {
def isPrime(n: Int) = divisors(n).length == 2
- def findNums(n: Int): Iterator[Pair[Int, Int]] =
+ def findNums(n: Int): Iterable[(Int, Int)] =
for (i <- 1 until n;
j <- 1 until (i-1);
- if isPrime(i+j)) yield Pair(i, j)
+ if isPrime(i+j)) yield (i, j)
def sum(xs: List[Double]): Double =
xs.foldLeft(0.0) { (x, y) => x + y }
@@ -99,7 +99,7 @@ object fors {
println("divisors(34) = " + divisors(34))
print("findNums(15) =");
- findNums(15) foreach { x => Console.print(" " + x); }
+ findNums(15) foreach { x => print(" " + x); }
println
val xs = List(3.5, 5.0, 4.5)