From 08b7399ef4a2e01ef20259ab04512e0e20f2b04b Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sun, 3 Jun 2012 21:41:23 +0200 Subject: Revert "#653 -- no lub for statement exprs' types" I should not have merged this pull request yet. I didn't notice we didn't have a full successful run of the test suite. It looks like it breaks test/files/continuations-neg/lazy.scala and given the pending amount of changes, I prefer to have a stable master. This reverts commit 037d3dcbc5896864aec0f9121eeda23fcc4cd610. --- test/files/neg/checksensible.check | 4 ++-- test/files/neg/checksensible.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 772d58322d..23af94180a 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -77,8 +77,8 @@ checksensible.scala:63: error: comparing a fresh object using `!=' will always y new Exception() != new Exception() ^ checksensible.scala:66: error: comparing values of types Int and Null using `==' will always yield false - val dummy = if (foo.length == null) "plante" else "plante pas" - ^ + if (foo.length == null) "plante" else "plante pas" + ^ checksensible.scala:71: error: comparing values of types Bip and Bop using `==' will always yield false (x1 == x2) ^ diff --git a/test/files/neg/checksensible.scala b/test/files/neg/checksensible.scala index 15a9b6d9b6..27ee908153 100644 --- a/test/files/neg/checksensible.scala +++ b/test/files/neg/checksensible.scala @@ -63,7 +63,7 @@ class EqEqRefTest { new Exception() != new Exception() val foo: Array[String] = Array("1","2","3") - val dummy = if (foo.length == null) "plante" else "plante pas" + if (foo.length == null) "plante" else "plante pas" // final classes with default equals val x1 = new Bip -- cgit v1.2.3