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

Fix for KT-14604 J2K Yet another floating point with exponent format

Browse Source
This commit is contained in:
Simon Ogorodnik
2016-11-07 20:05:16 +03:00
parent 7e82dd9adc
commit 2be4800307
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+5 -3
View File
@@ -274,15 +274,17 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
val typeStr = type.canonicalText
if (typeStr == "double") {
text = text.replace("d", "", true)
.replace(".e", "e", true)
if (!text.contains(".") && !text.contains("e", true))
text += "."
if (text.endsWith(".")) {
if (text.endsWith("."))
text += "0"
}
}
if (typeStr == "float") {
text = text.replace(".f", "f", true).replace("F", "f")
text = text.replace(".f", "f", true)
.replace("F", "f")
.replace(".e", "e", true)
}
if (typeStr == "long") {
j2k/testData/fileOrElement/literalExpression/exponentDouble.java
Vendored
+2 -1
View File
@@ -4,6 +4,7 @@ public class Exponent {
5E5, +5E5, -5E5, 5E+5, 5E-5,
2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5,
2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5,
5e5f, 5e5F, 5e5d, 5e5D
5e5f, 5e5F, 5e5d, 5e5D,
5.e-6, 7.e+8, 9.E-1, 2.E+3, 4.e5, 6.E7
};
}
j2k/testData/fileOrElement/literalExpression/exponentDouble.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
class Exponent {
private val doubles = doubleArrayOf(5e5, +5e5, -5e5, 5e+5, 5e-5, 5E5, +5E5, -5E5, 5E+5, 5E-5, 2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5, 2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5, 5e5, 5e5, 5e5, 5e5)
private val doubles = doubleArrayOf(5e5, +5e5, -5e5, 5e+5, 5e-5, 5E5, +5E5, -5E5, 5E+5, 5E-5, 2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5, 2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5, 5e5, 5e5, 5e5, 5e5, 5e-6, 7e+8, 9e-1, 2e+3, 4e5, 6e7)
}
j2k/testData/fileOrElement/literalExpression/exponentFloat.java
Vendored
+2 -1
View File
@@ -4,6 +4,7 @@ public class Exponent {
5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f,
2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f,
2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f,
5e5f, 5e5F
5e5f, 5e5F,
5.e-6f, 7.e+8f, 9.E-1f, 2.E+3f, 4.e5f, 6.E7f
};
}
j2k/testData/fileOrElement/literalExpression/exponentFloat.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
class Exponent {
private val floats = floatArrayOf(5e5f, +5e5f, -5e5f, 5e+5f, 5e-5f, 5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f, 2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f, 2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f, 5e5f, 5e5f)
private val floats = floatArrayOf(5e5f, +5e5f, -5e5f, 5e+5f, 5e-5f, 5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f, 2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f, 2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f, 5e5f, 5e5f, 5e-6f, 7e+8f, 9e-1f, 2e+3f, 4e5f, 6e7f)
}