azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use deprecated operations in ranges and progressions hashCode.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-02 02:38:15 +03:00
parent 2c4db42319
commit e8aff3360a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/builtins/src/kotlin/Progressions.kt
+3 -3
View File
@@ -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}"
}
core/builtins/src/kotlin/Ranges.kt
+3 -3
View File
@@ -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. */
generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
+1 -1
View File
@@ -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" +
generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
+1 -1
View File
@@ -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" +