diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-04-06 09:23:03 +0000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2007-04-06 09:23:03 +0000 |
commit | e1c732db445d1ab0172bc25073ce865acc7d280b (patch) | |
tree | 4e1445535167194e09815e95563e4d2a9ef927f3 /test | |
parent | 289fd3d7307ca117a419e71e3a20b0b811a0d33f (diff) | |
download | scala-e1c732db445d1ab0172bc25073ce865acc7d280b.tar.gz scala-e1c732db445d1ab0172bc25073ce865acc7d280b.tar.bz2 scala-e1c732db445d1ab0172bc25073ce865acc7d280b.zip |
merged in tcpoly branch (at r10641)
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/accesses.check | 8 | ||||
-rw-r--r-- | test/files/neg/bug521.check | 6 | ||||
-rw-r--r-- | test/files/neg/bug588.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug608.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug664.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug752.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug856.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug900.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug910.check | 2 | ||||
-rw-r--r-- | test/files/neg/implicits.check | 2 | ||||
-rw-r--r-- | test/files/neg/overload.check | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/test/files/neg/accesses.check b/test/files/neg/accesses.check index a7fe868f2b..8b8856370b 100644 --- a/test/files/neg/accesses.check +++ b/test/files/neg/accesses.check @@ -1,16 +1,16 @@ -accesses.scala:23: error: error overriding method f2 in class A of type => scala.Unit; +accesses.scala:23: error: error overriding method f2 in class A of type => scala.Predef.unit; method f2 has weaker access privileges; it should not be private private def f2: unit = () ^ -accesses.scala:24: error: error overriding method f3 in class A of type => scala.Unit; +accesses.scala:24: error: error overriding method f3 in class A of type => scala.Predef.unit; method f3 has weaker access privileges; it should be at least protected private[p2] def f3: unit = () ^ -accesses.scala:25: error: error overriding method f4 in class A of type => scala.Unit; +accesses.scala:25: error: error overriding method f4 in class A of type => scala.Predef.unit; method f4 has weaker access privileges; it should be at least private[p1] private[p2] def f4: unit ^ -accesses.scala:26: error: error overriding method f5 in class A of type => scala.Unit; +accesses.scala:26: error: error overriding method f5 in class A of type => scala.Predef.unit; method f5 has weaker access privileges; it should be at least protected[p1] protected[p2] def f5: unit ^ diff --git a/test/files/neg/bug521.check b/test/files/neg/bug521.check index eac2087f71..d058d2971e 100644 --- a/test/files/neg/bug521.check +++ b/test/files/neg/bug521.check @@ -1,14 +1,14 @@ -bug521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined +bug521.scala:10: error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => scala.Predef.String is not defined class PlainFile(val file : File) extends AbstractFile {} ^ bug521.scala:13: error: error overriding value file in class PlainFile of type java.io.File; value file needs `override' modifier final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { ^ -bug521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined +bug521.scala:13: error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => scala.Predef.String is not defined final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { ^ -bug521.scala:15: error: error overriding value path in class VirtualFile of type java.lang.String; +bug521.scala:15: error: error overriding value path in class VirtualFile of type scala.Predef.String; method path needs to be an immutable value override def path = ""; ^ diff --git a/test/files/neg/bug588.check b/test/files/neg/bug588.check index 2e12092157..648484176e 100644 --- a/test/files/neg/bug588.check +++ b/test/files/neg/bug588.check @@ -1,6 +1,6 @@ bug588.scala:3: error: double definition: -method visit:((scala.Int) => java.lang.String)scala.Boolean and -method visit:((scala.Int) => scala.Unit)scala.Boolean at line 2 +method visit:((scala.Predef.int) => scala.Predef.String)scala.Predef.boolean and +method visit:((scala.Predef.int) => scala.Predef.unit)scala.Predef.boolean at line 2 have same type after erasure: (scala.Function1)scala.Boolean def visit(f: int => String): boolean ^ diff --git a/test/files/neg/bug608.check b/test/files/neg/bug608.check index 4e8eb4d709..c2c53849ce 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: (ha) => ? + required: (hs{type s = hs; type a = ha}#a) => ? = g(f(x).bimap(id)) ^ one error found diff --git a/test/files/neg/bug664.check b/test/files/neg/bug664.check index 62995f13b3..31492d83ba 100644 --- a/test/files/neg/bug664.check +++ b/test/files/neg/bug664.check @@ -1,7 +1,7 @@ bug664.scala:4: error: type Foo is not a member of test.Test with scala.ScalaObject trait Foo extends super.Foo { ^ -bug664.scala:5: error: type Bar is not a member of java.lang.Object with scala.ScalaObject +bug664.scala:5: error: type Bar is not a member of scala.AnyRef with scala.ScalaObject trait Bar extends super.Bar; ^ two errors found diff --git a/test/files/neg/bug752.check b/test/files/neg/bug752.check index f52f73cfba..e240dbdfe2 100644 --- a/test/files/neg/bug752.check +++ b/test/files/neg/bug752.check @@ -1,5 +1,5 @@ bug752.scala:6: error: type mismatch; - found : (java.lang.String) => scala.Unit + found : (scala.Predef.String) => scala.Unit required: (scala.Int) => scala.Unit f(&g) ^ diff --git a/test/files/neg/bug856.check b/test/files/neg/bug856.check index aab4be23a1..e78077f437 100644 --- a/test/files/neg/bug856.check +++ b/test/files/neg/bug856.check @@ -1,4 +1,4 @@ -bug856.scala:3: error: class ComplexRect needs to be abstract, since method _2 in trait Product2 of type => scala.Double is not defined +bug856.scala:3: error: class ComplexRect needs to be abstract, since method _2 in trait Product2 of type => scala.Predef.double is not defined class ComplexRect(val _1:double, _2:double) extends Complex { ^ one error found diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check index 531ac5bee4..0bb5edad80 100644 --- a/test/files/neg/bug900.check +++ b/test/files/neg/bug900.check @@ -1,10 +1,10 @@ bug900.scala:4: error: type mismatch; found : Foo.this.x.type (with underlying type Foo.this.bar) - required: java.lang.Object + required: scala.AnyRef Note that implicit conversions are not applicable because they are ambiguous: both method any2stringadd in object Predef of type (scala.Any)scala.runtime.StringAdd and method any2ArrowAssoc in object Predef of type [a](a)scala.Predef.ArrowAssoc[a] - are possible conversion functions from Foo.this.x.type to java.lang.Object + are possible conversion functions from Foo.this.x.type to scala.AnyRef def break(): x.type ^ one error found diff --git a/test/files/neg/bug910.check b/test/files/neg/bug910.check index c52d7a87df..855793d412 100644 --- a/test/files/neg/bug910.check +++ b/test/files/neg/bug910.check @@ -1,6 +1,6 @@ bug910.scala:4: error: type mismatch; found : scala.Seq[scala.Char] - required: scala.Seq[scala.Int] + required: scala.Seq[scala.Predef.int] val y: Seq[int] = rest ^ one error found diff --git a/test/files/neg/implicits.check b/test/files/neg/implicits.check index 266d92c765..1af86e6c05 100644 --- a/test/files/neg/implicits.check +++ b/test/files/neg/implicits.check @@ -2,7 +2,7 @@ implicits.scala:21: error: type mismatch; found : Pos required: ?{val +: ?} Note that implicit conversions are not applicable because they are ambiguous: - most specific definition is: method pos2int in object Super of type (Pos)scala.Int + most specific definition is: method pos2int in object Super of type (Pos)scala.Predef.int yet alternative definition method any2plus in object Sub of type (scala.Any)Sub.Plus is defined in a subclass. Both definitions are possible conversion functions from Pos to ?{val +: ?} diff --git a/test/files/neg/overload.check b/test/files/neg/overload.check index 1c1f1e7a01..70d292b349 100644 --- a/test/files/neg/overload.check +++ b/test/files/neg/overload.check @@ -1,5 +1,5 @@ overload.scala:10: error: erroneous reference to overloaded definition, -most specific definition is: method f in class C of type (scala.Int)scala.Unit, +most specific definition is: method f in class C of type (scala.Predef.int)scala.Unit, yet alternative definition method f in class D of type (scala.Any)scala.Unit is defined in a subclass (new D).f(1) |