Skip to content

Use foreach instead of manual iterator loops in Seq.deleted/updatedWith/splitAround #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheeseng wants to merge 1 commit into
base: stdlib/seq-edits
Choose a base branch
from
Open

Use foreach instead of manual iterator loops in Seq.deleted/updatedWith/splitAround #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions library/src/scala/collection/Seq.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,11 +986,10 @@ transparent trait SeqOps[+A, +CC[_], +C] extends Any
def deleted(index: Int): C^{this} = {
if (index < 0) throw new IndexOutOfBoundsException(index.toString)
val b = newSpecificBuilder
val it = iterator
b.sizeHint(this, -1)
var i = 0
var found = false
while (it.hasNext) {
val a = it.next()
foreach { a =>
if (i == index) found = true else b += a
i += 1
}
Expand All @@ -1015,17 +1014,13 @@ transparent trait SeqOps[+A, +CC[_], +C] extends Any
def updatedWith[B >: A](index: Int, f: A => Option[B]): CC[B]^{this} = {
if (index < 0) throw new IndexOutOfBoundsException(index.toString)
val b = iterableFactory.newBuilder[B]
val it = iterator
b.sizeHint(this)
var i = 0
var found = false
while (it.hasNext) {
val a = it.next()
foreach { a =>
if (i == index) {
found = true
f(a) match {
case Some(replacement) => b += replacement
case None =>
}
f(a).foreach(b += _)
} else b += a
i += 1
}
Expand All @@ -1049,13 +1044,12 @@ transparent trait SeqOps[+A, +CC[_], +C] extends Any
def splitAround[A1 >: A](separator: A1): (C^{this}, C^{this}) = {
val before = newSpecificBuilder
val after = newSpecificBuilder
val it = iterator
var found = false
while (!found && it.hasNext) {
val a = it.next()
if (a == separator) found = true else before += a
var switched = false
foreach { a =>
if (switched) after += a
else if (a == separator) switched = true
else before += a
}
while (it.hasNext) after += it.next()
(before.result(), after.result())
}

Expand Down
Loading