From 7c74083f096cf5e2518410039f638cfe13542b87 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 24 Jan 2018 09:07:15 +0300 Subject: [PATCH] runtime-jvm: add actual modifiers where required --- .../kotlin/NoWhenBranchMatchedException.kt | 12 +++++---- .../stdlib/jvm/runtime/kotlin/TypeAliases.kt | 26 +++++++++---------- .../UninitializedPropertyAccessException.kt | 10 +++---- .../jvm/annotations/JvmFlagAnnotations.kt | 2 +- .../jvm/annotations/JvmPlatformAnnotations.kt | 6 ++--- .../jvm/runtime/kotlin/text/TypeAliases.kt | 6 +++-- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt b/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt index 3f0455f1150..2ffa9abe93b 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt @@ -14,14 +14,16 @@ * limitations under the License. */ +@file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-runtime + package kotlin -public open class NoWhenBranchMatchedException : RuntimeException { - constructor() +public actual open class NoWhenBranchMatchedException : RuntimeException { + actual constructor() - constructor(message: String?) : super(message) + actual constructor(message: String?) : super(message) - constructor(message: String?, cause: Throwable?) : super(message, cause) + actual constructor(message: String?, cause: Throwable?) : super(message, cause) - constructor(cause: Throwable?) : super(cause) + actual constructor(cause: Throwable?) : super(cause) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt index db5d612db02..ba066c3db25 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt @@ -17,20 +17,20 @@ package kotlin -@SinceKotlin("1.1") public typealias Error = java.lang.Error -@SinceKotlin("1.1") public typealias Exception = java.lang.Exception -@SinceKotlin("1.1") public typealias RuntimeException = java.lang.RuntimeException -@SinceKotlin("1.1") public typealias IllegalArgumentException = java.lang.IllegalArgumentException -@SinceKotlin("1.1") public typealias IllegalStateException = java.lang.IllegalStateException -@SinceKotlin("1.1") public typealias IndexOutOfBoundsException = java.lang.IndexOutOfBoundsException -@SinceKotlin("1.1") public typealias UnsupportedOperationException = java.lang.UnsupportedOperationException +@SinceKotlin("1.1") public actual typealias Error = java.lang.Error +@SinceKotlin("1.1") public actual typealias Exception = java.lang.Exception +@SinceKotlin("1.1") public actual typealias RuntimeException = java.lang.RuntimeException +@SinceKotlin("1.1") public actual typealias IllegalArgumentException = java.lang.IllegalArgumentException +@SinceKotlin("1.1") public actual typealias IllegalStateException = java.lang.IllegalStateException +@SinceKotlin("1.1") public actual typealias IndexOutOfBoundsException = java.lang.IndexOutOfBoundsException +@SinceKotlin("1.1") public actual typealias UnsupportedOperationException = java.lang.UnsupportedOperationException -@SinceKotlin("1.1") public typealias NumberFormatException = java.lang.NumberFormatException -@SinceKotlin("1.1") public typealias NullPointerException = java.lang.NullPointerException -@SinceKotlin("1.1") public typealias ClassCastException = java.lang.ClassCastException -@SinceKotlin("1.1") public typealias AssertionError = java.lang.AssertionError +@SinceKotlin("1.1") public actual typealias NumberFormatException = java.lang.NumberFormatException +@SinceKotlin("1.1") public actual typealias NullPointerException = java.lang.NullPointerException +@SinceKotlin("1.1") public actual typealias ClassCastException = java.lang.ClassCastException +@SinceKotlin("1.1") public actual typealias AssertionError = java.lang.AssertionError -@SinceKotlin("1.1") public typealias NoSuchElementException = java.util.NoSuchElementException +@SinceKotlin("1.1") public actual typealias NoSuchElementException = java.util.NoSuchElementException -@SinceKotlin("1.1") public typealias Comparator = java.util.Comparator +@SinceKotlin("1.1") public actual typealias Comparator = java.util.Comparator diff --git a/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt b/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt index e48c0c6287e..754abf479e8 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt @@ -16,12 +16,12 @@ package kotlin -public class UninitializedPropertyAccessException : RuntimeException { - constructor() +public actual class UninitializedPropertyAccessException : RuntimeException { + actual constructor() - constructor(message: String?) : super(message) + actual constructor(message: String?) : super(message) - constructor(message: String?, cause: Throwable?) : super(message, cause) + actual constructor(message: String?, cause: Throwable?) : super(message, cause) - constructor(cause: Throwable?) : super(cause) + actual constructor(cause: Throwable?) : super(cause) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmFlagAnnotations.kt b/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmFlagAnnotations.kt index b269039b78f..27f80538586 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmFlagAnnotations.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmFlagAnnotations.kt @@ -25,7 +25,7 @@ import kotlin.annotation.AnnotationTarget.* @Target(FIELD) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented -public annotation class Volatile +public actual annotation class Volatile /** * Marks the JVM backing field of the annotated property as `transient`, meaning that it is not diff --git a/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmPlatformAnnotations.kt b/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmPlatformAnnotations.kt index 922682d7c14..3ad95051b91 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmPlatformAnnotations.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/jvm/annotations/JvmPlatformAnnotations.kt @@ -51,7 +51,7 @@ public annotation class JvmStatic @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.FILE) @Retention(AnnotationRetention.BINARY) @MustBeDocumented -public annotation class JvmName(val name: String) +public actual annotation class JvmName(actual val name: String) /** * Instructs the Kotlin compiler to generate a multifile class with top-level functions and properties declared in this file as one of its parts. @@ -60,7 +60,7 @@ public annotation class JvmName(val name: String) @Target(AnnotationTarget.FILE) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented -public annotation class JvmMultifileClass +public actual annotation class JvmMultifileClass /** * Changes the fully qualified name of the JVM package of the .class file generated from this file. @@ -110,7 +110,7 @@ public annotation class Throws(vararg val exceptionClasses: KClass