From 0ec75f1534a89db24caff47155637abee59ce45b Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 19 Feb 2019 17:26:38 +0300 Subject: [PATCH] [JS IR BE] Temporary fix K/JS stdlib --- libraries/stdlib/js/irRuntime/longjs.kt | 9 ++++++--- .../js/runtime/primitiveCompanionObjects.kt | 18 +++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/libraries/stdlib/js/irRuntime/longjs.kt b/libraries/stdlib/js/irRuntime/longjs.kt index 6ce379a3998..dd33dce0d74 100644 --- a/libraries/stdlib/js/irRuntime/longjs.kt +++ b/libraries/stdlib/js/irRuntime/longjs.kt @@ -364,11 +364,14 @@ private val TWO_PWR_16_DBL_ = (1 shl 16).toDouble() private val TWO_PWR_24_DBL_ = (1 shl 24).toDouble() -private val TWO_PWR_32_DBL_ = TWO_PWR_16_DBL_ * TWO_PWR_16_DBL_ +//private val TWO_PWR_32_DBL_ = TWO_PWR_16_DBL_ * TWO_PWR_16_DBL_ +private val TWO_PWR_32_DBL_ = (1 shl 16).toDouble() * (1 shl 16).toDouble() -private val TWO_PWR_64_DBL_ = TWO_PWR_32_DBL_ * TWO_PWR_32_DBL_ +//private val TWO_PWR_64_DBL_ = TWO_PWR_32_DBL_ * TWO_PWR_32_DBL_ +private val TWO_PWR_64_DBL_ = ((1 shl 16).toDouble() * (1 shl 16).toDouble()) * ((1 shl 16).toDouble() * (1 shl 16).toDouble()) -private val TWO_PWR_63_DBL_ = TWO_PWR_64_DBL_ / 2 +//private val TWO_PWR_63_DBL_ = TWO_PWR_64_DBL_ / 2 +private val TWO_PWR_63_DBL_ = (((1 shl 16).toDouble() * (1 shl 16).toDouble()) * ((1 shl 16).toDouble() * (1 shl 16).toDouble())) / 2 private val ZERO = fromInt(0) diff --git a/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt b/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt index bc8768808cd..3426b6f1a93 100644 --- a/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt +++ b/libraries/stdlib/js/runtime/primitiveCompanionObjects.kt @@ -6,7 +6,7 @@ package kotlin.js.internal @JsName("DoubleCompanionObject") -private object DoubleCompanionObject { +internal object DoubleCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Double = js("Number.MIN_VALUE") @@ -24,7 +24,7 @@ private object DoubleCompanionObject { } @JsName("FloatCompanionObject") -private object FloatCompanionObject { +internal object FloatCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Float = js("Number.MIN_VALUE") @@ -42,7 +42,7 @@ private object FloatCompanionObject { } @JsName("IntCompanionObject") -private object IntCompanionObject { +internal object IntCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Int = -2147483647 - 1 @@ -57,7 +57,7 @@ private object IntCompanionObject { } @JsName("LongCompanionObject") -private object LongCompanionObject { +internal object LongCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Long = js("Kotlin.Long.MIN_VALUE") @@ -72,7 +72,7 @@ private object LongCompanionObject { } @JsName("ShortCompanionObject") -private object ShortCompanionObject { +internal object ShortCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Short = -32768 @@ -87,7 +87,7 @@ private object ShortCompanionObject { } @JsName("ByteCompanionObject") -private object ByteCompanionObject { +internal object ByteCompanionObject { @JsName("MIN_VALUE") val MIN_VALUE: Byte = -128 @@ -102,7 +102,7 @@ private object ByteCompanionObject { } @JsName("CharCompanionObject") -private object CharCompanionObject { +internal object CharCompanionObject { @JsName("MIN_VALUE") public const val MIN_VALUE: Char = '\u0000' @@ -134,7 +134,7 @@ private object CharCompanionObject { const val SIZE_BITS = 16 } -private object StringCompanionObject {} +internal object StringCompanionObject {} -private object BooleanCompanionObject {} +internal object BooleanCompanionObject {}