From 07381b765f3121fa192b6f3fb3f47d9c47f6f055 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 10 Mar 2015 16:48:40 +0100
Subject: [PATCH] rename Numbers.kt to Primitives.kt as it now contains Char
 which is not a number

---
 compiler/testData/builtin-classes.txt          | 18 +++++++++++-------
 .../kotlin/{Numbers.kt => Primitives.kt}       |  0
 .../generators/builtins/generateBuiltIns.kt    |  2 +-
 .../builtins/{numbers.kt => primitives.kt}     |  2 +-
 idea/testData/resolve/builtins/int.kt          |  2 +-
 idea/testData/resolve/builtins/times.kt        |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)
 rename core/builtins/native/kotlin/{Numbers.kt => Primitives.kt} (100%)
 rename generators/src/org/jetbrains/kotlin/generators/builtins/{numbers.kt => primitives.kt} (98%)

diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index b2289c4d83b..2cbbd9823b7 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -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 {
diff --git a/core/builtins/native/kotlin/Numbers.kt b/core/builtins/native/kotlin/Primitives.kt
similarity index 100%
rename from core/builtins/native/kotlin/Numbers.kt
rename to core/builtins/native/kotlin/Primitives.kt
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
index 7074b9d9d60..e9dc6d2b7c8 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
@@ -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) }
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/numbers.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
similarity index 98%
rename from generators/src/org/jetbrains/kotlin/generators/builtins/numbers.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
index 8f6976094d2..147fdbf35a2 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/numbers.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
@@ -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")
diff --git a/idea/testData/resolve/builtins/int.kt b/idea/testData/resolve/builtins/int.kt
index c4aac77605a..21d676a3a77 100644
--- a/idea/testData/resolve/builtins/int.kt
+++ b/idea/testData/resolve/builtins/int.kt
@@ -1,2 +1,2 @@
 val x : <ref>Int?
-//kotlin/Numbers.kt:Int
\ No newline at end of file
+//kotlin/Primitives.kt:Int
\ No newline at end of file
diff --git a/idea/testData/resolve/builtins/times.kt b/idea/testData/resolve/builtins/times.kt
index 81669e96595..77dcea17bcd 100644
--- a/idea/testData/resolve/builtins/times.kt
+++ b/idea/testData/resolve/builtins/times.kt
@@ -1,2 +1,2 @@
 val x = 2.0 <ref>* 3.0
-//kotlin/Numbers.kt:times
\ No newline at end of file
+//kotlin/Primitives.kt:times
\ No newline at end of file