diff --git a/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt b/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt index 06365bbfd78..46c611c6a56 100644 --- a/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt +++ b/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt @@ -14,13 +14,16 @@ internal object DoubleCompanionObject { const val MAX_VALUE: Double = 1.7976931348623157E308 @JsName("POSITIVE_INFINITY") - const val POSITIVE_INFINITY: Double = 1.0/0.0 + @Suppress("DIVISION_BY_ZERO") + const val POSITIVE_INFINITY: Double = 1.0 / 0.0 @JsName("NEGATIVE_INFINITY") - const val NEGATIVE_INFINITY: Double = -1.0/0.0 + @Suppress("DIVISION_BY_ZERO") + const val NEGATIVE_INFINITY: Double = -1.0 / 0.0 @JsName("NaN") - const val NaN: Double = -(0.0/0.0) + @Suppress("DIVISION_BY_ZERO") + const val NaN: Double = -(0.0 / 0.0) @JsName("SIZE_BYTES") const val SIZE_BYTES = 8 @@ -38,13 +41,16 @@ internal object FloatCompanionObject { const val MAX_VALUE: Float = 3.4028235E38F @JsName("POSITIVE_INFINITY") - const val POSITIVE_INFINITY: Float = 1.0F/0.0F + @Suppress("DIVISION_BY_ZERO") + const val POSITIVE_INFINITY: Float = 1.0F / 0.0F @JsName("NEGATIVE_INFINITY") - const val NEGATIVE_INFINITY: Float = -1.0F/0.0F + @Suppress("DIVISION_BY_ZERO") + const val NEGATIVE_INFINITY: Float = -1.0F / 0.0F @JsName("NaN") - const val NaN: Float = -(0.0F/0.0F) + @Suppress("DIVISION_BY_ZERO") + const val NaN: Float = -(0.0F / 0.0F) @JsName("SIZE_BYTES") const val SIZE_BYTES = 4 diff --git a/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PrimitiveCompanionObjects.kt b/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PrimitiveCompanionObjects.kt index 7c48793276c..16bef06b896 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PrimitiveCompanionObjects.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PrimitiveCompanionObjects.kt @@ -6,12 +6,19 @@ package kotlin.jvm.internal internal object DoubleCompanionObject { + @SinceKotlin("1.4") const val MIN_VALUE: Double = java.lang.Double.MIN_VALUE + @SinceKotlin("1.4") const val MAX_VALUE: Double = java.lang.Double.MAX_VALUE + @SinceKotlin("1.4") const val POSITIVE_INFINITY: Double = java.lang.Double.POSITIVE_INFINITY + @SinceKotlin("1.4") const val NEGATIVE_INFINITY: Double = java.lang.Double.NEGATIVE_INFINITY + @SinceKotlin("1.4") const val NaN: Double = java.lang.Double.NaN + @SinceKotlin("1.4") const val SIZE_BYTES: Int = 8 + @SinceKotlin("1.4") const val SIZE_BITS: Int = SIZE_BYTES * 8 // for binary compatibility with pre 1.4 @@ -23,12 +30,19 @@ internal object DoubleCompanionObject { } internal object FloatCompanionObject { + @SinceKotlin("1.4") const val MIN_VALUE: Float = java.lang.Float.MIN_VALUE + @SinceKotlin("1.4") const val MAX_VALUE: Float = java.lang.Float.MAX_VALUE + @SinceKotlin("1.4") const val POSITIVE_INFINITY: Float = java.lang.Float.POSITIVE_INFINITY + @SinceKotlin("1.4") const val NEGATIVE_INFINITY: Float = java.lang.Float.NEGATIVE_INFINITY + @SinceKotlin("1.4") const val NaN: Float = java.lang.Float.NaN + @SinceKotlin("1.4") const val SIZE_BYTES: Int = 4 + @SinceKotlin("1.4") const val SIZE_BITS: Int = SIZE_BYTES * 8 // for binary compatibility with pre 1.4 @@ -42,34 +56,44 @@ internal object FloatCompanionObject { internal object IntCompanionObject { const val MIN_VALUE: Int = java.lang.Integer.MIN_VALUE const val MAX_VALUE: Int = java.lang.Integer.MAX_VALUE + @SinceKotlin("1.3") const val SIZE_BYTES: Int = 4 + @SinceKotlin("1.3") const val SIZE_BITS: Int = SIZE_BYTES * 8 } internal object LongCompanionObject { const val MIN_VALUE: Long = java.lang.Long.MIN_VALUE const val MAX_VALUE: Long = java.lang.Long.MAX_VALUE + @SinceKotlin("1.3") const val SIZE_BYTES: Int = 8 + @SinceKotlin("1.3") const val SIZE_BITS: Int = SIZE_BYTES * 8 } internal object ShortCompanionObject { const val MIN_VALUE: Short = java.lang.Short.MIN_VALUE const val MAX_VALUE: Short = java.lang.Short.MAX_VALUE + @SinceKotlin("1.3") const val SIZE_BYTES: Int = 2 + @SinceKotlin("1.3") const val SIZE_BITS: Int = SIZE_BYTES * 8 } internal object ByteCompanionObject { const val MIN_VALUE: Byte = java.lang.Byte.MIN_VALUE const val MAX_VALUE: Byte = java.lang.Byte.MAX_VALUE + @SinceKotlin("1.3") const val SIZE_BYTES: Int = 1 + @SinceKotlin("1.3") const val SIZE_BITS: Int = SIZE_BYTES * 8 } internal object CharCompanionObject { + @SinceKotlin("1.3") const val MIN_VALUE: Char = '\u0000' + @SinceKotlin("1.3") const val MAX_VALUE: Char = '\uFFFF' const val MIN_HIGH_SURROGATE: Char = '\uD800' const val MAX_HIGH_SURROGATE: Char = '\uDBFF' @@ -77,10 +101,13 @@ internal object CharCompanionObject { const val MAX_LOW_SURROGATE: Char = '\uDFFF' const val MIN_SURROGATE: Char = MIN_HIGH_SURROGATE const val MAX_SURROGATE: Char = MAX_LOW_SURROGATE + @SinceKotlin("1.3") const val SIZE_BYTES: Int = 2 + @SinceKotlin("1.3") const val SIZE_BITS: Int = SIZE_BYTES * 8 } internal object StringCompanionObject {} internal object EnumCompanionObject {} +@SinceKotlin("1.3") internal object BooleanCompanionObject {} \ No newline at end of file