From c75bafbbbcd9fdd9c32e56b9c45f1177ae628e5c Mon Sep 17 00:00:00 2001 From: paltherr Date: Wed, 18 Jun 2003 08:20:31 +0000 Subject: - Fixed scala-test to make neg-check-files path... - Fixed scala-test to make neg-check-files path-indenpendant. --- test/neg/S2.check | 4 +-- test/neg/S4.check | 2 +- test/neg/S6.check | 2 +- test/neg/S7.check | 2 +- test/neg/abstract.check | 4 +-- test/neg/altherr2.check | 2 +- test/neg/altherr3.check | 68 ++++++++++++++++++++++----------------------- test/neg/bounds.check | 2 +- test/neg/constrparams.check | 2 +- test/neg/cyclic.check | 2 +- test/neg/imports.check | 18 ++++++------ test/neg/matthias2.check | 2 +- test/neg/michel2.check | 2 +- test/neg/protected.check | 2 +- test/neg/stable.check | 4 +-- test/neg/vincent1.check | 2 +- 16 files changed, 60 insertions(+), 60 deletions(-) (limited to 'test/neg') diff --git a/test/neg/S2.check b/test/neg/S2.check index 0e55659ba4..cb6bb9c991 100644 --- a/test/neg/S2.check +++ b/test/neg/S2.check @@ -1,7 +1,7 @@ -./neg/S2.scala:14: type z.type escapes its defining scope as part of z.Inner +S2.scala:14: type z.type escapes its defining scope as part of z.Inner def x = { val z = new S2(); new z.Inner(); } ^ -./neg/S2.scala:15: type z.type escapes its defining scope as part of z.Inner +S2.scala:15: type z.type escapes its defining scope as part of z.Inner def y = { val z = new S2(); new z.Inner(); } ^ two errors found diff --git a/test/neg/S4.check b/test/neg/S4.check index c4ccb91923..7fd616488b 100644 --- a/test/neg/S4.check +++ b/test/neg/S4.check @@ -1,4 +1,4 @@ -./neg/S4.scala:5: stable identifier required, but a found. +S4.scala:5: stable identifier required, but a found. def foo(x: a.Inner) = x; ^ one error found diff --git a/test/neg/S6.check b/test/neg/S6.check index 3b65e06d45..6303e4c8e2 100644 --- a/test/neg/S6.check +++ b/test/neg/S6.check @@ -1,4 +1,4 @@ -./neg/S6.scala:11: illegal cyclic reference involving type S +S6.scala:11: illegal cyclic reference involving type S type S <: T; ^ one error found diff --git a/test/neg/S7.check b/test/neg/S7.check index 9e0e0e16b3..22769d0fe7 100644 --- a/test/neg/S7.check +++ b/test/neg/S7.check @@ -1,4 +1,4 @@ -./neg/S7.scala:6: illegal cyclic reference involving class S7.A +S7.scala:6: illegal cyclic reference involving class S7.A class C() extends a.A() {} ^ one error found diff --git a/test/neg/abstract.check b/test/neg/abstract.check index c64b93b505..11d01ce3d9 100644 --- a/test/neg/abstract.check +++ b/test/neg/abstract.check @@ -1,7 +1,7 @@ -./neg/abstract.scala:5: malformed type: A.this.T#T +abstract.scala:5: malformed type: A.this.T#T def foo1 = bar().bar(); ^ -./neg/abstract.scala:7: malformed type: A#T +abstract.scala:7: malformed type: A#T def foo3 = baz().bar(); ^ two errors found diff --git a/test/neg/altherr2.check b/test/neg/altherr2.check index f546f8b1bb..53eeb2c84c 100644 --- a/test/neg/altherr2.check +++ b/test/neg/altherr2.check @@ -1,4 +1,4 @@ -./neg/altherr2.scala:5: ';' expected but '[' found. +altherr2.scala:5: ';' expected but '[' found. foo()[Int]; ^ one error found diff --git a/test/neg/altherr3.check b/test/neg/altherr3.check index 789cc1b84e..1ee3655290 100644 --- a/test/neg/altherr3.check +++ b/test/neg/altherr3.check @@ -1,169 +1,169 @@ -./neg/altherr3.scala:26: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:26: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo0()); // error 1 ^ -./neg/altherr3.scala:27: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:27: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo0(foo0())); // error 2 ^ -./neg/altherr3.scala:28: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:28: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo0(foo0(foo0()))); // error 3 ^ -./neg/altherr3.scala:29: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[bug.Foo[scala.All]]]) +altherr3.scala:29: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[bug.Foo[scala.All]]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo0(foo0(foo0(foo0())))); // error 4 ^ -./neg/altherr3.scala:32: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:32: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo0(foo0())); // error 5 ^ -./neg/altherr3.scala:33: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:33: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo0(foo0(foo0()))); // error 6 ^ -./neg/altherr3.scala:34: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:34: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo0(foo0(foo0(foo0())))); // error 7 ^ -./neg/altherr3.scala:38: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:38: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Foo[Int]]](foo0(foo0(foo0()))); // error 8 ^ -./neg/altherr3.scala:39: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:39: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Foo[Int]]](foo0(foo0(foo0(foo0())))); // error 9 ^ -./neg/altherr3.scala:49: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:49: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo0(foo0())); // error 10 ^ -./neg/altherr3.scala:50: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:50: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo0(foo0(foo0()))); // error 11 ^ -./neg/altherr3.scala:51: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:51: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo0(foo0(foo0(foo0())))); // error 12 ^ -./neg/altherr3.scala:55: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:55: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Int]](foo0(foo0(foo0()))); // error 13 ^ -./neg/altherr3.scala:56: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:56: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Int]](foo0(foo0(foo0(foo0())))); // error 14 ^ -./neg/altherr3.scala:61: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:61: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Foo[Int]]](foo0(foo0(foo0(foo0())))); // error 15 ^ -./neg/altherr3.scala:72: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:72: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar2[Int](foo0(foo0(foo0()))); // error 16 ^ -./neg/altherr3.scala:73: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:73: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar2[Int](foo0(foo0(foo0(foo0())))); // error 17 ^ -./neg/altherr3.scala:78: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:78: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar2[Foo[Int]](foo0(foo0(foo0(foo0())))); // error 18 ^ -./neg/altherr3.scala:95: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:95: no type parameters for method foo0 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar3[Int](foo0(foo0(foo0(foo0())))); // error 20 ^ -./neg/altherr3.scala:116: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:116: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo1()); // error 21 ^ -./neg/altherr3.scala:117: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:117: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo1(foo1())); // error 22 ^ -./neg/altherr3.scala:118: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:118: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo1(foo1(foo1()))); // error 23 ^ -./neg/altherr3.scala:119: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[bug.Foo[scala.All]]]) +altherr3.scala:119: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[bug.Foo[scala.All]]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Int](foo1(foo1(foo1(foo1())))); // error 24 ^ -./neg/altherr3.scala:122: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:122: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo1(foo1())); // error 25 ^ -./neg/altherr3.scala:123: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:123: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo1(foo1(foo1()))); // error 26 ^ -./neg/altherr3.scala:124: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:124: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Int]](foo0(foo1(foo1(foo1())))); // error 27 ^ -./neg/altherr3.scala:128: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:128: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Foo[Int]]](foo1(foo1(foo1()))); // error 28 ^ -./neg/altherr3.scala:129: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:129: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar0[Foo[Foo[Int]]](foo1(foo0(foo1(foo1())))); // error 29 ^ -./neg/altherr3.scala:139: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:139: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo1(foo1())); // error 30 ^ -./neg/altherr3.scala:140: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:140: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo1(foo1(foo1()))); // error 31 ^ -./neg/altherr3.scala:141: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) +altherr3.scala:141: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[bug.Foo[scala.All]]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Int](foo1(foo1(foo1(foo1())))); // error 32 ^ -./neg/altherr3.scala:145: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:145: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Int]](foo1(foo1(foo1()))); // error 33 ^ -./neg/altherr3.scala:146: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) +altherr3.scala:146: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments (bug.Foo[scala.All]) --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Int]](foo1(foo1(foo1(foo1())))); // error 34 ^ -./neg/altherr3.scala:151: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () +altherr3.scala:151: no type parameters for method foo1 of type [a](a*)bug.Foo[a] exist so that it can be applied to arguments () --- because --- result type bug.Foo[a] is incompatible with expected type scala.Int bar1[Foo[Foo[Int]]](foo1(foo1(foo1(foo1())))); // error 35 diff --git a/test/neg/bounds.check b/test/neg/bounds.check index c0eb0f6bed..461086194f 100644 --- a/test/neg/bounds.check +++ b/test/neg/bounds.check @@ -1,4 +1,4 @@ -./neg/bounds.scala:11: type arguments [T] do not conform to constructor A's type parameter bounds [T >: I] +bounds.scala:11: type arguments [T] do not conform to constructor A's type parameter bounds [T >: I] class B[T >: J](init: T) extends A[T](init) { ^ one error found diff --git a/test/neg/constrparams.check b/test/neg/constrparams.check index 4827895d06..19eb56bf7f 100644 --- a/test/neg/constrparams.check +++ b/test/neg/constrparams.check @@ -1,4 +1,4 @@ -./neg/constrparams.scala:4: stable identifier required, but x found. +constrparams.scala:4: stable identifier required, but x found. private val z: x.t = null; //error ^ one error found diff --git a/test/neg/cyclic.check b/test/neg/cyclic.check index 920380f591..2c23c8b26a 100644 --- a/test/neg/cyclic.check +++ b/test/neg/cyclic.check @@ -1,4 +1,4 @@ -./neg/cyclic.scala:3: illegal cyclic reference involving type T +cyclic.scala:3: illegal cyclic reference involving type T type T = List[T]; ^ one error found diff --git a/test/neg/imports.check b/test/neg/imports.check index 0b8e32d5aa..911d300c6f 100644 --- a/test/neg/imports.check +++ b/test/neg/imports.check @@ -1,28 +1,28 @@ -./neg/imports.scala:26: not found: value v_coi +imports.scala:26: not found: value v_coi def method: C_coi = v_coi; ^ -./neg/imports.scala:27: not found: value v_coi +imports.scala:27: not found: value v_coi val field: C_coi = v_coi; ^ -./neg/imports.scala:29: not found: value v_coi +imports.scala:29: not found: value v_coi check("C_coi", "v_coi ", v_coi); ^ -./neg/imports.scala:47: not found: value v_cio +imports.scala:47: not found: value v_cio def method: C_cio = v_cio; ^ -./neg/imports.scala:48: not found: value v_cio +imports.scala:48: not found: value v_cio val field: C_cio = v_cio; ^ -./neg/imports.scala:50: not found: value v_cio +imports.scala:50: not found: value v_cio check("C_cio", "v_cio ", v_cio); ^ -./neg/imports.scala:136: not found: value v_oci +imports.scala:136: not found: value v_oci def method: C_oci = v_oci; ^ -./neg/imports.scala:137: not found: value v_oci +imports.scala:137: not found: value v_oci val field: C_oci = v_oci; ^ -./neg/imports.scala:139: not found: value v_oci +imports.scala:139: not found: value v_oci check("C_oci", "v_oci ", v_oci); ^ 9 errors found diff --git a/test/neg/matthias2.check b/test/neg/matthias2.check index e3e2c0a85a..9bd56714cd 100644 --- a/test/neg/matthias2.check +++ b/test/neg/matthias2.check @@ -1,4 +1,4 @@ -./neg/matthias2.scala:7: illegal cyclic reference involving value y +matthias2.scala:7: illegal cyclic reference involving value y override val y: T; ^ one error found diff --git a/test/neg/michel2.check b/test/neg/michel2.check index 9262facb0c..3317c40f61 100644 --- a/test/neg/michel2.check +++ b/test/neg/michel2.check @@ -1,4 +1,4 @@ -./neg/michel2.scala:1: Java class may not be used as mixin +michel2.scala:1: Java class may not be used as mixin class A() extends java.lang.Object() with java.util.Random() { } ^ one error found diff --git a/test/neg/protected.check b/test/neg/protected.check index eed6f32d00..23a5865dab 100644 --- a/test/neg/protected.check +++ b/test/neg/protected.check @@ -1,4 +1,4 @@ -./neg/protected.scala:11: error overriding method y in class A; +protected.scala:11: error overriding method y in class A; method y in class B has weaker access privileges; it should not be protected protected def y(): int; ^ diff --git a/test/neg/stable.check b/test/neg/stable.check index 51a86f6a7e..eaa64ef62a 100644 --- a/test/neg/stable.check +++ b/test/neg/stable.check @@ -1,7 +1,7 @@ -./neg/stable.scala:10: stable identifier required, but test.y found. +stable.scala:10: stable identifier required, but test.y found. type b = y.T; ^ -./neg/stable.scala:11: stable identifier required, but test.z found. +stable.scala:11: stable identifier required, but test.z found. type c = z.T; ^ two errors found diff --git a/test/neg/vincent1.check b/test/neg/vincent1.check index 376e21dc1b..b9243e7560 100644 --- a/test/neg/vincent1.check +++ b/test/neg/vincent1.check @@ -1,4 +1,4 @@ -./neg/vincent1.scala:7: type x.type escapes its defining scope as part of test.B { type T = x.T } +vincent1.scala:7: type x.type escapes its defining scope as part of test.B { type T = x.T } def functor(x: A): B { type T = x.T } = ^ one error found -- cgit v1.2.3