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

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

5 files changed, 10 insertions, 11 deletions

diff --git a/src/scalap/scala/tools/scalap/Arguments.scala b/src/scalap/scala/tools/scalap/Arguments.scala
index 4810adf1af..f50d799d11 100644
--- a/src/scalap/scala/tools/scalap/Arguments.scala
+++ b/src/scalap/scala/tools/scalap/Arguments.scala
@@ -95,7 +95,7 @@ object Arguments {
               i = i + 2
             }
           } else {
-            var iter = prefixes.elements
+            var iter = prefixes.iterator
             val j = i
             while ((i == j) && iter.hasNext) {
               val prefix = iter.next
@@ -105,7 +105,7 @@ object Arguments {
               }
             }
             if (i == j) {
-              val iter = prefixedBindings.keys;
+              val iter = prefixedBindings.keysIterator;
               while ((i == j) && iter.hasNext) {
                 val prefix = iter.next
                 if (args(i) startsWith prefix) {
@@ -127,7 +127,7 @@ object Arguments {
 
   def parse(options: String*)(args: Array[String]): Arguments = {
     val parser = new Parser('-')
-    val iter = options.elements
+    val iter = options.iterator
     while (iter.hasNext)
       parser withOption iter.next
     parser.parse(args)
diff --git a/src/scalap/scala/tools/scalap/CodeWriter.scala b/src/scalap/scala/tools/scalap/CodeWriter.scala
index deb0e2c94a..97581b0f7a 100644
--- a/src/scalap/scala/tools/scalap/CodeWriter.scala
+++ b/src/scalap/scala/tools/scalap/CodeWriter.scala
@@ -33,7 +33,7 @@ class CodeWriter(writer: Writer) {
   def getIndentWidth = if (step == null) -1 else step.length()
 
   def setIndentWidth(width: Int): CodeWriter =
-    setIndentString(List.make(width, ' ').mkString)
+    setIndentString(List.fill(width)(' ').mkString)
 
   def getIndentString = step;
 
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala
index af4ac39464..c01f1d88c9 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/Input.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/Input.scala
@@ -17,7 +17,7 @@ trait Input[+A] extends Iterable[A] {
   def next : Result[Input[A], A, Nothing]
   def index : Int
 
-  def elements = new Iterator[A] {
+  def iterator = new Iterator[A] {
     private var input : Input[A] = Input.this
     private var result = input.next
 
@@ -38,17 +38,17 @@ class ArrayInput[A](val array : Array[A], val index : Int) extends Input[A] {
   lazy val next : Result[ArrayInput[A], A, Nothing] = if (index >= array.length) Failure
       else Success(new ArrayInput[A](array, index + 1), array(index))
 
-  override lazy val toString = elements.mkString("\"", "", "\"")
+  override lazy val toString = this.iterator.mkString("\"", "", "\"")
 }
 
 
 class IterableInput[A](iterator : Iterator[A], val index : Int) extends Input[A] {
-  def this(iterable : Iterable[A]) = this(iterable.elements, 0)
+  def this(iterable : Iterable[A]) = this(iterable.iterator, 0)
 
   lazy val next : Result[IterableInput[A], A, Nothing] = if (!iterator.hasNext) Failure
       else Success(new IterableInput(iterator, index + 1), iterator.next)
 
-  override lazy val toString = elements.mkString("\"", "", "\"")
+  override lazy val toString = this.iterator.mkString("\"", "", "\"")
 }
 
 
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
index f71e2ab5ec..5b90cf9e58 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
@@ -198,7 +198,7 @@ case class ConstantPool(len : Int) {
   val size = len - 1
 
   private val buffer = new scala.collection.mutable.ArrayBuffer[ConstantPool => Any]
-  private val values = Array.make[Option[Any]](size, None)
+  private val values = Array.fill[Option[Any]](size)(None)
 
   def isFull = buffer.length >= size
 
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
index 08a3e1795b..dd711e41db 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
@@ -12,7 +12,6 @@ package scala.tools.scalap.scalax.rules.scalasig
 import java.io.{PrintStream, ByteArrayOutputStream}
 import java.util.regex.Pattern
 
-import _root_.scala.Symbol
 import scala.tools.scalap.scalax.util.StringUtil
 
 class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) {
@@ -319,7 +318,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) {
     "\\$times" -> "*", "\\$div" -> "/", "\\$bslash" -> "\\\\",
     "\\$greater" -> ">", "\\$qmark" -> "?", "\\$percent" -> "%",
     "\\$amp" -> "&", "\\$colon" -> ":", "\\$u2192" -> "→")
-  val pattern = Pattern.compile(_syms.keySet.foldLeft("")((x, y) => if (x == "") y else x + "|" + y))
+  val pattern = Pattern.compile(_syms.keys.foldLeft("")((x, y) => if (x == "") y else x + "|" + y))
   val placeholderPattern = "_\\$(\\d)+"
 
   def processName(name: String) = {