Fix progression iterators to respect the Iterator contract.

#KT-16923 Fixed
This commit is contained in:
Ilya Gorbunov
2017-03-18 02:52:51 +03:00
parent e5a28311bc
commit 87c055cc61
3 changed files with 14 additions and 4 deletions
@@ -36,15 +36,16 @@ fun integerProgressionIterator(kind: ProgressionKind): String {
* @property step the number by which the value is incremented on each step.
*/
internal class ${t}ProgressionIterator(first: $t, last: $t, val step: $incrementType) : ${t}Iterator() {
private var next = first$toInt
private val finalElement = last$toInt
private var hasNext: Boolean = if (step > 0) first <= last else first >= last
private var next = if (hasNext) first$toInt else finalElement
override fun hasNext(): Boolean = hasNext
override fun next$t(): $t {
val value = next
if (value == finalElement) {
if (!hasNext) throw kotlin.NoSuchElementException()
hasNext = false
}
else {