summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2005-03-22 15:26:54 +0000
committerMartin Odersky <odersky@gmail.com>2005-03-22 15:26:54 +0000
commit9e67e8eb2a4480d2761d2e08a87cea6b32a71fbb (patch)
treee71a2f25b3dd0072fa0db11c6e2e1282d4cfa97f /test
parent7179a093ef8f5c46941f6440704389316416b7f5 (diff)
downloadscala-9e67e8eb2a4480d2761d2e08a87cea6b32a71fbb.tar.gz
scala-9e67e8eb2a4480d2761d2e08a87cea6b32a71fbb.tar.bz2
scala-9e67e8eb2a4480d2761d2e08a87cea6b32a71fbb.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/List1.scala6
-rw-r--r--test/files/pos/abstract.scala4
-rw-r--r--test/files/pos/arrays2.scala4
-rw-r--r--test/files/pos/bug115.scala5
4 files changed, 10 insertions, 9 deletions
diff --git a/test/files/pos/List1.scala b/test/files/pos/List1.scala
index f0fce9501f..1321d95c20 100644
--- a/test/files/pos/List1.scala
+++ b/test/files/pos/List1.scala
@@ -1,19 +1,19 @@
object lists {
- trait List[a] {
+ abstract class List[a] {
def isEmpty: Boolean;
def head: a;
def tail: List[a];
def prepend(x: a) = Cons[a](x, this);
}
- def Nil[a] = new List[a] {
+ def Nil[b] = new List[b] {
def isEmpty: Boolean = true;
def head = error("head of Nil");
def tail = error("tail of Nil");
}
- def Cons[a](x: a, xs: List[a]): List[a] = new List[a] {
+ def Cons[c](x: c, xs: List[c]): List[c] = new List[c] {
def isEmpty = false;
def head = x;
def tail = xs;
diff --git a/test/files/pos/abstract.scala b/test/files/pos/abstract.scala
index f51ae63e6b..533f996931 100644
--- a/test/files/pos/abstract.scala
+++ b/test/files/pos/abstract.scala
@@ -1,9 +1,9 @@
-trait C {
+abstract class C() {
type t;
def copy(x: t): t = x;
}
-class D() extends C {
+class D() extends C() {
type t = Int;
System.out.println(copy(1));
}
diff --git a/test/files/pos/arrays2.scala b/test/files/pos/arrays2.scala
index 26adaf63ca..6f4a09a401 100644
--- a/test/files/pos/arrays2.scala
+++ b/test/files/pos/arrays2.scala
@@ -2,8 +2,8 @@ case class C();
object arrays2 {
- def main(args: Array[String]): unit = {
- val a = new Array[Array[C]](2);
+ def main(args: Array[String]): Unit = {
+ val a: Array[Array[C]] = new Array[Array[C]](2);
a(0) = new Array[C](2);
a(0)(0) = new C();
}
diff --git a/test/files/pos/bug115.scala b/test/files/pos/bug115.scala
index 87a5c10915..970636f708 100644
--- a/test/files/pos/bug115.scala
+++ b/test/files/pos/bug115.scala
@@ -1,8 +1,9 @@
class S[A](f: A => A, x: A) {
System.out.println(f(x));
}
-class T[A](f: A => A, y: A) extends S(x: A => f(x), y) {
+class T[B](f: B => B, y: B) extends S(x: B => f(x), y) {
}
object Test with Application {
- new T[int](x: int => x * 2, 1);
+ new T[Int](x => x * 2, 1);
+ val f = new S(x: Int => x, 1);
}