summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-05-19 11:12:09 +0000
committerMartin Odersky <odersky@gmail.com>2003-05-19 11:12:09 +0000
commitf7f15007686e355a2d8668bf890603be90810e29 (patch)
treebdb8a9a813fd1a8b32bc20b6988eafe16de4a2f8 /test/files
parent2300aac76adab6945ca2d2e3cb15320621a76150 (diff)
downloadscala-f7f15007686e355a2d8668bf890603be90810e29.tar.gz
scala-f7f15007686e355a2d8668bf890603be90810e29.tar.bz2
scala-f7f15007686e355a2d8668bf890603be90810e29.zip
*** empty log message ***
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/infer.scala10
-rw-r--r--test/files/pos/patterns.scala4
-rw-r--r--test/files/pos/patterns1.scala4
-rw-r--r--test/files/pos/patterns2.scala2
4 files changed, 10 insertions, 10 deletions
diff --git a/test/files/pos/infer.scala b/test/files/pos/infer.scala
index 7e88585ae7..7ff49ff70f 100644
--- a/test/files/pos/infer.scala
+++ b/test/files/pos/infer.scala
@@ -1,10 +1,10 @@
module test {
- class List[a] {
- def ::(x: a): List[a] = new Cons(x, this);
+ class List[+a] {
+ def ::[b >: a](x: b): List[b] = new Cons(x, this);
}
- case class Cons[a](x: a, xs: List[a]) extends List[a];
- case class Nil[a] extends List[a];
- def nil[a]: Nil[a] = new Nil[a];
+ case class Cons[a, b <: a](x: a, xs: List[b]) extends List[a];
+ case object Nil extends List[All];
+ def nil[a]: List[a] = Nil;
def cons[a](x: a, xs: List[a]): List[a] = null;
val x: List[Int] = Nil.::(1);
val y: List[Int] = nil.::(1);
diff --git a/test/files/pos/patterns.scala b/test/files/pos/patterns.scala
index 9af176a9f8..f996f89725 100644
--- a/test/files/pos/patterns.scala
+++ b/test/files/pos/patterns.scala
@@ -1,4 +1,4 @@
-trait Option[a] {}
+trait Option[+a] {}
case class Some[a](x: a) extends Option[a] {
override def toString(): scala.String = "Some(" + x + ")";
override def equals(that: Any): Boolean = that match {
@@ -7,7 +7,7 @@ case class Some[a](x: a) extends Option[a] {
}
override def hashCode(): scala.Int = getClass().hashCode() * 41 + x.hashCode();
}
-case class None[a] extends Option[a] {
+case object None extends Option[All] {
override def toString(): scala.String = "None";
override def equals(that: Any) = that match {
case None => true
diff --git a/test/files/pos/patterns1.scala b/test/files/pos/patterns1.scala
index 48c068c618..fa542e7b06 100644
--- a/test/files/pos/patterns1.scala
+++ b/test/files/pos/patterns1.scala
@@ -1,6 +1,6 @@
-trait Option[a] {}
+trait Option[+a] {}
case class Some[a](x: a) extends Option[a];
-case class None[a] extends Option[a];
+case object None extends Option[All];
object test {
diff --git a/test/files/pos/patterns2.scala b/test/files/pos/patterns2.scala
index dab73a98fc..93dcedbcf8 100644
--- a/test/files/pos/patterns2.scala
+++ b/test/files/pos/patterns2.scala
@@ -1,7 +1,7 @@
trait Option {}
case class Choice(a: Option, b: Option) extends Option;
case class Some(x: java.lang.String) extends Option;
-case class None extends Option;
+case object None extends Option;
object test {