summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2017-01-17 01:32:05 -0800
committerSom Snytt <som.snytt@gmail.com>2017-01-18 00:25:04 -0800
commita262aaba15effce48fdba95910bef367f89cafca (patch)
tree59b7f799a64a9215f8b21153c6f6038c8b92f004 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
parent827d69d48e96d9add75ce19e06b374610784c936 (diff)
downloadscala-a262aaba15effce48fdba95910bef367f89cafca.tar.gz
scala-a262aaba15effce48fdba95910bef367f89cafca.tar.bz2
scala-a262aaba15effce48fdba95910bef367f89cafca.zip
SI-10148 Follow Java for float literals
Use `Float.parseFloat` instead of converting from Double. Error when a value rounds to zero.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index cf66e0a7dc..d7d0f01741 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -1263,8 +1263,8 @@ self =>
case CHARLIT => in.charVal
case INTLIT => in.intVal(isNegated).toInt
case LONGLIT => in.intVal(isNegated)
- case FLOATLIT => in.floatVal(isNegated).toFloat
- case DOUBLELIT => in.floatVal(isNegated)
+ case FLOATLIT => in.floatVal(isNegated)
+ case DOUBLELIT => in.doubleVal(isNegated)
case STRINGLIT | STRINGPART => in.strVal.intern()
case TRUE => true
case FALSE => false