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

compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt

@@ -1,23 +1,23 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
+    operator fun rangeTo(c: C) = Range(this, c)
 }
 
 fun doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt

@@ -1,24 +1,24 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun rangeTo(c: C) = Range(this, c)
 }
-fun C.component1() = i + 1
-fun C.component2() = i + 2
+operator fun C.component1() = i + 1
+operator fun C.component2() = i + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt

@@ -1,26 +1,26 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun rangeTo(c: C) = Range(this, c)
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+  operator fun C.component1() = i + 1
+  operator fun C.component2() = i + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,26 +1,26 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun rangeTo(c: C) = Range(this, c)
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+  operator fun C.component1() = i + 1
+  operator fun C.component2() = i + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt

@@ -1,23 +1,23 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
+    operator fun rangeTo(c: C) = Range(this, c)
 }
 
 fun doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt

@@ -1,23 +1,23 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
+    infix fun rangeTo(c: C) = Range(this, c)
 }
 
 fun doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt

@@ -1,24 +1,24 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    infix fun rangeTo(c: C) = Range(this, c)
 }
-fun C.component1() = i + 1
-fun C.component2() = i + 2
+operator fun C.component1() = i + 1
+operator fun C.component2() = i + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt

@@ -1,30 +1,30 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun rangeTo(c: C) = Range(this, c)
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+  operator fun C.component1() = i + 1
+  operator fun C.component2() = i + 2
 
   fun doTest(): String {
       var s = ""
-      for ((a, b) in C(0) rangeTo C(2)) {
+      for ((a, b) in C(0).rangeTo(C(2))) {
           s += "$a:$b;"
       }
       return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,26 +1,26 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun rangeTo(c: C) = Range(this, c)
+    infix fun rangeTo(c: C) = Range(this, c)
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+    operator fun C.component1() = i + 1
+    operator fun C.component2() = i + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt

@@ -1,23 +1,23 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
-    fun rangeTo(c: C) = Range(this, c)
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
+    infix fun rangeTo(c: C) = Range(this, c)
 }
 
 fun doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt

@@ -1,9 +1,9 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""
-    for ((a, b) in 0 rangeTo 2) {
+    for ((a, b) in 0.rangeTo(2)) {
       s += "$a:$b;"
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,9 +1,9 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""
-    for ((a, b) in 0 rangeTo 2) {
+    for ((a, b) in 0.rangeTo(2)) {
       s += {"$a:$b;"}()
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt

@@ -1,10 +1,10 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 
   fun doTest(): String {
       var s = ""
-      for ((a, b) in 0 rangeTo 2) {
+      for ((a, b) in 0.rangeTo(2)) {
         s += "$a:$b;"
       }
       return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,11 +1,11 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 }
 
 fun M.doTest(): String {
     var s = ""
-    for ((a, b) in 0 rangeTo 2) {
+    for ((a, b) in 0.rangeTo(2)) {
       s += "$a:$b;"
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt

@@ -1,9 +1,9 @@
-fun Long.component1() = this + 1
-fun Long.component2() = this + 2
+operator fun Long.component1() = this + 1
+operator fun Long.component2() = this + 2
 
 fun doTest(): String {
     var s = ""
-    for ((a, b) in 0.toLong() rangeTo 2.toLong()) {
+    for ((a, b) in 0.toLong().rangeTo(2.toLong())) {
       s += "$a:$b;"
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,9 +1,9 @@
-fun Long.component1() = this + 1
-fun Long.component2() = this + 2
+operator fun Long.component1() = this + 1
+operator fun Long.component2() = this + 2
 
 fun doTest(): String {
     var s = ""
-    for ((a, b) in 0.toLong() rangeTo 2.toLong()) {
+    for ((a, b) in 0.toLong().rangeTo(2.toLong())) {
       s += {"$a:$b;"}()
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt

@@ -1,10 +1,10 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 
   fun doTest(): String {
       var s = ""
-      for ((a, b) in 0.toLong() rangeTo 2.toLong()) {
+      for ((a, b) in 0.toLong().rangeTo(2.toLong())) {
         s += "$a:$b;"
       }
       return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,11 +1,11 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 }
 
 fun M.doTest(): String {
     var s = ""
-    for ((a, b) in 0.toLong() rangeTo 2.toLong()) {
+    for ((a, b) in 0.toLong().rangeTo(2.toLong())) {
       s += "$a:$b;"
     }
     return s

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt

@@ -1,22 +1,22 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
     fun rangeTo(c: C) = Range(this, c)
 }
 

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt

@@ -1,24 +1,24 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
     fun rangeTo(c: C) = Range(this, c)
 }
-fun C.component1() = i + 1
-fun C.component2() = i + 2
+operator fun C.component1() = i + 1
+operator fun C.component2() = i + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt

@@ -1,17 +1,17 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
@@ -19,8 +19,8 @@ class C(val i : Int) {
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+  operator fun C.component1() = i + 1
+  operator fun C.component2() = i + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,17 +1,17 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
@@ -19,8 +19,8 @@ class C(val i : Int) {
 }
 
 class M {
-  fun C.component1() = i + 1
-  fun C.component2() = i + 2
+  operator fun C.component1() = i + 1
+  operator fun C.component2() = i + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt

@@ -1,22 +1,22 @@
 class Range(val from : C, val to: C) {
-    fun iterator() = It(from, to)
+    operator fun iterator() = It(from, to)
 }
 
 class It(val from: C, val to: C) {
     var c = from.i
 
-    fun next(): C {
+    operator fun next(): C {
         val next = C(c)
         c++
         return next
     }
 
-    fun hasNext(): Boolean = c <= to.i
+    operator fun hasNext(): Boolean = c <= to.i
 }
 
 class C(val i : Int) {
-    fun component1() = i + 1
-    fun component2() = i + 2
+    operator fun component1() = i + 1
+    operator fun component2() = i + 2
     fun rangeTo(c: C) = Range(this, c)
 }
 

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt

@@ -1,5 +1,5 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,5 +1,5 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt

@@ -1,13 +1,13 @@
 fun f(l : Long) {
-  l rangeTo l
+  l.rangeTo(l)
 }
 fun box(): String {
   return "OK"
 }
 
 
-//fun Long.component1() = this + 1
-//fun Long.component2() = this + 2
+//operator fun Long.component1() = this + 1
+//operator fun Long.component2() = this + 2
 //
 //fun doTest(): String {
 //    var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,5 +1,5 @@
-fun Long.component1() = this + 1
-fun Long.component2() = this + 2
+operator fun Long.component1() = this + 1
+operator fun Long.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt

@@ -1,5 +1,5 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,5 +1,5 @@
-fun Int.component1() = this + 1
-fun Int.component2() = this + 2
+operator fun Int.component1() = this + 1
+operator fun Int.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Int.component1() = this + 1
-  fun Int.component2() = this + 2
+  operator fun Int.component1() = this + 1
+  operator fun Int.component2() = this + 2
 }
 
 fun M.doTest(): String {

compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt

@@ -1,5 +1,5 @@
-fun Long.component1() = this + 1
-fun Long.component2() = this + 2
+operator fun Long.component1() = this + 1
+operator fun Long.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt

@@ -1,5 +1,5 @@
-fun Long.component1() = this + 1
-fun Long.component2() = this + 2
+operator fun Long.component1() = this + 1
+operator fun Long.component2() = this + 2
 
 fun doTest(): String {
     var s = ""

compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 
   fun doTest(): String {
       var s = ""

compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt

@@ -1,6 +1,6 @@
 class M {
-  fun Long.component1() = this + 1
-  fun Long.component2() = this + 2
+  operator fun Long.component1() = this + 1
+  operator fun Long.component2() = this + 2
 }
 
 fun M.doTest(): String {