Old backing field with dollar is now forbidden

This commit is contained in:
Mikhail Glukhikh
2015-10-08 19:51:02 +03:00
parent 5117f744f7
commit 6914d09297
77 changed files with 88 additions and 637 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ class C() {
public var f: Int
init {
$f = 610
f = 610
}
}
-21
View File
@@ -1,21 +0,0 @@
class Identifier<T>(t : T?, myHasDollar : Boolean) {
private val myT : T?
public fun getName() : T? { return myT }
companion object {
open public fun <T> init(name : T?) : Identifier<T> {
val __ = Identifier<T>(name, false)
return __
}
}
init {
$myT = t
}
}
fun box() : String {
var i3 : Identifier<String?>? = Identifier.init<String?>("name")
System.out?.println(i3?.getName())
return "OK"
}
-29
View File
@@ -1,29 +0,0 @@
package demo
public open class Identifier<T>(myName : T?, myHasDollar : Boolean) {
private val myName : T?
private var myHasDollar : Boolean
private var myNullable : Boolean = true
init {
$myName = myName
$myHasDollar = myHasDollar
}
open public fun getName() : T? {
return myName
}
companion object {
open public fun <T> init(name : T?) : Identifier<T> {
val __ = Identifier<T>(name, false)
return __
}
}
}
fun box() : String {
var i3 : Identifier<*>? = Identifier.init<String?>("name")
System.out?.println("Hello, " + i3?.getName())
return "OK"
}
@@ -15,7 +15,7 @@ class Test {
var prop4 : Int = 13
fun incProp4() {
$prop4++
prop4++
}
+1 -1
View File
@@ -38,7 +38,7 @@ open class B(init: String) : A("1") {
}
fun getWithBackingFieldProperty(): String {
return $property
return property
}
}
@@ -20,7 +20,7 @@ class A {
fun test2() : Int {
r2++
++r2
return $r2
return r2
}
var r3: Int = 1;
@@ -32,7 +32,7 @@ class A {
fun test3() : Int {
r3++
++r3
return $r3
return r3
}
var r4: Int = 1;
@@ -49,7 +49,7 @@ class A {
r4++
holder += ":"
++r4
return $r4
return r4
}
}
}
@@ -60,7 +60,7 @@ fun box() : String {
val p2 = A.test2()
var holderValue = A.holder
if (p2 != 3 || holderValue != "getR2getR2getR2") return "fail 2: $p2 ${holderValue}"
if (p2 != 3 || holderValue != "getR2getR2getR2getR2") return "fail 2: $p2 ${holderValue}"
A.holder = ""
val p3 = A.test3()
@@ -68,7 +68,7 @@ fun box() : String {
A.holder = ""
val p4 = A.test4()
if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4") return "fail 4: $p4 ${A.holder}"
if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4getR4") return "fail 4: $p4 ${A.holder}"
return "OK"
}
+5 -5
View File
@@ -18,7 +18,7 @@ object A {
fun test2() : Int {
r2++
++r2
return $r2
return r2
}
var r3: Int = 1;
@@ -30,7 +30,7 @@ object A {
fun test3() : Int {
r3++
++r3
return $r3
return r3
}
var r4: Int = 1;
@@ -47,7 +47,7 @@ object A {
r4++
holder += ":"
++r4
return $r4
return r4
}
}
@@ -57,7 +57,7 @@ fun box() : String {
val p2 = A.test2()
val holderValue = A.holder
if (p2 != 3 || holderValue != "getR2getR2getR2") return "fail 2: $p2 ${holderValue}"
if (p2 != 3 || holderValue != "getR2getR2getR2getR2") return "fail 2: $p2 ${holderValue}"
A.holder = ""
val p3 = A.test3()
@@ -65,7 +65,7 @@ fun box() : String {
A.holder = ""
val p4 = A.test4()
if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4") return "fail 4: $p4 ${A.holder}"
if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4getR4") return "fail 4: $p4 ${A.holder}"
return "OK"
}
-16
View File
@@ -1,16 +0,0 @@
package one_extends_base
open class Base<T>(name : T?) {
var myName : T?
init {
$myName = name
}
}
open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
var mySecond : K?
init {
$mySecond = second
}
}
fun box() = if(One<String, Int>("ola", 0).myName == "ola") "OK" else "fail"