Modify BufferedSource to use a BufferedLineIter...

Modify BufferedSource to use a BufferedLineIterator to speed up
line-by-line reads on large files. Updated testfile which used this
class. Closes #4186. Review (of fft.check) by prokopec.

2 files changed, 16 insertions, 3 deletions

diff --git a/src/library/scala/io/BufferedSource.scala b/src/library/scala/io/BufferedSource.scala
index fe66b289e6..5df52d45e3 100644
--- a/src/library/scala/io/BufferedSource.scala
+++ b/src/library/scala/io/BufferedSource.scala
@@ -6,8 +6,6 @@
 **                          |/                                          **
 \*                                                                      */
 
-
-
 package scala.io
 
 import java.io.{ InputStream, BufferedReader, InputStreamReader }
@@ -27,5 +25,20 @@ class BufferedSource(inputStream: InputStream, bufferSize: Int)(implicit val cod
     val reader = bufferedReader()
     Iterator continually (codec wrap reader.read()) takeWhile (_ != -1) map (_.toChar)
   }
+
+  class BufferedLineIterator extends Iterator[String] {
+    val bufReader = BufferedSource.this.bufferedReader()
+    var nextLine = bufReader.readLine
+
+    override def hasNext() = nextLine != null
+
+    override def next(): String = {
+      val result = nextLine
+      nextLine = bufReader.readLine
+      result
+    }
+  }
+
+  override def getLines(): Iterator[String] = new BufferedLineIterator
 }
 
diff --git a/test/files/specialized/fft.check b/test/files/specialized/fft.check
index f61fd55f50..eb56a2a879 100644
--- a/test/files/specialized/fft.check
+++ b/test/files/specialized/fft.check
@@ -1,4 +1,4 @@
 Processing 65536 items
 Boxed doubles: 0
-Boxed ints: 786441
+Boxed ints: 2
 Boxed longs: 1442031