rename Numbers.kt to Primitives.kt as it now contains Char which is not a number

This commit is contained in:
Dmitry Jemerov
2015-03-10 16:48:40 +01:00
parent 89398796c6
commit 07381b765f
6 changed files with 15 additions and 11 deletions
+11 -7
View File
@@ -223,13 +223,17 @@ public final class Char : kotlin.Comparable<kotlin.Char> {
public final fun times(/*0*/ other: kotlin.Int): kotlin.Int
public final fun times(/*0*/ other: kotlin.Long): kotlin.Long
public final fun times(/*0*/ other: kotlin.Short): kotlin.Int
public final fun toByte(): kotlin.Byte
public final fun toChar(): kotlin.Char
public final fun toDouble(): kotlin.Double
public final fun toFloat(): kotlin.Float
public final fun toInt(): kotlin.Int
public final fun toLong(): kotlin.Long
public final fun toShort(): kotlin.Short
public open fun toByte(): kotlin.Byte
public open fun toChar(): kotlin.Char
public open fun toDouble(): kotlin.Double
public open fun toFloat(): kotlin.Float
public open fun toInt(): kotlin.Int
public open fun toLong(): kotlin.Long
public open fun toShort(): kotlin.Short
public default object Default {
/*primary*/ private constructor Default()
}
}
public final class CharArray : kotlin.Cloneable {
@@ -63,7 +63,7 @@ fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator)
}
generate(File(BUILT_INS_NATIVE_DIR, "Arrays.kt")) { GenerateArrays(it) }
generate(File(BUILT_INS_NATIVE_DIR, "Numbers.kt")) { GenerateNumbers(it) }
generate(File(BUILT_INS_NATIVE_DIR, "Primitives.kt")) { GeneratePrimitives(it) }
generate(File(BUILT_INS_SRC_DIR, "Iterators.kt")) { GenerateIterators(it) }
generate(File(RUNTIME_JVM_DIR, "jvm/internal/ArrayIterators.kt")) { GenerateArrayIterators(it) }
generate(File(BUILT_INS_SRC_DIR, "ProgressionIterators.kt")) { GenerateProgressionIterators(it) }
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.generators.builtins.PrimitiveType
import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.BuiltInsSourceGenerator
import java.io.PrintWriter
class GenerateNumbers(out: PrintWriter) : BuiltInsSourceGenerator(out) {
class GeneratePrimitives(out: PrintWriter) : BuiltInsSourceGenerator(out) {
private val binaryOperators: List<String> = listOf("plus", "minus", "times", "div", "mod")
private val unaryOperators: List<String> = listOf("inc", "dec", "plus", "minus")
private val shiftOperators: List<String> = listOf("shl", "shr", "ushr")
+1 -1
View File
@@ -1,2 +1,2 @@
val x : <ref>Int?
//kotlin/Numbers.kt:Int
//kotlin/Primitives.kt:Int
+1 -1
View File
@@ -1,2 +1,2 @@
val x = 2.0 <ref>* 3.0
//kotlin/Numbers.kt:times
//kotlin/Primitives.kt:times