Move JVM-specific annotations out of built-ins

Move 'volatile' and 'synchronized' to package 'kotlin' in stdlib. Also delete
'atomic', since its support was never implemented
This commit is contained in:
Alexander Udalov
2014-02-07 19:47:04 +04:00
parent b2d074c5cc
commit b68e47f705
15 changed files with 31 additions and 52 deletions
-9
View File
@@ -1,7 +1,6 @@
package-fragment jet
public fun </*0*/ T> arrayOfNulls(/*0*/ size: jet.Int): jet.Array<T?>
public fun </*0*/ R> synchronized(/*0*/ lock: jet.Any, /*1*/ block: jet.Function0<R>): R
public fun jet.Any?.equals(/*0*/ other: jet.Any?): jet.Boolean
public fun jet.Any?.identityEquals(/*0*/ other: jet.Any?): jet.Boolean
public fun </*0*/ T> jet.Iterator<T>.iterator(): jet.Iterator<T>
@@ -1687,10 +1686,6 @@ public final class Unit {
}
}
public final annotation class atomic : jet.Annotation {
/*primary*/ public constructor atomic()
}
public final annotation class data : jet.Annotation {
/*primary*/ public constructor data()
}
@@ -1720,7 +1715,3 @@ public final annotation class suppress : jet.Annotation {
public final annotation class tailRecursive : jet.Annotation {
/*primary*/ public constructor tailRecursive()
}
public final annotation class volatile : jet.Annotation {
/*primary*/ public constructor volatile()
}
@@ -1,5 +1,5 @@
public open class TestDelegate<T: Any>(private val initializer: () -> T) {
private volatile var value: T? = null
private var value: T? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
if (value == null) {
@@ -1,3 +1,3 @@
volatile val foo: Int = 1
// 0 jet/volatile
// 0 kotlin/volatile
@@ -1,5 +1,5 @@
public open class TestDelegate<T: Any>(private val initializer: () -> T) {
private volatile var value: T? = null
private var value: T? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
if (value == null) {
@@ -1,5 +1,5 @@
public open class TestDelegate<T: Any>(private val initializer: () -> T) {
private volatile var value: T? = null
private var value: T? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T {
if (value == null) {