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

Allow unsigned integers overflow values of corresponding signed numbers

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2018-05-29 03:00:39 +03:00
parent 0da3ae328e
commit 5b5d9dd5a0
11 changed files with 138 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+22 -11
View File
@@ -941,11 +941,17 @@ private class ConstantExpressionEvaluatorVisitor(
if (integerValue != null) {
return integerValue.wrap(parameters)
}
return when (value) {
value.toInt().toLong() ->
if (parameters.isUnsigned) UIntValue(value.toInt()) else IntValue(value.toInt())
else ->
if (parameters.isUnsigned) ULongValue(value) else LongValue(value)
return if (parameters.isUnsigned) {
when (value) {
value.toInt().fromUIntToLong() -> UIntValue(value.toInt())
else -> ULongValue(value)
}
} else {
when (value) {
value.toInt().toLong() -> IntValue(value.toInt())
else -> LongValue(value)
}
}.wrap(parameters)
}
@@ -975,14 +981,19 @@ private fun parseNumericLiteral(text: String, type: IElementType): Any? {
}
private fun parseLong(text: String): Long? {
try {
fun substringSuffix(s: String) = if (hasLongSuffix(text) || hasUnsignedSuffix(text)) s.substring(0, s.length - 1) else s
fun parseLong(text: String, radix: Int) = java.lang.Long.parseLong(substringSuffix(text), radix)
return try {
val hasUnsignedSuffix = hasUnsignedSuffix(text)
val hasLongSuffix = hasLongSuffix(text)
val textWithoutSuffix = if (hasUnsignedSuffix || hasLongSuffix) text.substring(0, text.length - 1) else text
val (number, radix) = extractRadix(textWithoutSuffix)
val (number, radix) = extractRadix(text)
return parseLong(number, radix)
if (hasUnsignedSuffix) {
java.lang.Long.parseUnsignedLong(number, radix)
} else {
java.lang.Long.parseLong(number, radix)
}
} catch (e: NumberFormatException) {
return null
null
}
}