summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-08-21 19:03:45 +0000
committerMartin Odersky <odersky@gmail.com>2006-08-21 19:03:45 +0000
commit87494e132353ea49182c43b876810a9890cd2bad (patch)
tree8569c4fadba6df30ce40360e47aaac3f12c3d7e1
parentc4bc5bc26afd0356d38374955462dd8aea8782bd (diff)
downloadscala-87494e132353ea49182c43b876810a9890cd2bad.tar.gz
scala-87494e132353ea49182c43b876810a9890cd2bad.tar.bz2
scala-87494e132353ea49182c43b876810a9890cd2bad.zip
-rw-r--r--test/files/neg/bug677.check2
-rw-r--r--test/files/neg/bug681.check2
-rw-r--r--test/files/neg/bug692.check12
-rw-r--r--test/files/neg/bug693.check2
-rw-r--r--test/files/pos/refine.scala6
5 files changed, 9 insertions, 15 deletions
diff --git a/test/files/neg/bug677.check b/test/files/neg/bug677.check
index fc90bc3a33..7086f259a3 100644
--- a/test/files/neg/bug677.check
+++ b/test/files/neg/bug677.check
@@ -1,6 +1,6 @@
bug677.scala:2 error: type mismatch;
found : () => scala.Int
required: scala.All
- val zx: All = {() => 4}
+ val zx: All = {() => 4}
^
one error found
diff --git a/test/files/neg/bug681.check b/test/files/neg/bug681.check
index 0af3afffd8..52d00cf9c3 100644
--- a/test/files/neg/bug681.check
+++ b/test/files/neg/bug681.check
@@ -1,4 +1,4 @@
bug681.scala:10 warning: imported `x' is permanently hidden by definition of value x in class foo
- import foo.{x};
+ import foo.{x};
^
one warning found
diff --git a/test/files/neg/bug692.check b/test/files/neg/bug692.check
index 8c9d9d4b52..afd2639123 100644
--- a/test/files/neg/bug692.check
+++ b/test/files/neg/bug692.check
@@ -1,19 +1,19 @@
bug692.scala:3 error: not found: type T
- trait Type[T0] extends Type0[T];
+ trait Type[T0] extends Type0[T];
^
bug692.scala:10 error: class Foo takes type parameters
- case class FooType extends ClassType[Foo,Object](ObjectType);
+ case class FooType extends ClassType[Foo,Object](ObjectType);
^
bug692.scala:13 error: class Foo takes type parameters
- case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
+ case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
^
bug692.scala:13 error: class Foo takes type parameters
- case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
+ case class BarType[T3 <: Foo](tpeT : RefType[T3]) extends ClassType[Bar[T3],Foo](FooType);
^
bug692.scala:14 error: class Foo takes type parameters
- implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] =
+ implicit def typeOfBar[T4 <: Foo](implicit elem : RefType[T4]) : RefType[Bar[T4]] =
^
bug692.scala:19 error: class Foo takes type parameters
- class Bar[A <: Foo](implicit tpeA : Type[A]) extends Foo;
+ class Bar[A <: Foo](implicit tpeA : Type[A]) extends Foo;
^
6 errors found
diff --git a/test/files/neg/bug693.check b/test/files/neg/bug693.check
index 86ccf6b886..af886b48c5 100644
--- a/test/files/neg/bug693.check
+++ b/test/files/neg/bug693.check
@@ -1,4 +1,4 @@
bug693.scala:4 error: x is already defined as value x
- val x : Int = 10;
+ val x : Int = 10;
^
one error found
diff --git a/test/files/pos/refine.scala b/test/files/pos/refine.scala
deleted file mode 100644
index 5d175f26f5..0000000000
--- a/test/files/pos/refine.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object test {
-
- val x: Object { def t(): String } = new Object {
- def t(): String = "1";
- }
-}