azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ import kotlin.reflect.KProperty
// KT-5612
class Delegate {
public fun getValue(thisRef: Any?, prop: KProperty<*>): String {
operator fun getValue(thisRef: Any?, prop: KProperty<*>): String {
return "OK"
}
}
compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
class B {
compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>): Int = 1
}
class AImpl {
compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = Derived()
fun getValue(t: Any?, p: KProperty<*>): Derived {
operator fun getValue(t: Any?, p: KProperty<*>): Derived {
inner = Derived(inner.a + "-get")
return inner
}
fun setValue(t: Any?, p: KProperty<*>, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
operator fun setValue(t: Any?, p: KProperty<*>, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
}
class A {
compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>, s: String = ""): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>, s: String = ""): Int = 1
}
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ class A {
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
}
compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
fun foo() = Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
val p = Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: A, p: KProperty<*>): Int = 1
operator fun getValue(t: A, p: KProperty<*>): Int = 1
}
val A.prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: F.A, p: KProperty<*>): Int = 1
operator fun getValue(t: F.A, p: KProperty<*>): Int = 1
}
class F {
compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
import kotlin.reflect.KProperty
class Delegate<T>(var inner: T) {
fun getValue(t: Any?, p: KProperty<*>): T = inner
fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): T = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ import kotlin.reflect.KProperty
class Delegate {
}
fun Delegate.getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun Delegate.getValue(t: Any?, p: KProperty<*>): Int = 1
class A {
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ class Delegate {
}
class A {
fun Delegate.getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun Delegate.getValue(t: Any?, p: KProperty<*>): Int = 1
val prop: Int by Delegate()
}
compiler/testData/codegen/box/delegatedProperty/inClassVal.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>): Int = 1
}
class A {
compiler/testData/codegen/box/delegatedProperty/inClassVar.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/inTrait.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>): Int = 1
}
interface A {
compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
import kotlin.reflect.KProperty
class Delegate<T>(var inner: T) {
fun getValue(t: Any?, p: KProperty<*>): T = inner
fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): T = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/kt4138.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
import kotlin.reflect.KProperty
class Delegate<T>(var inner: T) {
fun getValue(t: Any?, p: KProperty<*>): T = inner
fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): T = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: T) { inner = i }
}
compiler/testData/codegen/box/delegatedProperty/privateVar.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt
Vendored
+6 -6
View File
@@ -18,18 +18,18 @@ val metadatas = IdentityHashMap<KProperty<*>, Unit>()
fun record(p: KProperty<*>) = metadatas.put(p, Unit)
object IntHandler {
fun getValue(t: Any?, p: KProperty<*>): Int { record(p); return 42 }
fun setValue(t: Any?, p: KProperty<*>, value: Int) { record(p) }
operator fun getValue(t: Any?, p: KProperty<*>): Int { record(p); return 42 }
operator fun setValue(t: Any?, p: KProperty<*>, value: Int) { record(p) }
}
object AnyHandler {
fun getValue(t: Any?, p: KProperty<*>): Any? { record(p); return 3.14 }
fun setValue(t: Any?, p: KProperty<*>, value: Any?) { record(p) }
operator fun getValue(t: Any?, p: KProperty<*>): Any? { record(p); return 3.14 }
operator fun setValue(t: Any?, p: KProperty<*>, value: Any?) { record(p) }
}
object StringHandler {
fun getValue(t: Any?, p: KProperty<*>): String { record(p); return p.name }
fun setValue(t: Any?, p: KProperty<*>, value: String) { record(p) }
operator fun getValue(t: Any?, p: KProperty<*>): String { record(p); return p.name }
operator fun setValue(t: Any?, p: KProperty<*>, value: String) { record(p) }
}
fun box(): String {
compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
}
fun Delegate.setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun Delegate.setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
class A {
var prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
}
class A {
fun Delegate.setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun Delegate.setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
var prop: Int by Delegate()
}
compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>): Int = 1
}
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
var prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate<T>(val f: (T) -> Int) {
fun getValue(t: T, p: KProperty<*>): Int = f(t)
operator fun getValue(t: T, p: KProperty<*>): Int = f(t)
}
val p = Delegate<A> { t -> t.foo() }
compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): String {
operator fun getValue(t: Any?, p: KProperty<*>): String {
p.parameters
p.returnType
p.annotations
compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, p: KProperty<*>): Int = 1
}
class A {
compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ import kotlin.reflect.KProperty
class Delegate {
var inner = 1
fun getValue(t: Any?, p: KProperty<*>): Int = inner
fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
operator fun getValue(t: Any?, p: KProperty<*>): Int = inner
operator fun setValue(t: Any?, p: KProperty<*>, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/vararg.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import kotlin.reflect.KProperty
class Delegate {
fun getValue(t: Any?, vararg p: KProperty<*>): Int = 1
operator fun getValue(t: Any?, vararg p: KProperty<*>): Int = 1
}
val prop: Int by Delegate()