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

Rewrite toInt and similar expression like unary expressions

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2013-11-08 17:13:46 +04:00
parent 96dc8b42bb
commit 08d80bbb16
2 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/evaluate/constantExpressionEvaluator.kt
+56
View File
@@ -84,6 +84,62 @@ private val unaryOperations = hashMapOf<UnaryOperation<*>, (Any?) -> Any>(
uOp(BYTE, "plus", { a -> a.plus() }), uOp(BYTE, "plus", { a -> a.plus() }),
uOp(CHAR, "plus", { a -> a.plus() }), uOp(CHAR, "plus", { a -> a.plus() }),
uOp(DOUBLE, "toDouble", { a -> a.toDouble() }),
uOp(FLOAT, "toDouble", { a -> a.toDouble() }),
uOp(LONG, "toDouble", { a -> a.toDouble() }),
uOp(INT, "toDouble", { a -> a.toDouble() }),
uOp(SHORT, "toDouble", { a -> a.toDouble() }),
uOp(BYTE, "toDouble", { a -> a.toDouble() }),
uOp(CHAR, "toDouble", { a -> a.toDouble() }),
uOp(DOUBLE, "toFloat", { a -> a.toFloat() }),
uOp(FLOAT, "toFloat", { a -> a.toFloat() }),
uOp(LONG, "toFloat", { a -> a.toFloat() }),
uOp(INT, "toFloat", { a -> a.toFloat() }),
uOp(SHORT, "toFloat", { a -> a.toFloat() }),
uOp(BYTE, "toFloat", { a -> a.toFloat() }),
uOp(CHAR, "toFloat", { a -> a.toFloat() }),
uOp(DOUBLE, "toLong", { a -> a.toLong() }),
uOp(FLOAT, "toLong", { a -> a.toLong() }),
uOp(LONG, "toLong", { a -> a.toLong() }),
uOp(INT, "toLong", { a -> a.toLong() }),
uOp(SHORT, "toLong", { a -> a.toLong() }),
uOp(BYTE, "toLong", { a -> a.toLong() }),
uOp(CHAR, "toLong", { a -> a.toLong() }),
uOp(DOUBLE, "toInt", { a -> a.toInt() }),
uOp(FLOAT, "toInt", { a -> a.toInt() }),
uOp(LONG, "toInt", { a -> a.toInt() }),
uOp(INT, "toInt", { a -> a.toInt() }),
uOp(SHORT, "toInt", { a -> a.toInt() }),
uOp(BYTE, "toInt", { a -> a.toInt() }),
uOp(CHAR, "toInt", { a -> a.toInt() }),
uOp(DOUBLE, "toChar", { a -> a.toChar() }),
uOp(FLOAT, "toChar", { a -> a.toChar() }),
uOp(LONG, "toChar", { a -> a.toChar() }),
uOp(INT, "toChar", { a -> a.toChar() }),
uOp(SHORT, "toChar", { a -> a.toChar() }),
uOp(BYTE, "toChar", { a -> a.toChar() }),
uOp(CHAR, "toChar", { a -> a.toChar() }),
uOp(DOUBLE, "toShort", { a -> a.toShort() }),
uOp(FLOAT, "toShort", { a -> a.toShort() }),
uOp(LONG, "toShort", { a -> a.toShort() }),
uOp(INT, "toShort", { a -> a.toShort() }),
uOp(SHORT, "toShort", { a -> a.toShort() }),
uOp(BYTE, "toShort", { a -> a.toShort() }),
uOp(CHAR, "toShort", { a -> a.toShort() }),
uOp(DOUBLE, "toByte", { a -> a.toByte() }),
uOp(FLOAT, "toByte", { a -> a.toByte() }),
uOp(LONG, "toByte", { a -> a.toByte() }),
uOp(INT, "toByte", { a -> a.toByte() }),
uOp(SHORT, "toByte", { a -> a.toByte() }),
uOp(BYTE, "toByte", { a -> a.toByte() }),
uOp(CHAR, "toByte", { a -> a.toByte() }),
uOp(BOOLEAN, "not", { a -> a.not() }) uOp(BOOLEAN, "not", { a -> a.not() })
) )
compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt
-31
View File
@@ -30,37 +30,6 @@ public fun resolveCallToCompileTimeValue(
expectedType: JetType expectedType: JetType
): CompileTimeConstant<*>? { ): CompileTimeConstant<*>? {
if (arguments.isEmpty()) { if (arguments.isEmpty()) {
val value = receiverValue.getValue()
val toTypeConstant = when (value) {
is Number -> {
when(callName) {
OperatorConventions.DOUBLE -> DoubleValue(value.toDouble())
OperatorConventions.FLOAT -> FloatValue(value.toFloat())
OperatorConventions.LONG -> LongValue(value.toLong())
OperatorConventions.SHORT -> ShortValue(value.toShort())
OperatorConventions.BYTE -> ByteValue(value.toByte())
OperatorConventions.INT -> IntValue(value.toInt())
OperatorConventions.CHAR -> CharValue(value.toInt().toChar())
else -> null
}
}
is Char -> {
when(callName) {
OperatorConventions.DOUBLE -> DoubleValue(value.toChar().toDouble())
OperatorConventions.FLOAT -> FloatValue(value.toChar().toFloat())
OperatorConventions.LONG -> LongValue(value.toChar().toLong())
OperatorConventions.SHORT -> ShortValue(value.toChar().toShort())
OperatorConventions.BYTE -> ByteValue(value.toChar().toByte())
OperatorConventions.INT -> IntValue(value.toChar().toInt())
OperatorConventions.CHAR -> CharValue(value.toChar())
else -> null
}
}
else -> null
}
if (toTypeConstant != null) {
return toTypeConstant
}
val result = evaluateUnaryExpression(receiverValue, callName) val result = evaluateUnaryExpression(receiverValue, callName)
if (result == null) { if (result == null) {
return null return null