summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-04-23 13:00:25 +0000
committerMartin Odersky <odersky@gmail.com>2009-04-23 13:00:25 +0000
commitaaf919859f5dfa295aac8846bc109ceb87984a7e (patch)
tree7b117c12aec2ee0e52a011867f8eb0eaea819b54 /test/files
parent4ae08113a6a1708ac53bd84b938c2a233df80476 (diff)
downloadscala-aaf919859f5dfa295aac8846bc109ceb87984a7e.tar.gz
scala-aaf919859f5dfa295aac8846bc109ceb87984a7e.tar.bz2
scala-aaf919859f5dfa295aac8846bc109ceb87984a7e.zip
some small changes to implicits handling, exist...
some small changes to implicits handling, existential abstraction, type parameter bounds checking
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/bug608.check2
-rw-r--r--test/files/run/constrained-types.check8
2 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/bug608.check b/test/files/neg/bug608.check
index 8337c513ff..4e8eb4d709 100644
--- a/test/files/neg/bug608.check
+++ b/test/files/neg/bug608.check
@@ -1,6 +1,6 @@
bug608.scala:16: error: type mismatch;
found : (a) => a
- required: (_1.a) => ? where val _1: hs{type s = hs; type a = ha}
+ required: (ha) => ?
= g(f(x).bimap(id))
^
one error found
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check
index d3c32b7a02..6ab12ad34c 100644
--- a/test/files/run/constrained-types.check
+++ b/test/files/run/constrained-types.check
@@ -69,11 +69,11 @@ four: java.lang.String = four
-----
val four2 = m(four) // should have an existential bound
-four2: String @Annot(x) forSome { val x: java.lang.String } = four
+four2: java.lang.String @Annot(x) forSome { val x: java.lang.String } = four
-----
val four3 = four2 // should have the same type as four2
-four3: String @Annot(x) forSome { val x: java.lang.String } = four
+four3: java.lang.String @Annot(x) forSome { val x: java.lang.String } = four
-----
val stuff = m("stuff") // should not crash
@@ -93,7 +93,7 @@ def m = {
val y : String @Annot(x) = x
y
} // x should be existentially bound
-m: String @Annot(x) forSome { val x: java.lang.String }
+m: java.lang.String @Annot(x) forSome { val x: java.lang.String }
-----
def n(y: String) = {
@@ -105,7 +105,7 @@ def n(y: String) = {
}
m("stuff".stripMargin)
} // x should be existentially bound
-n: (String)String @Annot(x) forSome { val x: String }
+n: (String)java.lang.String @Annot(x) forSome { val x: String }
-----
class rep extends Annotation