Add vararg overloads for maxOf/minOf functions #KT-33906
(cherry picked from commit e72e97f1da33e09e344747f56901eabfbc71e075)
This commit is contained in:
committed by
Vasily Levchenko
parent
6e1e416bbb
commit
aa4f360e51
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
@@ -136,6 +136,76 @@ public actual inline fun maxOf(a: Double, b: Double, c: Double): Double {
|
||||
return maxOf(a, maxOf(b, c))
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun <T : Comparable<T>> maxOf(a: T, vararg other: T): T {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Byte, vararg other: Byte): Byte {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Short, vararg other: Short): Short {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Int, vararg other: Int): Int {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Long, vararg other: Long): Long {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Float, vararg other: Float): Float {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the greater of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun maxOf(a: Double, vararg other: Double): Double {
|
||||
var max = a
|
||||
for (e in other) max = maxOf(max, e)
|
||||
return max
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of two values.
|
||||
* If values are equal, returns the first one.
|
||||
@@ -269,3 +339,73 @@ public actual inline fun minOf(a: Double, b: Double, c: Double): Double {
|
||||
return minOf(a, minOf(b, c))
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun <T : Comparable<T>> minOf(a: T, vararg other: T): T {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Byte, vararg other: Byte): Byte {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Short, vararg other: Short): Short {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Int, vararg other: Int): Int {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Long, vararg other: Long): Long {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Float, vararg other: Float): Float {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the smaller of given values.
|
||||
*/
|
||||
@SinceKotlin("1.4")
|
||||
public actual fun minOf(a: Double, vararg other: Double): Double {
|
||||
var min = a
|
||||
for (e in other) min = minOf(min, e)
|
||||
return min
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user