Merge pull request #1271 from retronym/ticket/6331

SI-6331 deconst If type / refine equality of floating point Constant types.

4 files changed, 144 insertions, 0 deletions

diff --git a/test/files/run/t6331.check b/test/files/run/t6331.check
new file mode 100644
index 0000000000..9bf3f7823a
--- /dev/null
+++ b/test/files/run/t6331.check
@@ -0,0 +1,23 @@
+          () == ()
+        true == true
+        true != false
+       false != true
+    0.toByte == 0.toByte
+    0.toByte != 1.toByte
+   0.toShort == 0.toShort
+   0.toShort != 1.toShort
+           0 == 0
+           0 != 1
+          0L == 0L
+          0L != 1L
+        0.0f == 0.0f
+        0.0f != -0.0f
+       -0.0f != 0.0f
+        NaNf == NaNf
+        0.0d == 0.0d
+        0.0d != -0.0d
+       -0.0d != 0.0d
+        NaNd == NaNd
+           0 != 0.0d
+           0 != 0L
+        0.0d != 0.0f
diff --git a/test/files/run/t6331.scala b/test/files/run/t6331.scala
new file mode 100644
index 0000000000..4e43a7686e
--- /dev/null
+++ b/test/files/run/t6331.scala
@@ -0,0 +1,71 @@
+import scala.tools.partest._
+import java.io._
+import scala.tools.nsc._
+import scala.tools.nsc.util.CommandLineParser
+import scala.tools.nsc.{Global, Settings, CompilerCommand}
+import scala.tools.nsc.reporters.ConsoleReporter
+
+// Test of Constant#equals, which must must account for floating point intricacies.
+object Test extends DirectTest {
+
+  override def code = ""
+
+  override def show() {
+    val global = newCompiler()
+    import global._
+
+    def check(c1: Any, c2: Any): Unit = {
+      val const1 = Constant(c1)
+      val const2 = Constant(c2)
+      val equal = const1 == const2
+      def show(a: Any) = "" + a + (a match {
+        case _: Byte   => ".toByte"
+        case _: Short  => ".toShort"
+        case _: Long   => "L"
+        case _: Float  => "f"
+        case _: Double => "d"
+        case _ => ""
+      })
+      val op = if (equal) "==" else "!="
+      println(f"${show(c1)}%12s $op ${show(c2)}")
+
+      val hash1 = const1.hashCode
+      val hash2 = const2.hashCode
+      val hashesEqual = hash1 == hash2
+      val hashBroken = equal && !hashesEqual
+      if (hashBroken) println(f"$hash1%12s != $hash2 // hash codes differ for equal objects!!")
+    }
+
+    check((), ())
+
+    check(true, true)
+    check(true, false)
+    check(false, true)
+
+    check(0.toByte, 0.toByte)
+    check(0.toByte, 1.toByte)
+
+    check(0.toShort, 0.toShort)
+    check(0.toShort, 1.toShort)
+
+    check(0, 0)
+    check(0, 1)
+
+    check(0L, 0L)
+    check(0L, 1L)
+
+    check(0f, 0f)
+    check(0f, -0f)
+    check(-0f, 0f)
+    check(Float.NaN, Float.NaN)
+
+    check(0d, 0d)
+    check(0d, -0d)
+    check(-0d, 0d)
+    check(Double.NaN, Double.NaN)
+
+    check(0, 0d)
+    check(0, 0L)
+    check(0d, 0f)
+  }
+}
diff --git a/test/files/run/t6331b.check b/test/files/run/t6331b.check
new file mode 100644
index 0000000000..6ca09e3814
--- /dev/null
+++ b/test/files/run/t6331b.check
@@ -0,0 +1,30 @@
+trace> if (Test.this.t)
+  -0.0
+else
+  0.0
+res: Double = -0.0
+
+trace> if (Test.this.t)
+  0.0
+else
+  -0.0
+res: Double = 0.0
+
+trace> Test.this.intercept.apply[Any](if (scala.this.Predef.???)
+  -0.0
+else
+  0.0)
+res: Any = class scala.NotImplementedError
+
+trace> Test.this.intercept.apply[Any](if (scala.this.Predef.???)
+  0.0
+else
+  0.0)
+res: Any = class scala.NotImplementedError
+
+trace> Test.this.intercept.apply[Any](if (scala.this.Predef.???)
+  ()
+else
+  ())
+res: Any = class scala.NotImplementedError
+
diff --git a/test/files/run/t6331b.scala b/test/files/run/t6331b.scala
new file mode 100644
index 0000000000..f966abea51
--- /dev/null
+++ b/test/files/run/t6331b.scala
@@ -0,0 +1,20 @@
+import scala.tools.partest._
+import java.io._
+import scala.tools.nsc._
+import scala.tools.nsc.util.CommandLineParser
+import scala.tools.nsc.{Global, Settings, CompilerCommand}
+import scala.tools.nsc.reporters.ConsoleReporter
+
+import scala.tools.partest.trace
+import scala.util.control.Exception._
+
+
+object Test extends App {
+  def intercept = allCatch.withApply(_.getClass)
+  val t: Boolean = true
+  trace(if (t) -0d else 0d)
+  trace(if (t) 0d else -0d)
+  trace(intercept(if (???) -0d else 0d))
+  trace(intercept(if (???) 0d else 0d))
+  trace(intercept(if (???) () else ()))
+}