diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-03 10:12:10 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-03 10:12:10 -0700 |
| commit | 8aa1d1cd210bb205e25f7618f038d646a2788fa1 (patch) | |
| tree | ea71d7647b8940e8cff31b0b6dcd630b726e8c02 /test | |
| parent | 6ed018b2e9ca4bf0696f9d692d93a67d6bad4c5f (diff) | |
| parent | 037d3dcbc5896864aec0f9121eeda23fcc4cd610 (diff) | |
| download | scala-8aa1d1cd210bb205e25f7618f038d646a2788fa1.tar.gz scala-8aa1d1cd210bb205e25f7618f038d646a2788fa1.tar.bz2 scala-8aa1d1cd210bb205e25f7618f038d646a2788fa1.zip | |
Merge pull request #653 from dragos/issue/skip-lub-in-blocks
Don't compute least upper bounds for if-like exprs in statement position
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/checksensible.check | 4 | ||||
| -rw-r--r-- | test/files/neg/checksensible.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 23af94180a..772d58322d 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
- if (foo.length == null) "plante" else "plante pas"
- ^
+ val dummy = 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 27ee908153..15a9b6d9b6 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") - if (foo.length == null) "plante" else "plante pas" + val dummy = if (foo.length == null) "plante" else "plante pas" // final classes with default equals val x1 = new Bip |