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

compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt

@@ -2,34 +2,34 @@ class A() {
   var x = 0
 }
 
-fun A.plusAssign(y: Int) { x += y }
-fun A.minusAssign(y: Int) { x -= y }
-fun A.timesAssign(y: Int) { x *= y }
-fun A.divAssign(y: Int) { x /= y }
-fun A.modAssign(y: Int) { x %= y }
+operator fun A.plusAssign(y: Int) { x += y }
+operator fun A.minusAssign(y: Int) { x -= y }
+operator fun A.timesAssign(y: Int) { x *= y }
+operator fun A.divAssign(y: Int) { x /= y }
+operator fun A.modAssign(y: Int) { x %= y }
 
 fun box(): String {
   val original = A()
   val a = original
 
   a += 1
-  if (!(a identityEquals original)) return "Fail 1: $a !== $original"
+  if (!(a.identityEquals(original))) return "Fail 1: $a !== $original"
   if (a.x != 1) return "Fail 2: ${a.x} != 1"
 
   a -= 2
-  if (!(a identityEquals original)) return "Fail 3: $a !== $original"
+  if (!(a.identityEquals(original))) return "Fail 3: $a !== $original"
   if (a.x != -1) return "Fail 4: ${a.x} != -1"
 
   a *= -10
-  if (!(a identityEquals original)) return "Fail 5: $a !== $original"
+  if (!(a.identityEquals(original))) return "Fail 5: $a !== $original"
   if (a.x != 10) return "Fail 6: ${a.x} != 10"
 
   a /= 3
-  if (!(a identityEquals original)) return "Fail 7: $a !== $original"
+  if (!(a.identityEquals(original))) return "Fail 7: $a !== $original"
   if (a.x != 3) return "Fail 8: ${a.x} != 3"
 
   a %= 2
-  if (!(a identityEquals original)) return "Fail 9: $a !== $original"
+  if (!(a.identityEquals(original))) return "Fail 9: $a !== $original"
   if (a.x != 1) return "Fail 10: ${a.x} != 1"
 
   return "OK"

compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt

@@ -4,7 +4,6 @@ fun checkLess(x: Boolean, y: Boolean) = when {
     !(x <= y) -> "Fail !($x <= $y)"
     x > y     -> "Fail $x > $y"
     x.compareTo(y) >= 0 -> "Fail $x.compareTo($y) >= 0"
-    x compareTo y >= 0 -> "Fail $x compareTo $y  >= 0"
     else -> "OK"
 }
 

compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt

@@ -7,7 +7,7 @@ fun checkLess(x: Array<Int>, y: Array<Int>) = when {
     else -> "OK"
 }
 
-fun Array<Int>.compareTo(other: Array<Int>) = size - other.size
+operator fun Array<Int>.compareTo(other: Array<Int>) = size - other.size
 
 fun box(): String {
     val a = arrayOfNulls<Int>(0) as Array<Int>

compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt

@@ -1,6 +1,6 @@
 class A(val x: Int)
 
-fun A.compareTo(other: A) = x.compareTo(other.x)
+operator fun A.compareTo(other: A) = x.compareTo(other.x)
 
 fun checkLess(x: A, y: A) = when {
     x >= y    -> "Fail $x >= $y"

compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt

@@ -1,11 +1,11 @@
 class X(var value: Long)
 
-fun X.inc(): X {
+operator fun X.inc(): X {
     this.value++
     return this
 }
 
-fun X.dec(): X {
+operator fun X.dec(): X {
     this.value--
     return this
 }

compiler/testData/codegen/box/operatorConventions/kt4987.kt

@@ -1,5 +1,5 @@
 fun box(): String {
-    fun Int?.inc() = (this ?: 0) + 1
+    operator fun Int?.inc() = (this ?: 0) + 1
     var counter: Int? = null
     counter++
     return if (counter == 1) "OK" else "fail: $counter"