From e1281953e73c89cb831ceb13d082e31cfaef0783 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 14 Aug 2012 14:47:04 +0400 Subject: [PATCH] tests changed val hasNext -> fun hasNext() --- compiler/testData/builtin-classes.txt | 18 +++++++++--------- compiler/testData/codegen/regressions/kt533.kt | 2 +- .../diagnostics/tests/PrimaryConstructors.kt | 2 +- .../tests/extensions/GenericIterator.kt | 3 +-- .../tests/extensions/GenericIterator2.kt | 3 +-- .../tests/regressions/kt385.109.441.kt | 4 ++-- .../diagnostics/tests/regressions/kt860.kt | 2 +- .../src/generated/ArraysFromJLangIterables.kt | 4 ++-- .../BooleanArraysFromJLangIterables.kt | 4 ++-- .../generated/ByteArraysFromJLangIterables.kt | 4 ++-- .../generated/CharArraysFromJLangIterables.kt | 4 ++-- .../DoubleArraysFromJLangIterables.kt | 4 ++-- .../generated/FloatArraysFromJLangIterables.kt | 4 ++-- .../generated/IntArraysFromJLangIterables.kt | 4 ++-- .../generated/LongArraysFromJLangIterables.kt | 4 ++-- .../generated/ShortArraysFromJLangIterables.kt | 4 ++-- libraries/stdlib/src/kotlin/Strings.kt | 3 +-- .../src/kotlin/concurrent/FunctionalList.kt | 3 +-- libraries/stdlib/src/kotlin/io/JIO.kt | 10 ++++------ libraries/stdlib/test/ArraysTest.kt | 4 ++-- 20 files changed, 42 insertions(+), 48 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index c7bf7b6dc0b..3938ad990a6 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -33,7 +33,7 @@ public abstract trait jet.BooleanIterable : jet.Iterable { } public abstract class jet.BooleanIterator : jet.Iterator { public final /*constructor*/ fun (): jet.BooleanIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Boolean public abstract fun nextBoolean(): jet.Boolean } @@ -115,7 +115,7 @@ public abstract trait jet.ByteIterable : jet.Iterable { } public abstract class jet.ByteIterator : jet.Iterator { public final /*constructor*/ fun (): jet.ByteIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Byte public abstract fun nextByte(): jet.Byte } @@ -208,7 +208,7 @@ public abstract trait jet.CharIterable : jet.Iterable { } public abstract class jet.CharIterator : jet.Iterator { public final /*constructor*/ fun (): jet.CharIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Char public abstract fun nextChar(): jet.Char } @@ -312,7 +312,7 @@ public abstract trait jet.DoubleIterable : jet.Iterable { } public abstract class jet.DoubleIterator : jet.Iterator { public final /*constructor*/ fun (): jet.DoubleIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Double public abstract fun nextDouble(): jet.Double } @@ -504,7 +504,7 @@ public abstract trait jet.FloatIterable : jet.Iterable { } public abstract class jet.FloatIterator : jet.Iterator { public final /*constructor*/ fun (): jet.FloatIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Float public abstract fun nextFloat(): jet.Float } @@ -702,7 +702,7 @@ public abstract trait jet.IntIterable : jet.Iterable { } public abstract class jet.IntIterator : jet.Iterator { public final /*constructor*/ fun (): jet.IntIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Int public abstract fun nextInt(): jet.Int } @@ -725,7 +725,7 @@ public abstract trait jet.Iterable : jet.Any { public abstract fun iterator(): jet.Iterator } public abstract trait jet.Iterator : jet.Any { - public abstract val hasNext: jet.Boolean + public abstract fun hasNext(): jet.Boolean public abstract fun next(): T } public final class jet.Long : jet.Number, jet.Comparable { @@ -813,7 +813,7 @@ public abstract trait jet.LongIterable : jet.Iterable { } public abstract class jet.LongIterator : jet.Iterator { public final /*constructor*/ fun (): jet.LongIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Long public abstract fun nextLong(): jet.Long } @@ -928,7 +928,7 @@ public abstract trait jet.ShortIterable : jet.Iterable { } public abstract class jet.ShortIterator : jet.Iterator { public final /*constructor*/ fun (): jet.ShortIterator - public abstract override /*1*/ val hasNext: jet.Boolean + public abstract override /*1*/ fun hasNext(): jet.Boolean public open override /*1*/ fun next(): jet.Short public abstract fun nextShort(): jet.Short } diff --git a/compiler/testData/codegen/regressions/kt533.kt b/compiler/testData/codegen/regressions/kt533.kt index cc6cc547f6c..d123fed270b 100644 --- a/compiler/testData/codegen/regressions/kt533.kt +++ b/compiler/testData/codegen/regressions/kt533.kt @@ -99,7 +99,7 @@ fun List.backwards() : Iterable = object : Iterable { object : jet.Iterator { var current = size() override fun next() : T = get(--current) - override val hasNext : Boolean get() = current > 0 + override fun hasNext() : Boolean = current > 0 } } diff --git a/compiler/testData/diagnostics/tests/PrimaryConstructors.kt b/compiler/testData/diagnostics/tests/PrimaryConstructors.kt index 5d88604bae2..5699e3696e9 100644 --- a/compiler/testData/diagnostics/tests/PrimaryConstructors.kt +++ b/compiler/testData/diagnostics/tests/PrimaryConstructors.kt @@ -21,7 +21,7 @@ class MyIterable : Iterable class MyIterator : Iterator { - override val hasNext: Boolean = false + override fun hasNext(): Boolean = false override fun next(): T { throw UnsupportedOperationException() } diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt index dc7ad332b38..2a68c68ec81 100644 --- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt +++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt @@ -1,8 +1,7 @@ import java.util.Enumeration inline fun java.util.Enumeration.iterator() = object: Iterator { - override val hasNext: Boolean - get() = hasMoreElements() + override fun hasNext(): Boolean = hasMoreElements() override fun next() = nextElement() } diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt index 2a069a53cbc..8cfec0eaec8 100644 --- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt +++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt @@ -1,8 +1,7 @@ import java.util.Enumeration inline fun java.util.Enumeration.iterator() = object : Iterator { - public override val hasNext: Boolean - get() = hasMoreElements() + public override fun hasNext(): Boolean = hasMoreElements() public override fun next() = nextElement() } diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt index 5015dfe9aa0..e303e505c42 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt @@ -5,11 +5,11 @@ import java.util.* import jet.Iterator -fun Iterator.foreach(operation: (element: T) -> Unit) : Unit = while(hasNext) operation(next()) +fun Iterator.foreach(operation: (element: T) -> Unit) : Unit = while(hasNext()) operation(next()) fun Iterator.foreach(operation: (index: Int, element: T) -> Unit) : Unit { var k = 0 - while(hasNext) + while(hasNext()) operation(k++, next()) } diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.kt b/compiler/testData/diagnostics/tests/regressions/kt860.kt index a8ef68b60a5..748da9b3d27 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt860.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt860.kt @@ -6,7 +6,7 @@ import java.util.* import jet.Iterator fun > Iterator.to(container: U) : U { - while(hasNext) + while(hasNext()) container.add(next()) return container } diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt index 76f4e48198d..4ad6e01a556 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun Array.foldRight(initial: T, operation: (T, T) -> T): T */ public inline fun Array.reduce(operation: (T, T) -> T): T { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: T = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt index f9455728249..0ec278cc00d 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun BooleanArray.foldRight(initial: Boolean, operation: (Boolean, */ public inline fun BooleanArray.reduce(operation: (Boolean, Boolean) -> Boolean): Boolean { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Boolean = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt index 9c6765da0db..26c401006fa 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun ByteArray.foldRight(initial: Byte, operation: (Byte, Byte) -> */ public inline fun ByteArray.reduce(operation: (Byte, Byte) -> Byte): Byte { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Byte = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt index 04774e1d18a..59ee1397e0b 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun CharArray.foldRight(initial: Char, operation: (Char, Char) -> */ public inline fun CharArray.reduce(operation: (Char, Char) -> Char): Char { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Char = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt index 9148a4ef0b9..0871d26d1c2 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun DoubleArray.foldRight(initial: Double, operation: (Double, Dou */ public inline fun DoubleArray.reduce(operation: (Double, Double) -> Double): Double { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Double = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt index c87c7d30f75..0605413783c 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun FloatArray.foldRight(initial: Float, operation: (Float, Float) */ public inline fun FloatArray.reduce(operation: (Float, Float) -> Float): Float { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Float = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt index f2aa098bfb7..d15333865b6 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun IntArray.foldRight(initial: Int, operation: (Int, Int) -> Int) */ public inline fun IntArray.reduce(operation: (Int, Int) -> Int): Int { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Int = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt index 0747cc03bc7..270a8454b68 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun LongArray.foldRight(initial: Long, operation: (Long, Long) -> */ public inline fun LongArray.reduce(operation: (Long, Long) -> Long): Long { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Long = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt index d581b468349..ba77814c29b 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt @@ -155,12 +155,12 @@ public inline fun ShortArray.foldRight(initial: Short, operation: (Short, Short) */ public inline fun ShortArray.reduce(operation: (Short, Short) -> Short): Short { val iterator = this.iterator().sure() - if (!iterator.hasNext) { + if (!iterator.hasNext()) { throw UnsupportedOperationException("Empty iterable can't be reduced") } var result: Short = iterator.next() //compiler doesn't understand that result will initialized anyway - while (iterator.hasNext) { + while (iterator.hasNext()) { result = operation(result, iterator.next()) } diff --git a/libraries/stdlib/src/kotlin/Strings.kt b/libraries/stdlib/src/kotlin/Strings.kt index 1f946eef835..47a14c43447 100644 --- a/libraries/stdlib/src/kotlin/Strings.kt +++ b/libraries/stdlib/src/kotlin/Strings.kt @@ -38,8 +38,7 @@ public inline fun CharSequence.iterator() : CharIterator = object: jet.CharItera public override fun nextChar(): Char = get(index++) - public override val hasNext: Boolean - get() = index < length + public override fun hasNext(): Boolean = index < length } /** Returns the string if it is not null or the empty string if its null */ diff --git a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt index d9472a20d7e..b30f8a10e27 100644 --- a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt +++ b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt @@ -35,8 +35,7 @@ abstract class FunctionalList(public val size: Int) { return head } - override val hasNext: Boolean - get() = !cur.empty + override fun hasNext(): Boolean = !cur.empty } class object { diff --git a/libraries/stdlib/src/kotlin/io/JIO.kt b/libraries/stdlib/src/kotlin/io/JIO.kt index 1258fa00b82..bf13b0f0454 100644 --- a/libraries/stdlib/src/kotlin/io/JIO.kt +++ b/libraries/stdlib/src/kotlin/io/JIO.kt @@ -172,8 +172,7 @@ public inline fun T.use(block: (T)-> R) : R { /** Returns an [Iterator] of bytes over an input stream */ public fun InputStream.iterator() : ByteIterator = object: ByteIterator() { - override val hasNext : Boolean - get() = available() > 0 + override fun hasNext() : Boolean = available() > 0 public override fun nextByte() : Byte = read().toByte() } @@ -215,7 +214,7 @@ public inline fun Writer.buffered(bufferSize: Int = defaultBufferSize): Buffered public inline fun Reader.forEachLine(block: (String) -> Any): Unit { this.use{ val iter = buffered().lineIterator() - while (iter.hasNext) { + while (iter.hasNext()) { val elem = iter.next() block(elem) } @@ -238,8 +237,7 @@ class LineIterator(val reader: BufferedReader) : Iterator { private var nextValue: String? = null private var done = false - override val hasNext: Boolean - get() { + override fun hasNext(): Boolean { if (nextValue == null && !done) { nextValue = reader.readLine() if (nextValue == null) done = true @@ -248,7 +246,7 @@ class LineIterator(val reader: BufferedReader) : Iterator { } public override fun next(): String { - if (!hasNext) { + if (!hasNext()) { throw NoSuchElementException() } val answer = nextValue diff --git a/libraries/stdlib/test/ArraysTest.kt b/libraries/stdlib/test/ArraysTest.kt index 4de457d13e9..6e1760077a7 100644 --- a/libraries/stdlib/test/ArraysTest.kt +++ b/libraries/stdlib/test/ArraysTest.kt @@ -5,12 +5,12 @@ import org.junit.Test as test fun checkContent(val iter : Iterator, val length : Int, val value : (Int) -> T) { var idx = 0 - while (idx != length && iter.hasNext) { + while (idx != length && iter.hasNext()) { assertEquals(value(idx++), iter.next(), "Invalid element") } assertEquals(length, idx, "Invalid length") - assertFalse(iter.hasNext, "Invalid length (hasNext)") + assertFalse(iter.hasNext(), "Invalid length (hasNext())") } class ArraysTest {