diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterator.kt b/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterator.kt index 09cc5c6d939..dc057af2ef9 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterator.kt +++ b/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterator.kt @@ -22,4 +22,4 @@ private class ArrayIterator(val array: Array) : Iterator { override fun next() = array[index++] } -public fun iterator(array: Array): Iterator = ArrayIterator(array) +public fun iterator(array: Array): Iterator = ArrayIterator(array) diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt b/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt index 4442e816e52..9287955bf6d 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt +++ b/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt @@ -66,11 +66,11 @@ private class ArrayBooleanIterator(private val array: BooleanArray) : BooleanIte override fun nextBoolean() = array[index++] } -public operator fun iterator(array: ByteArray): ByteIterator = ArrayByteIterator(array) -public operator fun iterator(array: CharArray): CharIterator = ArrayCharIterator(array) -public operator fun iterator(array: ShortArray): ShortIterator = ArrayShortIterator(array) -public operator fun iterator(array: IntArray): IntIterator = ArrayIntIterator(array) -public operator fun iterator(array: LongArray): LongIterator = ArrayLongIterator(array) -public operator fun iterator(array: FloatArray): FloatIterator = ArrayFloatIterator(array) -public operator fun iterator(array: DoubleArray): DoubleIterator = ArrayDoubleIterator(array) -public operator fun iterator(array: BooleanArray): BooleanIterator = ArrayBooleanIterator(array) +public fun iterator(array: ByteArray): ByteIterator = ArrayByteIterator(array) +public fun iterator(array: CharArray): CharIterator = ArrayCharIterator(array) +public fun iterator(array: ShortArray): ShortIterator = ArrayShortIterator(array) +public fun iterator(array: IntArray): IntIterator = ArrayIntIterator(array) +public fun iterator(array: LongArray): LongIterator = ArrayLongIterator(array) +public fun iterator(array: FloatArray): FloatIterator = ArrayFloatIterator(array) +public fun iterator(array: DoubleArray): DoubleIterator = ArrayDoubleIterator(array) +public fun iterator(array: BooleanArray): BooleanIterator = ArrayBooleanIterator(array) diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt index b4f917beadf..66bb269333b 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt @@ -24,7 +24,7 @@ class GenerateArrayIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) { override fun getPackage() = "kotlin.jvm.internal" override fun generateBody() { - for (kind in PrimitiveType.values()) { + for (kind in PrimitiveType.values) { val s = kind.capitalized out.println("private class Array${s}Iterator(private val array: ${s}Array) : ${s}Iterator() {") out.println(" private var index = 0") @@ -33,9 +33,9 @@ class GenerateArrayIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) { out.println("}") out.println() } - for (kind in PrimitiveType.values()) { + for (kind in PrimitiveType.values) { val s = kind.capitalized - out.println("public operator fun iterator(array: ${s}Array): ${s}Iterator = Array${s}Iterator(array)") + out.println("public fun iterator(array: ${s}Array): ${s}Iterator = Array${s}Iterator(array)") } } }