From 3baf2f8942ddcd61188b8a5cffad8bf0e4664749 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 23 Sep 2016 18:13:20 +0300 Subject: [PATCH] Use fully-qualified references to exceptions in kotlin-runtime --- core/builtins/src/kotlin/Progressions.kt | 6 +++--- core/builtins/src/kotlin/internal/progressionUtil.kt | 4 ++-- .../src/kotlin/jvm/internal/localVariableReferences.kt | 2 +- .../jetbrains/kotlin/generators/builtins/progressions.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/builtins/src/kotlin/Progressions.kt b/core/builtins/src/kotlin/Progressions.kt index 704d49f895c..705cc6a0f66 100644 --- a/core/builtins/src/kotlin/Progressions.kt +++ b/core/builtins/src/kotlin/Progressions.kt @@ -31,7 +31,7 @@ public open class CharProgression step: Int ) : Iterable { init { - if (step == 0) throw IllegalArgumentException("Step must be non-zero") + if (step == 0) throw kotlin.IllegalArgumentException("Step must be non-zero") } /** @@ -85,7 +85,7 @@ public open class IntProgression step: Int ) : Iterable { init { - if (step == 0) throw IllegalArgumentException("Step must be non-zero") + if (step == 0) throw kotlin.IllegalArgumentException("Step must be non-zero") } /** @@ -139,7 +139,7 @@ public open class LongProgression step: Long ) : Iterable { init { - if (step == 0L) throw IllegalArgumentException("Step must be non-zero") + if (step == 0L) throw kotlin.IllegalArgumentException("Step must be non-zero") } /** diff --git a/core/builtins/src/kotlin/internal/progressionUtil.kt b/core/builtins/src/kotlin/internal/progressionUtil.kt index 026c99fb4ef..31a755ecff1 100644 --- a/core/builtins/src/kotlin/internal/progressionUtil.kt +++ b/core/builtins/src/kotlin/internal/progressionUtil.kt @@ -57,7 +57,7 @@ internal fun getProgressionLastElement(start: Int, end: Int, step: Int): Int { return end + differenceModulo(start, end, -step) } else { - throw IllegalArgumentException("Step is zero.") + throw kotlin.IllegalArgumentException("Step is zero.") } } @@ -82,6 +82,6 @@ internal fun getProgressionLastElement(start: Long, end: Long, step: Long): Long return end + differenceModulo(start, end, -step) } else { - throw IllegalArgumentException("Step is zero.") + throw kotlin.IllegalArgumentException("Step is zero.") } } diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/localVariableReferences.kt b/core/runtime.jvm/src/kotlin/jvm/internal/localVariableReferences.kt index 9dc50a3bc7f..d9484835600 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/localVariableReferences.kt +++ b/core/runtime.jvm/src/kotlin/jvm/internal/localVariableReferences.kt @@ -19,7 +19,7 @@ package kotlin.jvm.internal import kotlin.reflect.KDeclarationContainer private fun notSupportedError(): Nothing { - throw UnsupportedOperationException("Not supported for local property reference.") + throw kotlin.UnsupportedOperationException("Not supported for local property reference.") } open class LocalVariableReference : PropertyReference0() { diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt index 2c549aa2f99..5358a58c1f5 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt @@ -35,7 +35,7 @@ class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) { LONG -> "0L" else -> "0" } - val checkZero = "if (step == $zero) throw IllegalArgumentException(\"Step must be non-zero\")" + val checkZero = "if (step == $zero) throw kotlin.IllegalArgumentException(\"Step must be non-zero\")" val hashCode = "=\n" + when (kind) { CHAR ->