Fix tests: "infix modifier required" and "operator modifier required" errors

This commit is contained in:
Yan Zhulanow
2015-11-26 15:56:56 +03:00
parent a3ff3ffc45
commit 9d1af5a17e
635 changed files with 1283 additions and 1617 deletions
@@ -1,7 +1,7 @@
var index = 0
interface IterableIterator : Iterator<Int> {
fun iterator(): Iterator<Int> = this
operator fun iterator(): Iterator<Int> = this
}
val iterator = object : IterableIterator {
@@ -6,9 +6,9 @@ class C {
class X {
var hasNext = true
fun It.hasNext() = if (hasNext) {hasNext = false; true} else false
fun It.next() = 5
fun C.iterator(): It = It()
operator fun It.hasNext() = if (hasNext) {hasNext = false; true} else false
operator fun It.next() = 5
operator fun C.iterator(): It = It()
fun test() {
for (i in C()) {
@@ -1,14 +1,14 @@
class It {
fun next() = 5
operator fun next() = 5
}
class C {
fun iterator(): It = It()
operator fun iterator(): It = It()
}
class X {
var hasNext = true
fun It.hasNext() = if (hasNext) {hasNext = false; true} else false
operator fun It.hasNext() = if (hasNext) {hasNext = false; true} else false
fun test() {
for (i in C()) {
@@ -1,14 +1,14 @@
class It {
var hasNext = true
fun hasNext() = if (hasNext) {hasNext = false; true} else false
operator fun hasNext() = if (hasNext) {hasNext = false; true} else false
}
class C {
fun iterator(): It = It()
operator fun iterator(): It = It()
}
class X {
fun It.next() = 5
operator fun It.next() = 5
fun test() {
for (i in C()) {
@@ -92,23 +92,23 @@ class MyCollection2(): Iterable<Int> {
}
class MyCollection3() {
fun iterator() = MyIterator()
operator fun iterator() = MyIterator()
class MyIterator() {
var k : Int = 5
fun next() : Int? = k--
fun hasNext() : Boolean = k > 0
operator fun next() : Int? = k--
operator fun hasNext() : Boolean = k > 0
}
}
class MyCollection4() {
fun iterator() = MyIterator()
operator fun iterator() = MyIterator()
class MyIterator() {
var k : Int = 5
fun next() : Int = k--
fun hasNext() = k > 0
operator fun next() : Int = k--
operator fun hasNext() = k > 0
}
}
@@ -1,4 +1,4 @@
fun Int.contains(i : Int) = true
operator fun Int.contains(i : Int) = true
fun box(): String {
when (1) {
+1 -1
View File
@@ -7,7 +7,7 @@ class MyRange1() : Range<Int> {
}
class MyRange2() {
fun contains(item: Int) = true
operator fun contains(item: Int) = true
}
fun box(): String {
+3 -3
View File
@@ -1,7 +1,7 @@
import java.util.*
class A() {
fun <T> ArrayList<T>.add3(el: T) = add(el)
infix fun <T> ArrayList<T>.add3(el: T) = add(el)
fun test(list: ArrayList<Int>) {
for (i in 1..10) {
@@ -10,12 +10,12 @@ class A() {
}
}
fun <T> ArrayList<T>.add2(el: T) = add(el)
infix fun <T> ArrayList<T>.add2(el: T) = add(el)
fun box() : String{
var list = ArrayList<Int>()
for (i in 1..10) {
list add i
list.add(i)
list add2 i
}
A().test(list)
+1 -1
View File
@@ -1,7 +1,7 @@
class A() {
fun action() = "OK"
fun infix(a: String) = "O" + a
infix fun infix(a: String) = "O" + a
val property = "OK"