diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 23:25:35 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-02 08:36:16 +0200 |
commit | 7952cd1651b6ed1fe0cd68198e49cf90423242d8 (patch) | |
tree | 301b93667d810ff28f122f17252f8c4940da2147 /src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala | |
parent | 128ac65991210fee3d5e273e30c9f31322e1a585 (diff) | |
download | scala-7952cd1651b6ed1fe0cd68198e49cf90423242d8.tar.gz scala-7952cd1651b6ed1fe0cd68198e49cf90423242d8.tar.bz2 scala-7952cd1651b6ed1fe0cd68198e49cf90423242d8.zip |
Fix comparisons involving NaN
Floating point comparisons involving NaN should always return false,
except for !=. Fixes a regression introduced by #4963.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala index 00771b6b8c..dfd5b07a3b 100644 --- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala +++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala @@ -61,8 +61,8 @@ abstract class ScalaPrimitives { final val NE = 43 // x != y final val LT = 44 // x < y final val LE = 45 // x <= y - final val GE = 46 // x > y - final val GT = 47 // x >= y + final val GT = 46 // x > y + final val GE = 47 // x >= y // Boolean unary operations final val ZNOT = 50 // !x |