In "Iterable" and in all its subclasses, "itera...

In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).

4 files changed, 7 insertions, 7 deletions

diff --git a/docs/examples/fors.scala b/docs/examples/fors.scala
index b840de5eca..b937e53fcd 100644
--- a/docs/examples/fors.scala
+++ b/docs/examples/fors.scala
@@ -13,7 +13,7 @@ object fors {
   }
 
   def printOlderThan20(xs: Seq[Person]): Iterator[String] =
-    printOlderThan20(xs.elements)
+    printOlderThan20(xs.iterator)
 
   def printOlderThan20(xs: Iterator[Person]): Iterator[String] =
     for (p <- xs if p.age > 20) yield p.name
diff --git a/docs/examples/patterns.scala b/docs/examples/patterns.scala
index 208b216c34..738deabc66 100644
--- a/docs/examples/patterns.scala
+++ b/docs/examples/patterns.scala
@@ -24,7 +24,7 @@ object patterns {
   }
 
   def printFinds[a](xs: List[Pair[a, String]], x: a) =
-    find(xs.elements, x) match {
+    find(xs.iterator, x) match {
       case Some(y) => System.out.println(y)
       case None => System.out.println("no match")
     }
diff --git a/docs/examples/tcpoly/collection/HOSeq.scala b/docs/examples/tcpoly/collection/HOSeq.scala
index f2fbf720e6..04e90012f1 100644
--- a/docs/examples/tcpoly/collection/HOSeq.scala
+++ b/docs/examples/tcpoly/collection/HOSeq.scala
@@ -16,7 +16,7 @@ trait HOSeq {
   //           is an invariant position -- should probably rule that out?
   trait Iterable[+m[+x], +t] {
     //def unit[a](orig: a): m[a]
-    def elements: Iterator[t]
+    def iterator: Iterator[t]
 
     // construct an empty accumulator that will produce the same structure as this iterable, with elements of type t
     def accumulator[t]: Accumulator[m, t]
@@ -44,7 +44,7 @@ trait HOSeq {
         // -- 2nd-order type params are not yet in scope in view bound
       val elems = elements
       while (elems.hasNext) {
-        val elemss: Iterator[s] = f(elems.next).elements
+        val elemss: Iterator[s] = f(elems.next).iterator
         while (elemss.hasNext) buf += elemss.next
       }
       buf.result
@@ -108,7 +108,7 @@ trait HOSeq {
           def head: t
           def tail: List[t]
           def isEmpty: Boolean
-          def elements: Iterator[t] = error("TODO")
+          def iterator: Iterator[t] = error("TODO")
 
           // construct an empty accumulator that will produce the same structure as this iterable, with elements of type t
           def accumulator[t]: Accumulator[List, t] = error("TODO")
diff --git a/docs/examples/xml/phonebook/phonebook3.scala b/docs/examples/xml/phonebook/phonebook3.scala
index 51608beb28..0dfae351b5 100644
--- a/docs/examples/xml/phonebook/phonebook3.scala
+++ b/docs/examples/xml/phonebook/phonebook3.scala
@@ -25,7 +25,7 @@ object phonebook3 {
           case x @ <entry><name>{ Text(Name) }</name>{ ch1 @ _* }</entry> =>
 
             var updated = false;
-            val ch2 = for(val c <- ch1) yield c match { // does it have the phone number?
+            val ch2 = for(c <- ch1) yield c match { // does it have the phone number?
 
               case y @ <phone>{ _* }</phone> if y \ "@where" == Where =>
                 updated = true
@@ -62,7 +62,7 @@ object phonebook3 {
     // decompose phonebook, apply updates
     phonebook match {
       case <phonebook>{ ch @ _* }</phonebook> =>
-        <phonebook>{ copyOrChange( ch.elements ) }</phonebook>
+        <phonebook>{ copyOrChange( ch.iterator ) }</phonebook>
     }
 
   }