From c5398e8317f7ff87403cca1e23b11ae5f5258855 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 5 Aug 2020 20:08:27 +0300 Subject: [PATCH] Move 'radixPrefix' from compiler modules to IDE modules `radixPrefix` is used only in IDE now. So let's put it into IDE modules. This commit is done in order to be able to use code dependent on `radixPrefix` in `kotlin-ide` repo, because `kotlin-ide` depends on 1.4.0 artifacts of compiler. And `radixPrefix` isn't presented in those artifacts --- .../src/org/jetbrains/kotlin/utils/numbers.kt | 8 -------- .../jetbrains/kotlin/nj2k/conversions/ForConversion.kt | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/numbers.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/numbers.kt index a30e2c2c7f8..30e872e9725 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/numbers.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/numbers.kt @@ -23,11 +23,3 @@ fun extractRadix(value: String): NumberWithRadix = when { value.startsWith("0b") || value.startsWith("0B") -> NumberWithRadix(value.substring(2), 2) else -> NumberWithRadix(value, 10) } - -val NumberWithRadix.radixPrefix: String - get() = when (radix) { - 2 -> "0b" - 10 -> "" - 16 -> "0x" - else -> error("Invalid radix for $this") - } diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt index ae0c57a00b9..d01a16cc43e 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ForConversion.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.types.JKJavaArrayType import org.jetbrains.kotlin.nj2k.types.JKJavaPrimitiveType import org.jetbrains.kotlin.nj2k.types.JKNoType +import org.jetbrains.kotlin.utils.NumberWithRadix import org.jetbrains.kotlin.utils.extractRadix -import org.jetbrains.kotlin.utils.radixPrefix import kotlin.math.abs @@ -231,6 +231,14 @@ class ForConversion(context: NewJ2kConverterContext) : RecursiveApplicableConver return "${numberWithRadix.radixPrefix}${fixedValue}" } + private val NumberWithRadix.radixPrefix: String + get() = when (radix) { + 2 -> "0b" + 10 -> "" + 16 -> "0x" + else -> error("Invalid radix for $this") + } + private fun indicesIterationRange( start: JKExpression, bound: JKExpression,