From e8aff3360a7bd37e36006e5aced2eb345655bfb9 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 2 Jul 2015 02:38:15 +0300
Subject: [PATCH] Do not use deprecated operations in ranges and progressions
 hashCode.

---
 core/builtins/src/kotlin/Progressions.kt                    | 6 +++---
 core/builtins/src/kotlin/Ranges.kt                          | 6 +++---
 .../jetbrains/kotlin/generators/builtins/progressions.kt    | 2 +-
 .../src/org/jetbrains/kotlin/generators/builtins/ranges.kt  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/builtins/src/kotlin/Progressions.kt b/core/builtins/src/kotlin/Progressions.kt
index a64cee8c46b..15b45025bd7 100644
--- a/core/builtins/src/kotlin/Progressions.kt
+++ b/core/builtins/src/kotlin/Progressions.kt
@@ -40,7 +40,7 @@ public class ByteProgression(
         start == other.start && end == other.end && increment == other.increment)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end) + increment)
+        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end.toInt()) + increment)
 
     override fun toString(): String = if (increment > 0) "$start..$end step $increment" else "$start downTo $end step ${-increment}"
 }
@@ -67,7 +67,7 @@ public class CharProgression(
         start == other.start && end == other.end && increment == other.increment)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end) + increment)
+        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end.toInt()) + increment)
 
     override fun toString(): String = if (increment > 0) "$start..$end step $increment" else "$start downTo $end step ${-increment}"
 }
@@ -94,7 +94,7 @@ public class ShortProgression(
         start == other.start && end == other.end && increment == other.increment)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end) + increment)
+        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end.toInt()) + increment)
 
     override fun toString(): String = if (increment > 0) "$start..$end step $increment" else "$start downTo $end step ${-increment}"
 }
diff --git a/core/builtins/src/kotlin/Ranges.kt b/core/builtins/src/kotlin/Ranges.kt
index b957723d37f..bda8c7e6551 100644
--- a/core/builtins/src/kotlin/Ranges.kt
+++ b/core/builtins/src/kotlin/Ranges.kt
@@ -36,7 +36,7 @@ public class ByteRange(override val start: Byte, override val end: Byte) : Range
         start == other.start && end == other.end)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * start.toInt() + end)
+        if (isEmpty()) -1 else (31 * start.toInt() + end.toInt())
 
     companion object {
         /** An empty range of values of type Byte. */
@@ -62,7 +62,7 @@ public class CharRange(override val start: Char, override val end: Char) : Range
         start == other.start && end == other.end)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * start.toInt() + end)
+        if (isEmpty()) -1 else (31 * start.toInt() + end.toInt())
 
     companion object {
         /** An empty range of values of type Char. */
@@ -88,7 +88,7 @@ public class ShortRange(override val start: Short, override val end: Short) : Ra
         start == other.start && end == other.end)
 
     override fun hashCode(): Int =
-        if (isEmpty()) -1 else (31 * start.toInt() + end)
+        if (isEmpty()) -1 else (31 * start.toInt() + end.toInt())
 
     companion object {
         /** An empty range of values of type Short. */
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
index 490bc979152..2674cfe06dd 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
@@ -46,7 +46,7 @@ class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) {
 
             val hashCode = when (kind) {
                 BYTE, CHAR, SHORT -> "=\n" +
-                "        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end) + increment)"
+                "        if (isEmpty()) -1 else (31 * (31 * start.toInt() + end.toInt()) + increment)"
                 INT -> "=\n" +
                 "        if (isEmpty()) -1 else (31 * (31 * start + end) + increment)"
                 LONG -> "=\n" +
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
index 377db8d7130..d049c24850c 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
@@ -46,7 +46,7 @@ class GenerateRanges(out: PrintWriter) : BuiltInsSourceGenerator(out) {
 
             val hashCode = when (kind) {
                 BYTE, CHAR, SHORT -> "=\n" +
-                "        if (isEmpty()) -1 else (31 * start.toInt() + end)"
+                "        if (isEmpty()) -1 else (31 * start.toInt() + end.toInt())"
                 INT -> "=\n" +
                 "        if (isEmpty()) -1 else (31 * start + end)"
                 LONG -> "=\n" +