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

Unextend Char from Number

Browse Source 
This is impossible to achieve on JVM, where java/lang/Character does not extend
java/lang/Number
This commit is contained in:
Alexander Udalov
2013-12-03 21:44:13 +04:00
parent 77d8a745bd
commit 1c3383c811
36 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes.txt
+8 -8
View File
@@ -166,7 +166,7 @@ public final class ByteRange : jet.Range<jet.Byte>, jet.Progression<jet.Byte> {
}
}
public final class Char : jet.Number, jet.Comparable<jet.Char> {
public final class Char : jet.Hashable, jet.Comparable<jet.Char> {
/*primary*/ private constructor Char()
public final fun compareTo(/*0*/ other: jet.Byte): jet.Int
public open override /*1*/ fun compareTo(/*0*/ other: jet.Char): jet.Int
@@ -213,13 +213,13 @@ public final class Char : jet.Number, jet.Comparable<jet.Char> {
public final fun times(/*0*/ other: jet.Int): jet.Int
public final fun times(/*0*/ other: jet.Long): jet.Long
public final fun times(/*0*/ other: jet.Short): jet.Int
public open override /*1*/ fun toByte(): jet.Byte
public open override /*1*/ fun toChar(): jet.Char
public open override /*1*/ fun toDouble(): jet.Double
public open override /*1*/ fun toFloat(): jet.Float
public open override /*1*/ fun toInt(): jet.Int
public open override /*1*/ fun toLong(): jet.Long
public open override /*1*/ fun toShort(): jet.Short
public open fun toByte(): jet.Byte
public open fun toChar(): jet.Char
public open fun toDouble(): jet.Double
public open fun toFloat(): jet.Float
public open fun toInt(): jet.Int
public open fun toLong(): jet.Long
public open fun toShort(): jet.Short
}
public final class CharArray {
compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
+11
View File
@@ -0,0 +1,11 @@
fun foo(n: Number) = n
fun test() {
foo(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>'a'<!>)
val c = 'c'
foo(<!TYPE_MISMATCH!>c<!>)
val d: Char? = 'd'
foo(<!TYPE_MISMATCH!>d<!>!!)
}