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

JS: Provide MIN_VALUE and MAX_VALUE member constants for Int, Long, Short and Byte companion objects.

Browse Source 
JVM: Make MIN_VALUE and MAX_VALUE not an extension but member constant properties of Int, Long, Short and Byte companion objects.
This commit is contained in:
Ilya Gorbunov
2015-05-14 19:19:17 +03:00
parent c4b881c458
commit f18b9caa8d
10 changed files with 143 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes.txt
+27 -4
View File
@@ -109,8 +109,12 @@ public final class Byte : kotlin.Number, kotlin.Comparable<kotlin.Byte> {
public open override /*1*/ fun toLong(): kotlin.Long
public open override /*1*/ fun toShort(): kotlin.Short
public companion object Companion {
public companion object Companion : kotlin.IntegerConstants<kotlin.Byte> {
/*primary*/ private constructor Companion()
public abstract override /*1*/ /*fake_override*/ val MAX_VALUE: kotlin.Byte
public abstract override /*1*/ /*fake_override*/ fun <get-MAX_VALUE>(): kotlin.Byte
public abstract override /*1*/ /*fake_override*/ val MIN_VALUE: kotlin.Byte
public abstract override /*1*/ /*fake_override*/ fun <get-MIN_VALUE>(): kotlin.Byte
}
}
@@ -916,8 +920,12 @@ public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Int
public final fun xor(/*0*/ other: kotlin.Int): kotlin.Int
public companion object Companion {
public companion object Companion : kotlin.IntegerConstants<kotlin.Int> {
/*primary*/ private constructor Companion()
public abstract override /*1*/ /*fake_override*/ val MAX_VALUE: kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun <get-MAX_VALUE>(): kotlin.Int
public abstract override /*1*/ /*fake_override*/ val MIN_VALUE: kotlin.Int
public abstract override /*1*/ /*fake_override*/ fun <get-MIN_VALUE>(): kotlin.Int
}
}
@@ -985,6 +993,13 @@ public final class IntRange : kotlin.Range<kotlin.Int>, kotlin.Progression<kotli
}
}
public interface IntegerConstants</*0*/ T> {
public abstract val MAX_VALUE: T
public abstract fun <get-MAX_VALUE>(): T
public abstract val MIN_VALUE: T
public abstract fun <get-MIN_VALUE>(): T
}
public interface Iterable</*0*/ out T> {
public abstract fun iterator(): kotlin.Iterator<T>
}
@@ -1087,8 +1102,12 @@ public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Long
public final fun xor(/*0*/ other: kotlin.Long): kotlin.Long
public companion object Companion {
public companion object Companion : kotlin.IntegerConstants<kotlin.Long> {
/*primary*/ private constructor Companion()
public abstract override /*1*/ /*fake_override*/ val MAX_VALUE: kotlin.Long
public abstract override /*1*/ /*fake_override*/ fun <get-MAX_VALUE>(): kotlin.Long
public abstract override /*1*/ /*fake_override*/ val MIN_VALUE: kotlin.Long
public abstract override /*1*/ /*fake_override*/ fun <get-MIN_VALUE>(): kotlin.Long
}
}
@@ -1383,8 +1402,12 @@ public final class Short : kotlin.Number, kotlin.Comparable<kotlin.Short> {
public open override /*1*/ fun toLong(): kotlin.Long
public open override /*1*/ fun toShort(): kotlin.Short
public companion object Companion {
public companion object Companion : kotlin.IntegerConstants<kotlin.Short> {
/*primary*/ private constructor Companion()
public abstract override /*1*/ /*fake_override*/ val MAX_VALUE: kotlin.Short
public abstract override /*1*/ /*fake_override*/ fun <get-MAX_VALUE>(): kotlin.Short
public abstract override /*1*/ /*fake_override*/ val MIN_VALUE: kotlin.Short
public abstract override /*1*/ /*fake_override*/ fun <get-MIN_VALUE>(): kotlin.Short
}
}
core/builtins/native/kotlin/Primitives.kt
+4 -4
View File
@@ -23,7 +23,7 @@ package kotlin
* On the JVM, non-nullable values of this type are represented as values of the primitive type `byte`.
*/
public class Byte private () : Number, Comparable<Byte> {
companion object {}
companion object : IntegerConstants<Byte> {}
/**
* Compares this value with the specified value for order.
@@ -326,7 +326,7 @@ public class Char private () : Comparable<Char> {
* On the JVM, non-nullable values of this type are represented as values of the primitive type `short`.
*/
public class Short private () : Number, Comparable<Short> {
companion object {}
companion object : IntegerConstants<Short> {}
/**
* Compares this value with the specified value for order.
@@ -484,7 +484,7 @@ public class Short private () : Number, Comparable<Short> {
* On the JVM, non-nullable values of this type are represented as values of the primitive type `int`.
*/
public class Int private () : Number, Comparable<Int> {
companion object {}
companion object : IntegerConstants<Int> {}
/**
* Compares this value with the specified value for order.
@@ -657,7 +657,7 @@ public class Int private () : Number, Comparable<Int> {
* On the JVM, non-nullable values of this type are represented as values of the primitive type `long`.
*/
public class Long private () : Number, Comparable<Long> {
companion object {}
companion object : IntegerConstants<Long> {}
/**
* Compares this value with the specified value for order.
core/builtins/src/kotlin/FloatingPointConstants.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package kotlin
/**
* Holder for special values of floating point types.
* An interface implemented by companion objects of floating-point types.
*/
public interface FloatingPointConstants<T> {
/**
core/builtins/src/kotlin/IntegerConstants.kt
+32
View File
@@ -0,0 +1,32 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin
/**
* An interface implemented by companion objects of integral types.
*/
public interface IntegerConstants<T> {
/**
* A constant holding the minimum value an instance of [T] can have.
*/
public val MIN_VALUE: T
/**
* A constant holding the maximum value an instance of [T] can have.
*/
public val MAX_VALUE: T
}
core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveCompanionObjects.kt
+21 -4
View File
@@ -28,10 +28,27 @@ private object FloatCompanionObject : FloatingPointConstants<Float> {
override val NaN : Float = java.lang.Float.NaN
}
private object IntCompanionObject {}
private object LongCompanionObject {}
private object ShortCompanionObject {}
private object ByteCompanionObject {}
private object IntCompanionObject : IntegerConstants<Int> {
override val MIN_VALUE: Int = java.lang.Integer.MIN_VALUE
override val MAX_VALUE: Int = java.lang.Integer.MAX_VALUE
}
private object LongCompanionObject : IntegerConstants<Long> {
override val MIN_VALUE: Long = java.lang.Long.MIN_VALUE
override val MAX_VALUE: Long = java.lang.Long.MAX_VALUE
}
private object ShortCompanionObject : IntegerConstants<Short> {
override val MIN_VALUE: Short = java.lang.Short.MIN_VALUE
override val MAX_VALUE: Short = java.lang.Short.MAX_VALUE
}
private object ByteCompanionObject : IntegerConstants<Byte> {
override val MIN_VALUE: Byte = java.lang.Byte.MIN_VALUE
override val MAX_VALUE: Byte = java.lang.Byte.MAX_VALUE
}
private object CharCompanionObject {}
private object StringCompanionObject {}
generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
+3
View File
@@ -65,6 +65,9 @@ class GeneratePrimitives(out: PrintWriter) : BuiltInsSourceGenerator(out) {
if (kind == PrimitiveType.FLOAT || kind == PrimitiveType.DOUBLE) {
out.print(" : FloatingPointConstants<$className>")
}
if (kind == PrimitiveType.INT || kind == PrimitiveType.LONG || kind == PrimitiveType.SHORT || kind == PrimitiveType.BYTE) {
out.print(" : IntegerConstants<$className>")
}
out.println(" {}\n")
generateCompareTo(kind)
js/js.libraries/src/internal/primitiveCompanionObjects.kt
+20 -4
View File
@@ -28,10 +28,26 @@ private object FloatCompanionObject : FloatingPointConstants<Float> {
override val NaN : Float = js("Number.NaN")
}
private object IntCompanionObject {}
private object LongCompanionObject {}
private object ShortCompanionObject {}
private object ByteCompanionObject {}
private object IntCompanionObject : IntegerConstants<Int> {
override val MIN_VALUE: Int = -0x80000000
override val MAX_VALUE: Int = 0x7FFFFFFF
}
private object LongCompanionObject : IntegerConstants<Long> {
override val MIN_VALUE: Long = js("Kotlin.Long.MIN_VALUE")
override val MAX_VALUE: Long = js("Kotlin.Long.MAX_VALUE")
}
private object ShortCompanionObject : IntegerConstants<Short> {
override val MIN_VALUE: Short = -0x8000
override val MAX_VALUE: Short = 0x7FFF
}
private object ByteCompanionObject : IntegerConstants<Byte> {
override val MIN_VALUE: Byte = -0x80
override val MAX_VALUE: Byte = 0x7F
}
private object CharCompanionObject {}
private object StringCompanionObject {}
jslib_files.xml
+1
View File
@@ -7,6 +7,7 @@
<include name="src/kotlin/Iterators.kt"/>
<include name="src/kotlin/Range.kt"/>
<include name="src/kotlin/FloatingPointConstants.kt"/>
<include name="src/kotlin/IntegerConstants.kt"/>
</fileset>
<union id="js.lib.files">
libraries/stdlib/src/kotlin/jvm/BuiltinExtensions.kt
-35
View File
@@ -15,14 +15,6 @@
*/
package kotlin.jvm
/**
* A constant holding the minimum value an `Int` can have, -2^31.
*/
public val Int.Companion.MIN_VALUE: Int get() = java.lang.Integer.MIN_VALUE
/**
* A constant holding the maximum value an `Int` can have, 2^31-1.
*/
public val Int.Companion.MAX_VALUE: Int get() = java.lang.Integer.MAX_VALUE
/**
* A constant holding the smallest positive nonzero value of type `Double`, 2^-1074.
@@ -41,30 +33,3 @@ public val Float.Companion.MIN_VALUE: Float get() = java.lang.Float.MIN_VALUE
* * A constant holding the largest positive finite value of type `Float`, (2-2^-23)*2^127.
*/
public val Float.Companion.MAX_VALUE: Float get() = java.lang.Float.MAX_VALUE
/**
* A constant holding the minimum value a `Long` can have, -2^63.
*/
public val Long.Companion.MIN_VALUE: Long get() = java.lang.Long.MIN_VALUE
/**
* A constant holding the maximum value a `Long` can have, 2^63-1.
*/
public val Long.Companion.MAX_VALUE: Long get() = java.lang.Long.MAX_VALUE
/**
* A constant holding the minimum value a `Short` can have, -2^15.
*/
public val Short.Companion.MIN_VALUE: Short get() = java.lang.Short.MIN_VALUE
/**
* A constant holding the maximum value a `Short` can have, 2^15-1.
*/
public val Short.Companion.MAX_VALUE: Short get() = java.lang.Short.MAX_VALUE
/**
* A constant holding the minimum value a `Byte` can have, -128.
*/
public val Byte.Companion.MIN_VALUE: Byte get() = java.lang.Byte.MIN_VALUE
/**
* A constant holding the maximum value a `Byte` can have, 127.
*/
public val Byte.Companion.MAX_VALUE: Byte get() = java.lang.Byte.MAX_VALUE
libraries/stdlib/test/numbers/NumbersTest.kt
+34
View File
@@ -5,6 +5,40 @@ import kotlin.test.*
class NumbersTest {
test fun intMinMaxValues() {
assertTrue(Int.MIN_VALUE < 0)
assertTrue(Int.MAX_VALUE > 0)
// overflow behavior
// doesn't hold for JS Number
// assertEquals(Int.MIN_VALUE, Int.MAX_VALUE + 1)
}
test fun longMinMaxValues() {
assertTrue(Long.MIN_VALUE < 0)
assertTrue(Long.MAX_VALUE > 0)
// overflow behavior
assertEquals(Long.MIN_VALUE, Long.MAX_VALUE + 1)
assertEquals(Long.MAX_VALUE, Long.MIN_VALUE - 1)
}
test fun shortMinMaxValues() {
assertTrue(Short.MIN_VALUE < 0)
assertTrue(Short.MAX_VALUE > 0)
// overflow behavior
assertEquals(Short.MIN_VALUE, (Short.MAX_VALUE + 1).toShort())
assertEquals(Short.MAX_VALUE, (Short.MIN_VALUE - 1).toShort())
}
test fun byteMinMaxValues() {
assertTrue(Byte.MIN_VALUE < 0)
assertTrue(Byte.MAX_VALUE > 0)
// overflow behavior
assertEquals(Byte.MIN_VALUE, (Byte.MAX_VALUE + 1).toByte())
assertEquals(Byte.MAX_VALUE, (Byte.MIN_VALUE - 1).toByte())
}
test fun doubleProperties() {
for (value in listOf(1.0, 0.0))
doTestNumber(value)