summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorilyas <ilyas@epfl.ch>2010-02-05 16:53:41 +0000
committerilyas <ilyas@epfl.ch>2010-02-05 16:53:41 +0000
commitf203f3adfd63936ccfa71d61608e95f05ae800b0 (patch)
tree25d258ba2fd35fec7bb53fdbe5ca98698983cda7 /test/files
parent96dc0e44e8f1610463e38c05f647987c336b5093 (diff)
downloadscala-f203f3adfd63936ccfa71d61608e95f05ae800b0.tar.gz
scala-f203f3adfd63936ccfa71d61608e95f05ae800b0.tar.bz2
scala-f203f3adfd63936ccfa71d61608e95f05ae800b0.zip
some scalap tweaks
Diffstat (limited to 'test/files')
-rw-r--r--test/files/scalap/classWithExistential/result.test2
-rw-r--r--test/files/scalap/covariantParam/result.test4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
index 243f51e2ad..37767c0904 100644
--- a/test/files/scalap/classWithExistential/result.test
+++ b/test/files/scalap/classWithExistential/result.test
@@ -1,4 +1,4 @@
class ClassWithExistential extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
- def foo[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ }
+ def foo[A, B] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ }
}
diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
index ce480ee0cd..8acd9b497a 100644
--- a/test/files/scalap/covariantParam/result.test
+++ b/test/files/scalap/covariantParam/result.test
@@ -1,4 +1,4 @@
-class CovariantParam[+A >: scala.Nothing <: scala.Any] extends java.lang.Object with scala.ScalaObject {
+class CovariantParam[+A] extends java.lang.Object with scala.ScalaObject {
def this() = { /* compiled code */ }
- def foo[A >: scala.Nothing <: scala.Any](a : A) : scala.Int = { /* compiled code */ }
+ def foo[A](a : A) : scala.Int = { /* compiled code */ }
}