Merge pull request scala#7125 from xuwei-k/AbstractIterator-in-reflect

use AbstractIterator if possible

Author: szeiger

src/reflect/scala/reflect/internal/Scopes.scala

@@ -8,7 +8,7 @@ package reflect
 package internal
 
 import scala.annotation.tailrec
-import scala.collection.AbstractIterable
+import scala.collection.{AbstractIterable, AbstractIterator}
 import scala.collection.mutable.Clearable
 import scala.reflect.internal.util.{Statistics, StatisticsStatics}
 
@@ -274,13 +274,13 @@ trait Scopes extends api.Scopes { self: SymbolTable =>
 
     /** Returns an iterator yielding every symbol with given name in this scope.
      */
-    def lookupAll(name: Name): Iterator[Symbol] = new Iterator[Symbol] {
+    def lookupAll(name: Name): Iterator[Symbol] = new AbstractIterator[Symbol] {
       var e = lookupEntry(name)
       def hasNext: Boolean = e ne null
       def next(): Symbol = try e.sym finally e = lookupNextEntry(e)
     }
 
-    def lookupAllEntries(name: Name): Iterator[ScopeEntry] = new Iterator[ScopeEntry] {
+    def lookupAllEntries(name: Name): Iterator[ScopeEntry] = new AbstractIterator[ScopeEntry] {
       var e = lookupEntry(name)
       def hasNext: Boolean = e ne null
       def next(): ScopeEntry = try e finally e = lookupNextEntry(e)

src/reflect/scala/reflect/internal/SymbolPairs.scala

@@ -270,7 +270,7 @@ abstract class SymbolPairs {
 
     def hasNext     = curEntry ne null
     def currentPair = new SymbolPair(base, low, high)
-    def iterator    = new Iterator[SymbolPair] {
+    def iterator: Iterator[SymbolPair] = new collection.AbstractIterator[SymbolPair] {
       def hasNext = cursor.hasNext
       def next()  = try cursor.currentPair finally cursor.next()
     }

src/reflect/scala/reflect/internal/Symbols.scala

@@ -1223,7 +1223,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     // Non-classes skip self and return rest of owner chain; overridden in ClassSymbol.
     def enclClassChain: List[Symbol] = owner.enclClassChain
 
-    def ownersIterator: Iterator[Symbol] = new Iterator[Symbol] {
+    def ownersIterator: Iterator[Symbol] = new collection.AbstractIterator[Symbol] {
       private var current = Symbol.this
       def hasNext = current ne NoSymbol
       def next = { val r = current; current = current.owner; r }

src/reflect/scala/reflect/internal/util/HashSet.scala

@@ -66,7 +66,7 @@ class HashSet[T >: Null <: AnyRef](val label: String, initialCapacity: Int) exte
     xs.iterator foreach addEntry
   }
 
-  def iterator = new Iterator[T] {
+  def iterator: Iterator[T] = new collection.AbstractIterator[T] {
     private var i = 0
     def hasNext: Boolean = {
       while (i < table.length && (table(i) eq null)) i += 1

src/reflect/scala/reflect/internal/util/WeakHashSet.scala

@@ -280,7 +280,7 @@ final class WeakHashSet[A <: AnyRef](val initialCapacity: Int, val loadFactor: D
   override def iterator: Iterator[A] = {
     removeStaleEntries()
 
-    new Iterator[A] {
+    new collection.AbstractIterator[A] {
 
       /**
        * the bucket currently being examined. Initially it's set past the last bucket and will be decremented