From 53bccec50d89e535c2c9551bb942fad87e95e140 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 15 Sep 2015 16:48:52 +0300 Subject: [PATCH] Capitalize copies of JVM annotations for js stdlib --- js/js.libraries/src/core/concurrent.kt | 4 ++-- js/js.libraries/src/core/sequence.kt | 2 +- libraries/stdlib/src/kotlin/properties/Delegation.kt | 2 +- libraries/stdlib/src/kotlin/text/Strings.kt | 2 +- libraries/stdlib/src/kotlin/util/Lazy.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/js.libraries/src/core/concurrent.kt b/js/js.libraries/src/core/concurrent.kt index 1994973d412..c459a2868c5 100644 --- a/js/js.libraries/src/core/concurrent.kt +++ b/js/js.libraries/src/core/concurrent.kt @@ -26,11 +26,11 @@ import kotlin.InlineOption.ONLY_LOCAL_RETURN @native @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD) @Retention(AnnotationRetention.SOURCE) -public annotation class volatile +public annotation class Volatile @native @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Retention(AnnotationRetention.SOURCE) -public annotation class synchronized +public annotation class Synchronized public inline fun synchronized(lock: Any, crossinline block: () -> R): R = block() diff --git a/js/js.libraries/src/core/sequence.kt b/js/js.libraries/src/core/sequence.kt index 38e5c6fbbd7..3a7ef9e2b90 100644 --- a/js/js.libraries/src/core/sequence.kt +++ b/js/js.libraries/src/core/sequence.kt @@ -17,7 +17,7 @@ package kotlin private class ConstrainedOnceSequence(sequence: Sequence) : Sequence { - @volatile private var sequenceRef: Sequence? = sequence + @Volatile private var sequenceRef: Sequence? = sequence //private val lock = Any() //TODO: Synchronize with the synchonized() method diff --git a/libraries/stdlib/src/kotlin/properties/Delegation.kt b/libraries/stdlib/src/kotlin/properties/Delegation.kt index a95a13b8202..512d7a0fe77 100644 --- a/libraries/stdlib/src/kotlin/properties/Delegation.kt +++ b/libraries/stdlib/src/kotlin/properties/Delegation.kt @@ -189,7 +189,7 @@ private class LazyVal(private val initializer: () -> T) : ReadOnlyProperty(lock: Any?, private val initializer: () -> T) : ReadOnlyProperty { private val lock = lock ?: this - @volatile private var value: Any? = null + @Volatile private var value: Any? = null public override fun get(thisRef: Any?, property: PropertyMetadata): T { val _v1 = value diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 767e1872b62..ec357110047 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -738,7 +738,7 @@ public fun String.indexOf(char: Char, startIndex: Int = 0, ignoreCase: Boolean = * @param ignoreCase `true` to ignore character case when matching a string. By default `false`. * @returns An index of the first occurrence of [string] or -1 if none is found. */ -@kotlin.jvm.jvmOverloads +@kotlin.jvm.JvmOverloads public fun String.indexOf(string: String, startIndex: Int = 0, ignoreCase: Boolean = false): Int { return if (ignoreCase) indexOfAny(listOf(string), startIndex, ignoreCase) diff --git a/libraries/stdlib/src/kotlin/util/Lazy.kt b/libraries/stdlib/src/kotlin/util/Lazy.kt index baef914f0cd..0625334ba2e 100644 --- a/libraries/stdlib/src/kotlin/util/Lazy.kt +++ b/libraries/stdlib/src/kotlin/util/Lazy.kt @@ -53,7 +53,7 @@ private object UNINITIALIZED_VALUE private open class LazyImpl(initializer: () -> T) : Lazy(), Serializable { private var initializer: (() -> T)? = initializer - @volatile private var _value: Any? = UNINITIALIZED_VALUE + @Volatile private var _value: Any? = UNINITIALIZED_VALUE protected open val lock: Any get() = this