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

KJS: class MathClass -> object Math

Browse Source
This commit is contained in:
Zalim Bashorov
2017-01-19 22:36:25 +03:00
parent cb210b6c78
commit cd04e794ee
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt
Vendored
+2 -2
View File
@@ -4,5 +4,5 @@ class Test {
} }
} }
// EXIST: Any, Nothing, Unit, Int, Number, Array // EXIST: Any, Nothing, Unit, Int, Number, Array, Math
// EXIST_JAVA_ONLY: Math, Thread // EXIST_JAVA_ONLY: Thread
idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt
Vendored
+2 -2
View File
@@ -3,5 +3,5 @@ class Test : <caret> {
} }
} }
// EXIST: Any, Nothing, Unit, Int, Number, Array // EXIST: Any, Nothing, Unit, Int, Number, Array, Math
// EXIST_JAVA_ONLY: Math, Thread // EXIST_JAVA_ONLY: Thread
js/js.libraries/src/core/math.kt
+3 -5
View File
@@ -1,7 +1,7 @@
package kotlin.js package kotlin.js
//TODO: declare using number //TODO: declare using number
public external class MathClass() { public external object Math {
public val PI: Double = noImpl public val PI: Double = noImpl
public fun random(): Double = noImpl public fun random(): Double = noImpl
public fun abs(value: Double): Double = noImpl public fun abs(value: Double): Double = noImpl
@@ -27,7 +27,5 @@ public external class MathClass() {
public fun ceil(value: Number): Int = noImpl public fun ceil(value: Number): Int = noImpl
} }
public external val Math: MathClass public fun Math.min(a: Long, b: Long): Long = if (a <= b) a else b
public fun Math.max(a: Long, b: Long): Long = if (a >= b) a else b
public fun MathClass.min(a: Long, b: Long): Long = if (a <= b) a else b
public fun MathClass.max(a: Long, b: Long): Long = if (a >= b) a else b