Change return type of Char plus Int and Char minus Int binary operations.

JS: Remove unnecessary intrinsic binary operation patterns, adjust intrinsics for binary operations with char.
This commit is contained in:
Ilya Gorbunov
2015-07-02 19:31:50 +03:00
parent 39b27751df
commit 1605027b19
6 changed files with 26 additions and 41 deletions
+2 -2
View File
@@ -181,8 +181,8 @@ public final class Char : kotlin.Comparable<kotlin.Char> {
public final fun dec(): kotlin.Char
public final fun inc(): kotlin.Char
public final fun minus(/*0*/ other: kotlin.Char): kotlin.Int
kotlin.deprecated(value = "This operation will change return type to Char in M13. Either call toInt or toChar on return value or convert Char operand to Int.") public final fun minus(/*0*/ other: kotlin.Int): kotlin.Int
kotlin.deprecated(value = "This operation will change return type to Char in M13. Either call toInt or toChar on return value or convert Char operand to Int.") public final fun plus(/*0*/ other: kotlin.Int): kotlin.Int
public final fun minus(/*0*/ other: kotlin.Int): kotlin.Char
public final fun plus(/*0*/ other: kotlin.Int): kotlin.Char
public final fun rangeTo(/*0*/ other: kotlin.Char): kotlin.CharRange
public open fun toByte(): kotlin.Byte
public open fun toChar(): kotlin.Char
@@ -151,8 +151,8 @@ private val binaryOperations: HashMap<BinaryOperationKey<*, *>, Pair<Function2<A
binaryOperation(BYTE, ANY, "equals", { a, b -> a.equals(b) }, emptyBinaryFun),
binaryOperation(CHAR, CHAR, "minus", { a, b -> a.minus(b) }, emptyBinaryFun),
binaryOperation(CHAR, CHAR, "compareTo", { a, b -> a.compareTo(b) }, emptyBinaryFun),
binaryOperation(CHAR, INT, "minus", { a, b -> a.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>minus<!>(b) }, emptyBinaryFun),
binaryOperation(CHAR, INT, "plus", { a, b -> a.<!DEPRECATED_SYMBOL_WITH_MESSAGE!>plus<!>(b) }, emptyBinaryFun),
binaryOperation(CHAR, INT, "minus", { a, b -> a.minus(b) }, emptyBinaryFun),
binaryOperation(CHAR, INT, "plus", { a, b -> a.plus(b) }, emptyBinaryFun),
binaryOperation(CHAR, ANY, "equals", { a, b -> a.equals(b) }, emptyBinaryFun),
binaryOperation(DOUBLE, BYTE, "minus", { a, b -> a.minus(b) }, emptyBinaryFun),
binaryOperation(DOUBLE, DOUBLE, "minus", { a, b -> a.minus(b) }, emptyBinaryFun),