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

KT-1895 Make it possible to pass 1.0 as Float without explicit casting

Browse Source 
#KT-1895 fixed
This commit is contained in:
Evgeny Gerashchenko
2013-01-27 01:57:02 +04:00
parent 0b1fe9c611
commit 18b5495a8c
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantResolver.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class CompileTimeConstantResolver {
} }
else if (JetTypeChecker.INSTANCE.isSubtypeOf(builtIns.getFloatType(), expectedType)) { else if (JetTypeChecker.INSTANCE.isSubtypeOf(builtIns.getFloatType(), expectedType)) {
try { try {
return new DoubleValue(Float.parseFloat(text)); return new FloatValue(Float.parseFloat(text));
} }
catch (NumberFormatException e) { catch (NumberFormatException e) {
return OUT_OF_RANGE; return OUT_OF_RANGE;
compiler/testData/diagnostics/tests/Constants.kt
+24 -7
View File
@@ -1,8 +1,25 @@
fun test() { fun test() {
1 : Byte 1: Byte
1 : Int 1: Short
<!TYPE_MISMATCH!>1<!> : Double 1: Int
1 <!USELESS_CAST!>as<!> Byte 1: Long
1 <!USELESS_CAST!>as<!> Int
<!ERROR_COMPILE_TIME_VALUE!>1<!> <!CAST_NEVER_SUCCEEDS!>as<!> Double 0x001: Long
} 0b001: Int
0.1: Double
0.1: Float
1e5: Double
1e-5: Float
<!TYPE_MISMATCH!>1<!>: Double
<!TYPE_MISMATCH!>1<!>: Float
1 <!USELESS_CAST!>as<!> Byte
1 <!USELESS_CAST!>as<!> Int
0xff <!USELESS_CAST!>as<!> Long
<!ERROR_COMPILE_TIME_VALUE!>1.1<!> <!CAST_NEVER_SUCCEEDS!>as<!> Int
<!TYPE_MISMATCH!>1.1<!>: Int
}