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

Change String argument of property delegate method to PropertyMetadata

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-04-25 18:41:35 +04:00
parent 6e2584d0de
commit b9e5227b58
63 changed files with 174 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
class B {
compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String): Int = 1
fun get(t: Any?, p: PropertyMetadata): Int = 1
}
class AImpl {
compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt
+2 -2
View File
@@ -1,10 +1,10 @@
class Delegate {
var inner = Derived()
fun get(t: Any?, p: String): Derived {
fun get(t: Any?, p: PropertyMetadata): Derived {
inner = Derived(inner.a + "-get")
return inner
}
fun set(t: Any?, p: String, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
fun set(t: Any?, p: PropertyMetadata, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
}
class A {
compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String, s: String = ""): Int = 1
fun get(t: Any?, p: PropertyMetadata, s: String = ""): Int = 1
}
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt
+2 -2
View File
@@ -3,8 +3,8 @@ class A {
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
}
compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
fun foo() = Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
val p = Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: A, p: String): Int = 1
fun get(t: A, p: PropertyMetadata): Int = 1
}
val A.prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: F.A, p: String): Int = 1
fun get(t: F.A, p: PropertyMetadata): Int = 1
}
class F {
compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class Delegate<T>(var inner: T) {
fun get(t: Any?, p: String): T = inner
fun set(t: Any?, p: String, i: T) { inner = i }
fun get(t: Any?, p: PropertyMetadata): T = inner
fun set(t: Any?, p: PropertyMetadata, i: T) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class Delegate {
}
fun Delegate.get(t: Any?, p: String): Int = 1
fun Delegate.get(t: Any?, p: PropertyMetadata): Int = 1
class A {
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt
+1 -1
View File
@@ -2,7 +2,7 @@ class Delegate {
}
class A {
fun Delegate.get(t: Any?, p: String): Int = 1
fun Delegate.get(t: Any?, p: PropertyMetadata): Int = 1
val prop: Int by Delegate()
}
compiler/testData/codegen/box/delegatedProperty/inClassVal.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String): Int = 1
fun get(t: Any?, p: PropertyMetadata): Int = 1
}
class A {
compiler/testData/codegen/box/delegatedProperty/inClassVar.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/inTrait.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String): Int = 1
fun get(t: Any?, p: PropertyMetadata): Int = 1
}
trait A {
compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class Delegate<T>(var inner: T) {
fun get(t: Any?, p: String): T = inner
fun set(t: Any?, p: String, i: T) { inner = i }
fun get(t: Any?, p: PropertyMetadata): T = inner
fun set(t: Any?, p: PropertyMetadata, i: T) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/privateVar.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt
+2 -2
View File
@@ -1,9 +1,9 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun get(t: Any?, p: PropertyMetadata): Int = inner
}
fun Delegate.set(t: Any?, p: String, i: Int) { inner = i }
fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
class A {
var prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt
+2 -2
View File
@@ -1,10 +1,10 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun get(t: Any?, p: PropertyMetadata): Int = inner
}
class A {
fun Delegate.set(t: Any?, p: String, i: Int) { inner = i }
fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
var prop: Int by Delegate()
}
compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String): Int = 1
fun get(t: Any?, p: PropertyMetadata): Int = 1
}
val prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
var prop: Int by Delegate()
compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate<T>(val f: (T) -> Int) {
fun get(t: T, p: String): Int = f(t)
fun get(t: T, p: PropertyMetadata): Int = f(t)
}
val p = Delegate<A> { t -> t.foo() }
compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, p: String): Int = 1
fun get(t: Any?, p: PropertyMetadata): Int = 1
}
class A {
compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class Delegate {
var inner = 1
fun get(t: Any?, p: String): Int = inner
fun set(t: Any?, p: String, i: Int) { inner = i }
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
}
class A {
compiler/testData/codegen/box/delegatedProperty/vararg.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Delegate {
fun get(t: Any?, vararg p: String): Int = 1
fun get(t: Any?, vararg p: PropertyMetadata): Int = 1
}
val prop: Int by Delegate()