summaryrefslogtreecommitdiff
path: root/test/files/pos/tcpoly_seq_typealias.scala
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/pos/tcpoly_seq_typealias.scala')
-rw-r--r--test/files/pos/tcpoly_seq_typealias.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/pos/tcpoly_seq_typealias.scala b/test/files/pos/tcpoly_seq_typealias.scala
index 7a9312a60a..fb48126ce6 100644
--- a/test/files/pos/tcpoly_seq_typealias.scala
+++ b/test/files/pos/tcpoly_seq_typealias.scala
@@ -18,21 +18,21 @@ trait HOSeq {
type m[+x]
//def unit[a](orig: a): m[a]
- def elements: Iterator[t]
+ def iterator: Iterator[t]
// construct an empty accumulator that will produce the same structure as this iterable, with elements of type t
def accumulator[t]: Accumulator[m, t]
def filter(p: t => Boolean): m[t] = {
val buf = accumulator[t]
- val elems = elements
+ val elems = iterator
while (elems.hasNext) { val x = elems.next; if (p(x)) buf += x }
buf.result
}
def map[s](f: t => s): m[s] = {
val buf = accumulator[s]
- val elems = elements
+ val elems = iterator
while (elems.hasNext) buf += f(elems.next)
buf.result
}
@@ -44,9 +44,9 @@ trait HOSeq {
def flatMap[resColl[+x] <: Iterable[x], s](f: t => resColl[s])(implicit buf: Accumulator[resColl, s]): resColl[s] = {
// TODO: would a viewbound for resColl[x] be better?
// -- 2nd-order type params are not yet in scope in view bound
- val elems = elements
+ val elems = iterator
while (elems.hasNext) {
- val elemss: Iterator[s] = f(elems.next).elements
+ val elemss: Iterator[s] = f(elems.next).iterator
while (elemss.hasNext) buf += elemss.next
}
buf.result
@@ -112,7 +112,7 @@ trait HOSeq {
def head: t
def tail: List[t]
def isEmpty: Boolean
- def elements: Iterator[t] = new Iterator[t] {
+ def iterator: Iterator[t] = new Iterator[t] {
var these = List.this
def hasNext: Boolean = !these.isEmpty
def next: t =