From c055dc83e3ad095ec287d19d0b0c620241c70580 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 11 Jun 2003 12:01:19 +0000 Subject: *** empty log message *** --- test/files/neg/bounds.check | 2 +- test/files/pos/partialfun.scala | 2 +- test/files/run/Course-2002-02.scala | 2 +- test/neg/bounds.check | 2 +- test/pos/partialfun.scala | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/files/neg/bounds.check b/test/files/neg/bounds.check index 0f4693da88..461086194f 100644 --- a/test/files/neg/bounds.check +++ b/test/files/neg/bounds.check @@ -1,4 +1,4 @@ -bounds.scala:11: constructor A of type [T >: I](T)A[T] cannot be applied to [T] +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/files/pos/partialfun.scala b/test/files/pos/partialfun.scala index e6af633811..21e4d0a096 100644 --- a/test/files/pos/partialfun.scala +++ b/test/files/pos/partialfun.scala @@ -4,7 +4,7 @@ object partialfun { if (f.isDefinedAt(x)) f(x) else ""; applyPartial { - case Some(x) => x + case Some(xxx) => xxx } (None); } \ No newline at end of file diff --git a/test/files/run/Course-2002-02.scala b/test/files/run/Course-2002-02.scala index 6c78249586..fc9add8371 100644 --- a/test/files/run/Course-2002-02.scala +++ b/test/files/run/Course-2002-02.scala @@ -79,7 +79,7 @@ object M3 { if (a > b) 0 else f(a) + sum(f, a + 1, b); - def sumInts(a: Int, b: Int): Double = sum((x => x), a, b); + def sumInts(a: Int, b: Int): Double = sum((xXXXXX => xXXXXX), a, b); def sumCubes(a: Int, b: Int): Double = sum((x => x * x * x), a, b); def sumReciprocals(a: Int, b: Int): Double = sum((x => 1.0/x), a, b); def sumPi(n: Int): Double = 4 + sum((x => 4.0/(4*x+1) - 4.0/(4*x-1)), 1, n); diff --git a/test/neg/bounds.check b/test/neg/bounds.check index 0f4693da88..461086194f 100644 --- a/test/neg/bounds.check +++ b/test/neg/bounds.check @@ -1,4 +1,4 @@ -bounds.scala:11: constructor A of type [T >: I](T)A[T] cannot be applied to [T] +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/pos/partialfun.scala b/test/pos/partialfun.scala index e6af633811..21e4d0a096 100644 --- a/test/pos/partialfun.scala +++ b/test/pos/partialfun.scala @@ -4,7 +4,7 @@ object partialfun { if (f.isDefinedAt(x)) f(x) else ""; applyPartial { - case Some(x) => x + case Some(xxx) => xxx } (None); } \ No newline at end of file -- cgit v1.2.3