summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/PagedSeq.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-05-08 20:42:27 +0000
committerPaul Phillips <paulp@improving.org>2009-05-08 20:42:27 +0000
commit8b030ca4844d6a0ad67f4b47f416a7af59bddea2 (patch)
tree88735d3f648db1def1dba7a1dea27940aa4dbad2 /src/library/scala/collection/immutable/PagedSeq.scala
parent8100cc9f6d550c7275ab3a20e4b1e26621fcea6e (diff)
downloadscala-8b030ca4844d6a0ad67f4b47f416a7af59bddea2.tar.gz
scala-8b030ca4844d6a0ad67f4b47f416a7af59bddea2.tar.bz2
scala-8b030ca4844d6a0ad67f4b47f416a7af59bddea2.zip
Further refinement of fix for #1960.
Diffstat (limited to 'src/library/scala/collection/immutable/PagedSeq.scala')
-rw-r--r--src/library/scala/collection/immutable/PagedSeq.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala
index c63336f2da..85eca5777b 100644
--- a/src/library/scala/collection/immutable/PagedSeq.scala
+++ b/src/library/scala/collection/immutable/PagedSeq.scala
@@ -109,7 +109,7 @@ import PagedSeq._
* @author Martin Odersky
*/
class PagedSeq[T] protected (more: (Array[T], Int, Int) => Int,
- first: Page[T], start: Int, end: Int) extends RandomAccessSeq[T] {
+ first1: Page[T], start: Int, end: Int) extends RandomAccessSeq[T] {
/** A paged sequence is constructed from a method that produces more characters when asked.
* The producer method is analogous to the read method in java.io.Reader.
@@ -120,15 +120,15 @@ class PagedSeq[T] protected (more: (Array[T], Int, Int) => Int,
*/
def this(more: (Array[T], Int, Int) => Int) = this(more, new Page[T](0), 0, UndeterminedEnd)
- private var current: Page[T] = first
+ private var current: Page[T] = first1
- private def latest = first.latest
+ private def latest = first1.latest
private def addMore() = latest.addMore(more)
private def page(absindex: Int) = {
if (absindex < current.start)
- current = first
+ current = first1
while (absindex >= current.end && current.next != null)
current = current.next
while (absindex >= current.end && !current.isLast) {
@@ -167,7 +167,7 @@ class PagedSeq[T] protected (more: (Array[T], Int, Int) => Int,
page(start)
val s = start + _start
val e = if (_end == UndeterminedEnd) _end else start + _end
- var f = first
+ var f = first1
while (f.end <= s && !f.isLast) f = f.next
new PagedSeq(more, f, s, e)
}