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

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

Author: Gilles Dubochet

src/library/scala/xml/Elem.scala

@@ -80,7 +80,7 @@ object Elem {
     */
    override def text = {
      val sb = new StringBuilder()
-     val it = child.elements
+     val it = child.iterator
      while (it.hasNext)
        sb.append(it.next.text)
      sb.toString()

src/library/scala/xml/MetaData.scala

@@ -164,15 +164,15 @@ abstract class MetaData extends Iterable[MetaData] {
     that match {
       case m: MetaData =>
         var res = (this.length == m.length) && (this.hashCode() == m.hashCode())
-        val it = this.elements
+        val it = this.iterator
         while (res && it.hasNext) { res = it.next.containedIn1(m) }
         res
       case _ =>
         false
     }
 
   /** returns an iterator on attributes */
-  def elements: Iterator[MetaData] = new Iterator[MetaData] {
+  def iterator: Iterator[MetaData] = new Iterator[MetaData] {
     var x: MetaData = MetaData.this
     def hasNext = Null != x
     def next = {

src/library/scala/xml/NodeBuffer.scala

@@ -47,13 +47,13 @@ class NodeBuffer extends scala.collection.mutable.ArrayBuffer[Node] {
           this &+ it.next
 
       case n:Node =>
-        super.+(n)
+        super.+=(n)
 
       case ns:Iterable[_] =>
-        this &+ ns.elements
+        this &+ ns.iterator
 
       case d =>
-        super.+(new Atom(d))
+        super.+=(new Atom(d))
     }
     this
   }

src/library/scala/xml/NodeSeq.scala

@@ -45,7 +45,7 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
 
   def theSeq: Seq[Node]
   def length = theSeq.length
-  override def elements = theSeq.elements
+  override def iterator = theSeq.iterator
   def apply(i: Int): Node = theSeq.apply(i)
 
   def apply(f: Node => Boolean): NodeSeq = filter(f)
@@ -76,10 +76,10 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
   def \(that: String): NodeSeq = that match {
     case "_" =>
       var zs: List[Node] = Nil
-      val it = this.elements
+      val it = this.iterator
       while (it.hasNext) {
         val x = it.next
-        val jt = x.child.elements
+        val jt = x.child.iterator
         while (jt.hasNext) {
           val y = jt.next
           if (y.typeTag$ != -1)
@@ -114,10 +114,10 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
 
     case _   =>
       var zs: List[Node] = Nil
-      val it = this.elements
+      val it = this.iterator
       while (it.hasNext) {
         val x = it.next
-        val jt = x.child.elements
+        val jt = x.child.iterator
         while (jt.hasNext) {
           val y = jt.next
           if (y.label == that)
@@ -145,10 +145,10 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
   def \\ (that: String): NodeSeq = that match {
     case "_" =>
       var zs: List[Node] = Nil
-      val it = this.elements
+      val it = this.iterator
       while (it.hasNext) {
         val x = it.next
-        val jt = x.descendant_or_self.elements
+        val jt = x.descendant_or_self.iterator
         while (jt.hasNext) {
           val y = jt.next
           if (y.typeTag$ != -1)
@@ -159,14 +159,14 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
 
     case _ if that.charAt(0) == '@' =>
       var zs: List[Node] = Nil
-      val it = this.elements
+      val it = this.iterator
       while (it.hasNext) {
         val x = it.next
-        val jt = x.descendant_or_self.elements
+        val jt = x.descendant_or_self.iterator
         while (jt.hasNext) {
           val y = jt.next
           if (y.typeTag$ != -1) {
-            val kt = (y \ that).elements
+            val kt = (y \ that).iterator
             while (kt.hasNext) {
               zs = (kt.next)::zs
             }
@@ -177,10 +177,10 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
 
     case _ =>
       var zs: List[Node] = Nil
-      val it = this.elements
+      val it = this.iterator
       while (it.hasNext) {
         val x = it.next
-        val jt = x.descendant_or_self.elements
+        val jt = x.descendant_or_self.iterator
         while (jt.hasNext) {
           val y = jt.next
           if (y.typeTag$ != -1 && y.label == that)
@@ -190,7 +190,7 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
     zs.reverse
   }
 
-  override def toString(): String = theSeq.elements.foldLeft ("") {
+  override def toString(): String = theSeq.iterator.foldLeft ("") {
     (s: String, x: Node) => s + x.toString()
   }
 /*
@@ -209,7 +209,7 @@ abstract class NodeSeq extends immutable.Sequence[Node] with SequenceTemplate[No
 
   def text: String = {
     val sb = new StringBuilder()
-    val it = elements
+    val it = this.iterator
     while (it.hasNext) {
       sb.append(it.next.text)
     }

src/library/scala/xml/Null.scala

@@ -21,7 +21,7 @@ case object Null extends MetaData {
   /** returns its argument */
   def copy(next: MetaData) = next
 
-  override def elements = Iterator.empty
+  override def iterator = Iterator.empty
 
   override def filter(f: MetaData => Boolean): MetaData = this
 

src/library/scala/xml/Parsing.scala

@@ -30,7 +30,7 @@ object Parsing {
 
   /** <pre>(#x20 | #x9 | #xD | #xA)+</pre> */
   final def isSpace(cs: Seq[Char]): Boolean = {
-    val it = cs.elements
+    val it = cs.iterator
     it.hasNext && it.forall { isSpace }
   }
 
@@ -75,7 +75,7 @@ object Parsing {
   def isName(s: String): Boolean =
     if (s.length() > 0) {
       val z: Seq[Char] = s
-      val y = z.elements
+      val y = z.iterator
       if (isNameStart(y.next)) {
         while (y.hasNext && isNameChar(y.next)) {}
         !y.hasNext
@@ -97,7 +97,7 @@ object Parsing {
   def checkPubID(s: String): Boolean =
     if (s.length() > 0) {
       val z:Seq[Char] = s
-      val y = z.elements
+      val y = z.iterator
       while (y.hasNext && isPubIDChar(y.next)) {}
       !y.hasNext
     } else true

src/library/scala/xml/PrettyPrinter.scala

@@ -91,7 +91,7 @@ class PrettyPrinter( width:Int, step:Int ) {
       items = Box(ind, s) :: items
       cur += s.length
     } else try {
-      for (b <- cut(s, ind).elements)  // break it up
+      for (b <- cut(s, ind).iterator)  // break it up
         items = b :: items
     } catch {
       case _:BrokenException => makePara(ind, s) // give up, para
@@ -168,7 +168,7 @@ class PrettyPrinter( width:Int, step:Int ) {
       case _:Atom[_] | _:Comment | _:EntityRef | _:ProcInstr =>
         makeBox( ind, node.toString().trim() )
       case g @ Group(xs) =>
-        traverse(xs.elements, pscope, ind)
+        traverse(xs.iterator, pscope, ind)
       case _ =>
         val test = {
           val sb = new StringBuilder()
@@ -184,15 +184,15 @@ class PrettyPrinter( width:Int, step:Int ) {
           if (stg.length < width - cur) { // start tag fits
             makeBox(ind, stg)
             makeBreak()
-            traverse(node.child.elements, node.scope, ind + step)
+            traverse(node.child.iterator, node.scope, ind + step)
             makeBox(ind, etg)
           } else if (len2 < width - cur) {
             // <start label + attrs + tag + content + end tag
             makeBox(ind, stg.substring(0, len2))
             makeBreak() // todo: break the rest in pieces
             /*{ //@todo
              val sq:Seq[String] = stg.split(" ");
-             val it = sq.elements;
+             val it = sq.iterator;
              it.next;
              for (c <- it) {
                makeBox(ind+len2-2, c)
@@ -201,7 +201,7 @@ class PrettyPrinter( width:Int, step:Int ) {
              }*/
             makeBox(ind, stg.substring(len2, stg.length))
             makeBreak()
-            traverse(node.child.elements, node.scope, ind + step)
+            traverse(node.child.iterator, node.scope, ind + step)
             makeBox(cur, etg)
             makeBreak()
           } else { // give up
@@ -300,7 +300,7 @@ class PrettyPrinter( width:Int, step:Int ) {
    *  @param sb   the string buffer to which to append to
    */
   def formatNodes(nodes: Seq[Node], pscope: NamespaceBinding, sb: StringBuilder): Unit =
-    for (n <- nodes.elements) {
+    for (n <- nodes.iterator) {
       sb.append(format(n, pscope))
     }
 

src/library/scala/xml/Utility.scala

@@ -102,7 +102,7 @@ object Utility extends AnyRef with parsing.TokenTests
    * @return     ...
    */
   final def escape(text: String, s: StringBuilder): StringBuilder = {
-    for (c <- text.elements) c match {
+    for (c <- text.iterator) c match {
       case '<' => s.append("&lt;")
       case '>' => s.append("&gt;")
       case '&' => s.append("&amp;")
@@ -141,7 +141,7 @@ object Utility extends AnyRef with parsing.TokenTests
    */
   def collectNamespaces(nodes: Seq[Node]): Set[String] = {
     var m = new HashSet[String]()
-    val it = nodes.elements
+    val it = nodes.iterator
     while (it.hasNext)
       collectNamespaces(it.next, m);
     m
@@ -247,7 +247,7 @@ object Utility extends AnyRef with parsing.TokenTests
 
     if (children.isEmpty) return
     else if (children forall isAtomAndNotText) { // add space
-      val it = children.elements
+      val it = children.iterator
       val f = it.next
       toXML(f, pscope, sb)
       while (it.hasNext) {
@@ -285,7 +285,7 @@ object Utility extends AnyRef with parsing.TokenTests
     + scpeHash * 31
     + {
       var c = 0
-      val i = children.elements
+      val i = children.iterator
       while(i.hasNext) c = c * 41 + i.next.hashCode
       c
     }
@@ -379,7 +379,7 @@ object Utility extends AnyRef with parsing.TokenTests
     val sb  = new StringBuilder
     var rfb: StringBuilder = null
     val nb = new NodeBuffer()
-    val it = zs.elements
+    val it = zs.iterator
     while (it.hasNext) {
       var c = it.next
       c match {

src/library/scala/xml/dtd/ContentModel.scala

@@ -35,7 +35,7 @@ object ContentModel extends WordExp {
   def getLabels(r: RegExp): scala.collection.Set[String] = {
     val s = new scala.collection.mutable.HashSet[String]()
     def traverse1(xs: Seq[RegExp]) {
-      val it = xs.elements
+      val it = xs.iterator
       while (it.hasNext) traverse(it.next)
     }
     def traverse(r: RegExp) {
@@ -54,7 +54,7 @@ object ContentModel extends WordExp {
 
   /* precond: rs.length >= 1 */
   private def buildString(rs: Seq[RegExp], sb: StringBuilder, sep: Char) {
-    val it = rs.elements
+    val it = rs.iterator
     val fst = it.next
     buildString(fst, sb)
     for (z <- it) {
@@ -136,7 +136,7 @@ case class MIXED(r: ContentModel.RegExp) extends DFAContentModel {
     def cond(n:Node) =
       !n.isInstanceOf[Text] && !n.isInstanceOf[SpecialNode];
 Console.println("ns = "+ns);
-    val jt = ns.elements;
+    val jt = ns.iterator;
     def hasNext = jt.hasNext;
     def next = {
       var r: Node = jt.next;
@@ -162,7 +162,7 @@ Console.println("ns = "+ns);
 case class  ELEMENTS(r:ContentModel.RegExp) extends DFAContentModel {
   /*
   def getIterator(ns:NodeSeq) = new Iterator[String] {
-    val jt = ns.elements.buffered;
+    val jt = ns.iterator.buffered;
     def hasNext = jt.hasNext;
     def next = {
       var r: Node = jt.next;

src/library/scala/xml/dtd/ElementValidator.scala

@@ -58,8 +58,8 @@ class ElementValidator() extends Function1[Node,Boolean] {
             case _ =>
               x.namespace eq null
           }}
-          . map { x => ElemName(x.label) }
-          . elements;
+          .map { x => ElemName(x.label) }
+          .iterator;
 
   /** check attributes, return true if md corresponds to attribute declarations in adecls.
    */
@@ -71,15 +71,15 @@ class ElementValidator() extends Function1[Node,Boolean] {
     var ok = new scala.collection.mutable.BitSet(adecls.length);
     def find(Key:String): AttrDecl = {
       var attr: AttrDecl = null;
-      val jt = adecls.elements; while(j < adecls.length) {
+      val jt = adecls.iterator; while(j < adecls.length) {
         jt.next match {
           case a @ AttrDecl(Key, _, _) => attr = a; ok += j; j = adecls.length;
           case _                       => j = j + 1;
         }
       }
       attr
     }
-    val it = md.elements; while(it.hasNext) {
+    val it = md.iterator; while(it.hasNext) {
       val attr = it.next
       j = 0
       find(attr.key) match {
@@ -99,7 +99,7 @@ class ElementValidator() extends Function1[Node,Boolean] {
 
     //val missing = ok.toSet(false); FIXME: it doesn't seem to be used anywhere
     j = 0
-    var kt = adecls.elements
+    var kt = adecls.iterator
     while (kt.hasNext) {
       kt.next match {
         case AttrDecl(key, tpe, REQUIRED) if !ok(j) =>
@@ -129,7 +129,7 @@ class ElementValidator() extends Function1[Node,Boolean] {
       val j = exc.length
       def find(Key: String): Boolean = {
         var res = false
-        val jt = branches.elements
+        val jt = branches.iterator
         while (jt.hasNext && !res)
           jt.next match { // !!! check for match translation problem
             case ContentModel.Letter(ElemName(Key)) => res = true;

src/library/scala/xml/dtd/Scanner.scala

@@ -28,7 +28,7 @@ class Scanner extends Tokens with parsing.TokenTests {
   /** initializes the scanner on input s */
   final def initScanner(s: String) {
     value = ""
-    it = (s).elements
+    it = (s).iterator
     token = 1+END
     next
     nextToken
@@ -50,7 +50,7 @@ class Scanner extends Tokens with parsing.TokenTests {
   }
 
   final def accS(ds: Seq[Char]) {
-    val jt = ds.elements
+    val jt = ds.iterator
     while (jt.hasNext) { acc(jt.next) }
   }
 

src/library/scala/xml/dtd/ValidationException.scala

@@ -34,7 +34,7 @@ object MakeValidationException {
   def fromMissingAttribute(allKeys: scala.collection.Set[String]) = {
     val sb = new StringBuilder("missing value for REQUIRED attribute")
     if (allKeys.size > 1) sb.append('s');
-    val it = allKeys.elements
+    val it = allKeys.iterator
     while (it.hasNext) {
       sb.append('\'').append(it.next).append('\'')
     }