From b11acdfbea8a0648668e8037f42452dca89feb3a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 8 Jan 2016 13:27:01 +0100 Subject: [PATCH] regenerate builtins (don't remove 'public' modifiers until we agree that we don't want them in stdlib) --- .../src/kotlin/jvm/functions/Functions.kt | 92 +++++++++---------- .../src/kotlin/jvm/internal/ArrayIterators.kt | 16 ++-- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/core/runtime.jvm/src/kotlin/jvm/functions/Functions.kt b/core/runtime.jvm/src/kotlin/jvm/functions/Functions.kt index 1be71a44dad..9ae1ec041ba 100644 --- a/core/runtime.jvm/src/kotlin/jvm/functions/Functions.kt +++ b/core/runtime.jvm/src/kotlin/jvm/functions/Functions.kt @@ -19,117 +19,117 @@ package kotlin.jvm.functions /** A function that takes 0 arguments. */ -interface Function0 : Function { +public interface Function0 : Function { /** Invokes the function. */ - operator fun invoke(): R + public operator fun invoke(): R } /** A function that takes 1 argument. */ -interface Function1 : Function { +public interface Function1 : Function { /** Invokes the function with the specified argument. */ - operator fun invoke(p1: P1): R + public operator fun invoke(p1: P1): R } /** A function that takes 2 arguments. */ -interface Function2 : Function { +public interface Function2 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2): R + public operator fun invoke(p1: P1, p2: P2): R } /** A function that takes 3 arguments. */ -interface Function3 : Function { +public interface Function3 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3): R + public operator fun invoke(p1: P1, p2: P2, p3: P3): R } /** A function that takes 4 arguments. */ -interface Function4 : Function { +public interface Function4 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4): R } /** A function that takes 5 arguments. */ -interface Function5 : Function { +public interface Function5 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5): R } /** A function that takes 6 arguments. */ -interface Function6 : Function { +public interface Function6 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6): R } /** A function that takes 7 arguments. */ -interface Function7 : Function { +public interface Function7 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7): R } /** A function that takes 8 arguments. */ -interface Function8 : Function { +public interface Function8 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8): R } /** A function that takes 9 arguments. */ -interface Function9 : Function { +public interface Function9 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9): R } /** A function that takes 10 arguments. */ -interface Function10 : Function { +public interface Function10 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10): R } /** A function that takes 11 arguments. */ -interface Function11 : Function { +public interface Function11 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11): R } /** A function that takes 12 arguments. */ -interface Function12 : Function { +public interface Function12 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12): R } /** A function that takes 13 arguments. */ -interface Function13 : Function { +public interface Function13 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13): R } /** A function that takes 14 arguments. */ -interface Function14 : Function { +public interface Function14 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14): R } /** A function that takes 15 arguments. */ -interface Function15 : Function { +public interface Function15 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15): R } /** A function that takes 16 arguments. */ -interface Function16 : Function { +public interface Function16 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16): R } /** A function that takes 17 arguments. */ -interface Function17 : Function { +public interface Function17 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17): R } /** A function that takes 18 arguments. */ -interface Function18 : Function { +public interface Function18 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18): R } /** A function that takes 19 arguments. */ -interface Function19 : Function { +public interface Function19 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19): R } /** A function that takes 20 arguments. */ -interface Function20 : Function { +public interface Function20 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20): R } /** A function that takes 21 arguments. */ -interface Function21 : Function { +public interface Function21 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20, p21: P21): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20, p21: P21): R } /** A function that takes 22 arguments. */ -interface Function22 : Function { +public interface Function22 : Function { /** Invokes the function with the specified arguments. */ - operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20, p21: P21, p22: P22): R + public operator fun invoke(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7, p8: P8, p9: P9, p10: P10, p11: P11, p12: P12, p13: P13, p14: P14, p15: P15, p16: P16, p17: P17, p18: P18, p19: P19, p20: P20, p21: P21, p22: P22): R } diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt b/core/runtime.jvm/src/kotlin/jvm/internal/ArrayIterators.kt index fa4b85c7626..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++] } -fun iterator(array: ByteArray): ByteIterator = ArrayByteIterator(array) -fun iterator(array: CharArray): CharIterator = ArrayCharIterator(array) -fun iterator(array: ShortArray): ShortIterator = ArrayShortIterator(array) -fun iterator(array: IntArray): IntIterator = ArrayIntIterator(array) -fun iterator(array: LongArray): LongIterator = ArrayLongIterator(array) -fun iterator(array: FloatArray): FloatIterator = ArrayFloatIterator(array) -fun iterator(array: DoubleArray): DoubleIterator = ArrayDoubleIterator(array) -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)