Support increment and '*=' operations on inline properties

This commit is contained in:
Mikhael Bogdanov
2017-01-05 14:24:40 +01:00
parent 043f3199c7
commit 5071baf970
17 changed files with 403 additions and 37 deletions
@@ -0,0 +1,28 @@
// FILE: 1.kt
package test
var result = 1
inline var z: Int
get() = result
set(value) {
result = value
}
// FILE: 2.kt
import test.*
fun box(): String {
z += 1
if (z != 2) return "fail 1: $z"
var p = z++
if (result != 3) return "fail 2: $result"
if (p != 2) return "fail 3: $p"
p = ++z
if (result != 4) return "fail 4: $result"
if (p != 4) return "fail 5: $p"
return "OK"
}
@@ -0,0 +1,33 @@
// FILE: 1.kt
// IGNORE_BACKEND: JS
package test
class A {
var result = 1
inline var z: Int
get() = result
set(value) {
result = value
}
}
// FILE: 2.kt
import test.*
fun box(): String {
val a = A()
a.z += 1
if (a.z != 2) return "fail 1: $a.z"
var p = a.z++
if (a.z != 3) return "fail 2: $a.z"
if (p != 2) return "fail 3: $p"
p = ++a.z
if (a.z != 4) return "fail 4: $a.z"
if (p != 4) return "fail 5: $p"
return "OK"
}
@@ -0,0 +1,43 @@
// FILE: 1.kt
// IGNORE_BACKEND: JS
package test
class Test(var result: Int)
class A {
var result = Test(1)
inline var z: Test
get() = result
set(value) {
result = value
}
}
operator fun Test.plus(p: Int): Test {
return Test(result + p)
}
operator fun Test.inc(): Test {
return Test(result + 1)
}
// FILE: 2.kt
import test.*
fun box(): String {
val a = A()
a.z = Test(1)
a.z += 1
if (a.result.result != 2) return "fail 1: ${a.result.result}"
var p = a.z++
if (a.result.result != 3) return "fail 2: ${a.result.result}"
if (p.result != 2) return "fail 3: ${p.result}"
p = ++a.z
if (a.result.result != 4) return "fail 4: ${a.result.result}"
if (p.result != 4) return "fail 5: ${p.result}"
return "OK"
}
@@ -0,0 +1,28 @@
// FILE: 1.kt
package test
var result = 1
inline var Int.z: Int
get() = result
set(value) {
result = value + this
}
// FILE: 2.kt
import test.*
fun box(): String {
1.z += 0
if (result != 2) return "fail 1: $result"
var p = 1.z++
if (result != 4) return "fail 2: $result"
if (p != 2) return "fail 3: $p"
p = ++1.z
if (result != 6) return "fail 4: $result"
if (p != 6) return "fail 5: $p"
return "OK"
}
@@ -0,0 +1,34 @@
// FILE: 1.kt
package test
class A {
var result = 1
inline var Int.z: Int
get() = result
set(value) {
result = value + this
}
}
// FILE: 2.kt
import test.*
fun box(): String {
with(A()) {
1.z += 0
if (1.z != 2) return "fail 1: $result"
var p = 1.z++
if (1.z != 4) return "fail 2: $result"
if (p != 2) return "fail 3: $p"
p = ++1.z
if (1.z != 6) return "fail 4: $result"
if (p != 6) return "fail 5: $p"
}
return "OK"
}
@@ -0,0 +1,39 @@
// FILE: 1.kt
package test
class Test(var result: Int)
var result = Test(1)
inline var z: Test
get() = result
set(value) {
result = value
}
operator fun Test.plus(p: Int): Test {
return Test(result + p)
}
operator fun Test.inc(): Test {
return Test(result + 1)
}
// FILE: 2.kt
import test.*
fun box(): String {
z = Test(1)
z += 1
if (result.result != 2) return "fail 1: ${result.result}"
var p = z++
if (result.result != 3) return "fail 2: ${result.result}"
if (p.result != 2) return "fail 3: ${p.result}"
p = ++z
if (result.result != 4) return "fail 4: ${result.result}"
if (p.result != 4) return "fail 5: ${p.result}"
return "OK"
}