From a94f12d8fee180dd8b973594ed67dc8d3b904dba Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 16 Jun 2014 19:37:44 +0400 Subject: [PATCH] Use f/L literal suffixes instead of toFloat()/toLong() --- libraries/stdlib/test/language/RangeTest.kt | 48 +++++++++---------- .../stdlib/test/language/RangeTestJVM.kt | 26 +++++----- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/libraries/stdlib/test/language/RangeTest.kt b/libraries/stdlib/test/language/RangeTest.kt index 241dbf54b90..20e7672b80c 100644 --- a/libraries/stdlib/test/language/RangeTest.kt +++ b/libraries/stdlib/test/language/RangeTest.kt @@ -59,19 +59,19 @@ public class RangeTest { } test fun longRange() { - val range = -5.toLong()..9.toLong() - assertFalse(-10000000.toLong() in range) - assertFalse(-6.toLong() in range) + val range = -5L..9L + assertFalse(-10000000L in range) + assertFalse(-6L in range) - assertTrue(-5.toLong() in range) - assertTrue(-4.toLong() in range) - assertTrue(0.toLong() in range) - assertTrue(3.toLong() in range) - assertTrue(8.toLong() in range) - assertTrue(9.toLong() in range) + assertTrue(-5L in range) + assertTrue(-4L in range) + assertTrue(0L in range) + assertTrue(3L in range) + assertTrue(8L in range) + assertTrue(9L in range) - assertFalse(10.toLong() in range) - assertFalse(10000000.toLong() in range) + assertFalse(10L in range) + assertFalse(10000000L in range) assertFalse(range.isEmpty()) } @@ -115,21 +115,21 @@ public class RangeTest { } test fun floatRange() { - val range = -1.0.toFloat()..3.14159.toFloat() - assertFalse(-1e30.toFloat() in range) - assertFalse(-100.0.toFloat() in range) - assertFalse(-1.00001.toFloat() in range) + val range = -1.0f..3.14159f + assertFalse(-1e30f in range) + assertFalse(-100.0f in range) + assertFalse(-1.00001f in range) - assertTrue(-1.0.toFloat() in range) - assertTrue(-0.99999.toFloat() in range) - assertTrue(0.0.toFloat() in range) - assertTrue(1.5.toFloat() in range) - assertTrue(3.1415.toFloat() in range) - assertTrue(3.14159.toFloat() in range) + assertTrue(-1.0f in range) + assertTrue(-0.99999f in range) + assertTrue(0.0f in range) + assertTrue(1.5f in range) + assertTrue(3.1415f in range) + assertTrue(3.14159f in range) - assertFalse(3.15.toFloat() in range) - assertFalse(10.0.toFloat() in range) - assertFalse(1e30.toFloat() in range) + assertFalse(3.15f in range) + assertFalse(10.0f in range) + assertFalse(1e30f in range) assertFalse(range.isEmpty()) } diff --git a/libraries/stdlib/test/language/RangeTestJVM.kt b/libraries/stdlib/test/language/RangeTestJVM.kt index 94c01200c7f..61239dff283 100644 --- a/libraries/stdlib/test/language/RangeTestJVM.kt +++ b/libraries/stdlib/test/language/RangeTestJVM.kt @@ -15,7 +15,7 @@ public class RangeTestJVM { } test fun floatRange() { - val range = -1.0.toFloat()..3.14159.toFloat() + val range = -1.0f..3.14159f assertFalse(jFloat.NEGATIVE_INFINITY in range) assertFalse(jFloat.POSITIVE_INFINITY in range) @@ -30,48 +30,48 @@ public class RangeTestJVM { failsWith(javaClass()) { LongProgression(0, 5, 0) } failsWith(javaClass()) { CharProgression('a', 'z', 0) } failsWith(javaClass()) { DoubleProgression(0.0, 5.0, 0.0) } - failsWith(javaClass()) { FloatProgression(0.0.toFloat(), 5.0.toFloat(), 0.0.toFloat()) } + failsWith(javaClass()) { FloatProgression(0.0f, 5.0f, 0.0f) } failsWith(javaClass()) { 0..5 step 0 } failsWith(javaClass()) { 0.toByte()..5.toByte() step 0 } failsWith(javaClass()) { 0.toShort()..5.toShort() step 0 } - failsWith(javaClass()) { 0.toLong()..5.toLong() step 0.toLong() } + failsWith(javaClass()) { 0L..5L step 0L } failsWith(javaClass()) { 'a'..'z' step 0 } failsWith(javaClass()) { 0.0..5.0 step 0.0 } - failsWith(javaClass()) { 0.0.toFloat()..5.0.toFloat() step 0.0.toFloat() } + failsWith(javaClass()) { 0.0f..5.0f step 0.0f } failsWith(javaClass()) { 0 downTo -5 step 0 } failsWith(javaClass()) { 0.toByte() downTo -5.toByte() step 0 } failsWith(javaClass()) { 0.toShort() downTo -5.toShort() step 0 } - failsWith(javaClass()) { 0.toLong() downTo -5.toLong() step 0.toLong() } + failsWith(javaClass()) { 0L downTo -5L step 0L } failsWith(javaClass()) { 'z' downTo 'a' step 0 } failsWith(javaClass()) { 0.0 downTo -5.0 step 0.0 } - failsWith(javaClass()) { 0.0.toFloat() downTo -5.0.toFloat() step 0.0.toFloat() } + failsWith(javaClass()) { 0.0f downTo -5.0f step 0.0f } failsWith(javaClass()) { 0..5 step -2 } failsWith(javaClass()) { 0.toByte()..5.toByte() step -2 } failsWith(javaClass()) { 0.toShort()..5.toShort() step -2 } - failsWith(javaClass()) { 0.toLong()..5.toLong() step -2.toLong() } + failsWith(javaClass()) { 0L..5L step -2L } failsWith(javaClass()) { 'a'..'z' step -2 } failsWith(javaClass()) { 0.0..5.0 step -0.5 } - failsWith(javaClass()) { 0.0.toFloat()..5.0.toFloat() step -0.5.toFloat() } + failsWith(javaClass()) { 0.0f..5.0f step -0.5f } failsWith(javaClass()) { 0 downTo -5 step -2 } failsWith(javaClass()) { 0.toByte() downTo -5.toByte() step -2 } failsWith(javaClass()) { 0.toShort() downTo -5.toShort() step -2 } - failsWith(javaClass()) { 0.toLong() downTo -5.toLong() step -2.toLong() } + failsWith(javaClass()) { 0L downTo -5L step -2L } failsWith(javaClass()) { 'z' downTo 'a' step -2 } failsWith(javaClass()) { 0.0 downTo -5.0 step -0.5 } - failsWith(javaClass()) { 0.0.toFloat() downTo -5.0.toFloat() step -0.5.toFloat() } + failsWith(javaClass()) { 0.0f downTo -5.0f step -0.5f } // NaN increment or step failsWith(javaClass()) { DoubleProgression(0.0, 5.0, jDouble.NaN) } - failsWith(javaClass()) { FloatProgression(0.0.toFloat(), 5.0.toFloat(), jFloat.NaN) } + failsWith(javaClass()) { FloatProgression(0.0f, 5.0f, jFloat.NaN) } failsWith(javaClass()) { 0.0..5.0 step jDouble.NaN } - failsWith(javaClass()) { 0.0.toFloat()..5.0.toFloat() step jFloat.NaN } + failsWith(javaClass()) { 0.0f..5.0f step jFloat.NaN } failsWith(javaClass()) { 5.0 downTo 0.0 step jDouble.NaN } - failsWith(javaClass()) { 5.0.toFloat() downTo 0.0.toFloat() step jFloat.NaN } + failsWith(javaClass()) { 5.0f downTo 0.0f step jFloat.NaN } } } \ No newline at end of file