diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-10-26 17:29:12 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-10-26 17:29:12 +0000 |
| commit | f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e (patch) | |
| tree | f215dcc233074a2047264c955eca26a0bf76cb74 /test | |
| parent | e97eb8f50e2ae30c3a651b7f975282659a57e817 (diff) | |
| download | scala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.tar.gz scala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.tar.bz2 scala-f5aa270473e0c335bd1a7a6b7f10f87b54a5d45e.zip | |
added/modified check files
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm/serialization.check | 8 | ||||
| -rw-r--r-- | test/files/neg/bug987.check | 6 | ||||
| -rw-r--r-- | test/files/neg/t0152.check | 6 | ||||
| -rw-r--r-- | test/files/run/bug1074.check | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 7bd2a1524f..144e31603f 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -42,8 +42,8 @@ x = Map(42 -> FortyTwo) y = Map(42 -> FortyTwo) x equals y: true - y equals x: true -x = TreeSet(0, 2) -y = TreeSet(0, 2) +x = Set(0, 2) +y = Set(0, 2) x equals y: true - y equals x: true x = ArrayBuffer(one, two) @@ -58,8 +58,8 @@ x = Set(0, 8, 9) y = Set(0, 8, 9) x equals y: true - y equals x: true -x = HashSet(layers, buffers, title) -y = HashSet(layers, buffers, title) +x = Set(layers, buffers, title) +y = Set(layers, buffers, title) x equals y: true - y equals x: true x = LinkedList(2, 3) diff --git a/test/files/neg/bug987.check b/test/files/neg/bug987.check index 5da1e1cbe3..4cad622ab8 100644 --- a/test/files/neg/bug987.check +++ b/test/files/neg/bug987.check @@ -1,16 +1,16 @@ bug987.scala:15: error: illegal inheritance; class E inherits different type instances of trait B: -B[C] and B[D] +B[D] and B[C] class E extends D ^ bug987.scala:20: error: illegal inheritance; class F inherits different type instances of trait B: -B[C] and B[D] +B[D] and B[C] class F extends D ^ bug987.scala:25: error: illegal inheritance; class D inherits different type instances of trait B: -B[C] and B[D] +B[D] and B[C] abstract class D extends C with B[D] {} ^ bug987.scala:25: error: type arguments [D] do not conform to trait B's type parameter bounds [T <: B[T]] diff --git a/test/files/neg/t0152.check b/test/files/neg/t0152.check new file mode 100644 index 0000000000..84f78dc83c --- /dev/null +++ b/test/files/neg/t0152.check @@ -0,0 +1,6 @@ +t0152.scala:10: error: illegal inheritance; + object boom inherits different type instances of class Value: +Value[Int] and Value[java.lang.String] + object boom extends Value[java.lang.String]("foo") with PlusOne + ^ +one error found diff --git a/test/files/run/bug1074.check b/test/files/run/bug1074.check index dfbc28f62f..7dc074205c 100644 --- a/test/files/run/bug1074.check +++ b/test/files/run/bug1074.check @@ -1,3 +1,3 @@ -q0 = HashSet(kl, jk, fg, ef, gh, a, cd, de, hj, b, lm, mn) -q1 = HashSet() 0 -q2 = HashSet() 0 +q0 = Set(kl, jk, fg, ef, gh, a, cd, de, hj, b, lm, mn) +q1 = Set() 0 +q2 = Set() 0 |