summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-06-11 12:01:19 +0000
committerMartin Odersky <odersky@gmail.com>2003-06-11 12:01:19 +0000
commitc055dc83e3ad095ec287d19d0b0c620241c70580 (patch)
tree847db3cd56e35920233bae54ca2b8d37ebc4e65f /test
parent34cdd069a106b0889594f3c784e39b1ce1d8f3af (diff)
downloadscala-c055dc83e3ad095ec287d19d0b0c620241c70580.tar.gz
scala-c055dc83e3ad095ec287d19d0b0c620241c70580.tar.bz2
scala-c055dc83e3ad095ec287d19d0b0c620241c70580.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/bounds.check2
-rw-r--r--test/files/pos/partialfun.scala2
-rw-r--r--test/files/run/Course-2002-02.scala2
-rw-r--r--test/neg/bounds.check2
-rw-r--r--test/pos/partialfun.scala2
5 files changed, 5 insertions, 5 deletions
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 "<undefined>";
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 "<undefined>";
applyPartial {
- case Some(x) => x
+ case Some(xxx) => xxx
} (None);
} \ No newline at end of file