runtime-jvm: add actual modifiers where required

This commit is contained in:
Ilya Gorbunov
2018-01-24 09:07:15 +03:00
parent 22255a5cc4
commit 7c74083f09
6 changed files with 33 additions and 29 deletions
@@ -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)
}
@@ -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<T> = java.util.Comparator<T>
@SinceKotlin("1.1") public actual typealias Comparator<T> = java.util.Comparator<T>
@@ -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)
}
@@ -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
@@ -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<out Throwable
@Target(AnnotationTarget.FIELD)
@Retention(AnnotationRetention.BINARY)
@MustBeDocumented
public annotation class JvmField
public actual annotation class JvmField
/**
* Instructs compiler to generate or omit wildcards for type arguments corresponding to parameters with
@@ -16,5 +16,7 @@
package kotlin.text
@SinceKotlin("1.1") public typealias Appendable = java.lang.Appendable
@SinceKotlin("1.1") public typealias StringBuilder = java.lang.StringBuilder
@SinceKotlin("1.1") public actual typealias Appendable = java.lang.Appendable
@Suppress("ACTUAL_WITHOUT_EXPECT") // TODO: some supertypes are missing
@SinceKotlin("1.1") public actual typealias StringBuilder = java.lang.StringBuilder