diff options
| -rw-r--r-- | src/library/scala/collection/generic/SequenceTemplate.scala | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/library/scala/collection/generic/SequenceTemplate.scala b/src/library/scala/collection/generic/SequenceTemplate.scala index ba949152bd..df49b442bb 100644 --- a/src/library/scala/collection/generic/SequenceTemplate.scala +++ b/src/library/scala/collection/generic/SequenceTemplate.scala @@ -283,11 +283,12 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] * @see String.startsWith */ def startsWith[B](that: Sequence[B], offset: Int): Boolean = { - val i = this.iterator.drop(offset) + val i = this.iterator drop offset val j = that.iterator - while (j.hasNext && i.hasNext) { - if (i.next != j.next) return false - } + while (j.hasNext && i.hasNext) + if (i.next != j.next) + return false + !j.hasNext } @@ -305,7 +306,10 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] def endsWith[B](that: Sequence[B]): Boolean = { val i = this.iterator.drop(length - that.length) val j = that.iterator - while (i.hasNext && j.hasNext && i.next == j.next) () + while (i.hasNext && j.hasNext) + if (i.next != j.next) + return false + !j.hasNext } |