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

Stdlib generators: change constants for Long: ZERO, ONE, -ONE.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-06 19:22:33 +03:00
parent 10c376975a
commit 0a320a13e5
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Numeric.kt
+4 -4
View File
@@ -421,7 +421,7 @@ public fun IntArray.sum(): Int {
platformName("sumOfLong") platformName("sumOfLong")
public fun Iterable<Long>.sum(): Long { public fun Iterable<Long>.sum(): Long {
val iterator = iterator() val iterator = iterator()
var sum: Long = 0 var sum: Long = 0L
while (iterator.hasNext()) { while (iterator.hasNext()) {
sum += iterator.next() sum += iterator.next()
} }
@@ -434,7 +434,7 @@ public fun Iterable<Long>.sum(): Long {
platformName("sumOfLong") platformName("sumOfLong")
public fun Sequence<Long>.sum(): Long { public fun Sequence<Long>.sum(): Long {
val iterator = iterator() val iterator = iterator()
var sum: Long = 0 var sum: Long = 0L
while (iterator.hasNext()) { while (iterator.hasNext()) {
sum += iterator.next() sum += iterator.next()
} }
@@ -447,7 +447,7 @@ public fun Sequence<Long>.sum(): Long {
platformName("sumOfLong") platformName("sumOfLong")
public fun Array<out Long>.sum(): Long { public fun Array<out Long>.sum(): Long {
val iterator = iterator() val iterator = iterator()
var sum: Long = 0 var sum: Long = 0L
while (iterator.hasNext()) { while (iterator.hasNext()) {
sum += iterator.next() sum += iterator.next()
} }
@@ -459,7 +459,7 @@ public fun Array<out Long>.sum(): Long {
*/ */
public fun LongArray.sum(): Long { public fun LongArray.sum(): Long {
val iterator = iterator() val iterator = iterator()
var sum: Long = 0 var sum: Long = 0L
while (iterator.hasNext()) { while (iterator.hasNext()) {
sum += iterator.next() sum += iterator.next()
} }
libraries/stdlib/src/generated/_Ranges.kt
+1 -1
View File
@@ -98,7 +98,7 @@ public fun IntRange.reversed(): IntProgression {
* Returns a progression that goes over this range in reverse direction. * Returns a progression that goes over this range in reverse direction.
*/ */
public fun LongRange.reversed(): LongProgression { public fun LongRange.reversed(): LongProgression {
return LongProgression(end, start, -1.toLong()) return LongProgression(end, start, -1L)
} }
/** /**
libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+3 -2
View File
@@ -206,18 +206,19 @@ class GenericFunction(val signature: String, val keyword: String = "fun") : Comp
"ZERO" -> when (primitive) { "ZERO" -> when (primitive) {
PrimitiveType.Double -> "0.0" PrimitiveType.Double -> "0.0"
PrimitiveType.Float -> "0.0f" PrimitiveType.Float -> "0.0f"
PrimitiveType.Long -> "0L"
else -> "0" else -> "0"
} }
"ONE" -> when (primitive) { "ONE" -> when (primitive) {
PrimitiveType.Double -> "1.0" PrimitiveType.Double -> "1.0"
PrimitiveType.Float -> "1.0f" PrimitiveType.Float -> "1.0f"
PrimitiveType.Long -> "1.toLong()" PrimitiveType.Long -> "1L"
else -> "1" else -> "1"
} }
"-ONE" -> when (primitive) { "-ONE" -> when (primitive) {
PrimitiveType.Double -> "-1.0" PrimitiveType.Double -> "-1.0"
PrimitiveType.Float -> "-1.0f" PrimitiveType.Float -> "-1.0f"
PrimitiveType.Long -> "-1.toLong()" PrimitiveType.Long -> "-1L"
else -> "-1" else -> "-1"
} }
"TCollection" -> { "TCollection" -> {