diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/t1801.check (renamed from test/pending/jvm/t1801.check) | 0 | ||||
-rw-r--r-- | test/files/jvm/t1801.scala (renamed from test/pending/jvm/t1801.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/bug1136.check | 2 | ||||
-rw-r--r-- | test/files/pos/bug2023.scala (renamed from test/pending/pos/bug2023.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/bug2261.scala (renamed from test/pending/pos/bug2261.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/switchUnbox.flags (renamed from test/pending/pos/switchUnbox.flags) | 0 | ||||
-rw-r--r-- | test/files/pos/switchUnbox.scala (renamed from test/pending/pos/switchUnbox.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1000.scala (renamed from test/pending/pos/t1000.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1659.check | 5 | ||||
-rw-r--r-- | test/files/pos/t1722.scala (renamed from test/pending/pos/t1722.scala) | 0 | ||||
-rwxr-xr-x | test/files/pos/t1722/C.scala (renamed from test/pending/pos/t1722/C.scala) | 0 | ||||
-rwxr-xr-x | test/files/pos/t1722/Test.scala (renamed from test/pending/pos/t1722/Test.scala) | 0 | ||||
-rwxr-xr-x | test/files/pos/t1722/Top.scala (renamed from test/pending/pos/t1722/Top.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1798.scala (renamed from test/pending/pos/t1798.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1987.scala (renamed from test/pending/pos/t1987.scala) | 0 | ||||
-rw-r--r-- | test/files/run/bug2005.scala (renamed from test/pending/pos/bug2005.scala) | 2 | ||||
-rw-r--r-- | test/pending/pos/t2201.scala | 8 | ||||
-rw-r--r-- | test/pending/run/bugs425-and-816.scala | 46 | ||||
-rw-r--r-- | test/pending/run/t2005.scala | 24 |
19 files changed, 17 insertions, 70 deletions
diff --git a/test/pending/jvm/t1801.check b/test/files/jvm/t1801.check index bf78a99db9..bf78a99db9 100644 --- a/test/pending/jvm/t1801.check +++ b/test/files/jvm/t1801.check diff --git a/test/pending/jvm/t1801.scala b/test/files/jvm/t1801.scala index 6ed7c56336..6ed7c56336 100644 --- a/test/pending/jvm/t1801.scala +++ b/test/files/jvm/t1801.scala diff --git a/test/files/pos/bug1136.check b/test/files/pos/bug1136.check deleted file mode 100644 index 0747cddefb..0000000000 --- a/test/files/pos/bug1136.check +++ /dev/null @@ -1,2 +0,0 @@ -warning: there were unchecked warnings; re-run with -unchecked for details -one warning found diff --git a/test/pending/pos/bug2023.scala b/test/files/pos/bug2023.scala index 21c6fc96a6..21c6fc96a6 100644 --- a/test/pending/pos/bug2023.scala +++ b/test/files/pos/bug2023.scala diff --git a/test/pending/pos/bug2261.scala b/test/files/pos/bug2261.scala index a499af838a..a499af838a 100644 --- a/test/pending/pos/bug2261.scala +++ b/test/files/pos/bug2261.scala diff --git a/test/pending/pos/switchUnbox.flags b/test/files/pos/switchUnbox.flags index ec1ad20e3a..ec1ad20e3a 100644 --- a/test/pending/pos/switchUnbox.flags +++ b/test/files/pos/switchUnbox.flags diff --git a/test/pending/pos/switchUnbox.scala b/test/files/pos/switchUnbox.scala index a97bff5521..a97bff5521 100644 --- a/test/pending/pos/switchUnbox.scala +++ b/test/files/pos/switchUnbox.scala diff --git a/test/pending/pos/t1000.scala b/test/files/pos/t1000.scala index 38f71863d8..38f71863d8 100644 --- a/test/pending/pos/t1000.scala +++ b/test/files/pos/t1000.scala diff --git a/test/files/pos/t1659.check b/test/files/pos/t1659.check deleted file mode 100644 index b75da8798b..0000000000 --- a/test/files/pos/t1659.check +++ /dev/null @@ -1,5 +0,0 @@ -t1659.scala:3: error: overriding method u in trait W of type [A](v: Y{type X = A})Unit; - method u has incompatible type -class Z extends W { def u[A](v : Y { type X = A }) = null } - ^ -one error found diff --git a/test/pending/pos/t1722.scala b/test/files/pos/t1722.scala index d059bf22f8..d059bf22f8 100644 --- a/test/pending/pos/t1722.scala +++ b/test/files/pos/t1722.scala diff --git a/test/pending/pos/t1722/C.scala b/test/files/pos/t1722/C.scala index 2695296292..2695296292 100755 --- a/test/pending/pos/t1722/C.scala +++ b/test/files/pos/t1722/C.scala diff --git a/test/pending/pos/t1722/Test.scala b/test/files/pos/t1722/Test.scala index 4cba7ab01b..4cba7ab01b 100755 --- a/test/pending/pos/t1722/Test.scala +++ b/test/files/pos/t1722/Test.scala diff --git a/test/pending/pos/t1722/Top.scala b/test/files/pos/t1722/Top.scala index 4ac52412aa..4ac52412aa 100755 --- a/test/pending/pos/t1722/Top.scala +++ b/test/files/pos/t1722/Top.scala diff --git a/test/pending/pos/t1798.scala b/test/files/pos/t1798.scala index 1624e3025e..1624e3025e 100644 --- a/test/pending/pos/t1798.scala +++ b/test/files/pos/t1798.scala diff --git a/test/pending/pos/t1987.scala b/test/files/pos/t1987.scala index ccab133716..ccab133716 100644 --- a/test/pending/pos/t1987.scala +++ b/test/files/pos/t1987.scala diff --git a/test/pending/pos/bug2005.scala b/test/files/run/bug2005.scala index 2514a5f711..4176709537 100644 --- a/test/pending/pos/bug2005.scala +++ b/test/files/run/bug2005.scala @@ -1,4 +1,4 @@ -object Bug { +object Test { def main(args: Array[String]) { val a = new Array[Array[Int]](2,2) test(a) diff --git a/test/pending/pos/t2201.scala b/test/pending/pos/t2201.scala deleted file mode 100644 index 21af170cf1..0000000000 --- a/test/pending/pos/t2201.scala +++ /dev/null @@ -1,8 +0,0 @@ -class Test -object Test { implicit def view(x : Test) = 0 } - -object Call { - def call(implicit view : Test => Int) = view(null) - call - call -} diff --git a/test/pending/run/bugs425-and-816.scala b/test/pending/run/bugs425-and-816.scala index 4e841ccc31..d9267d06af 100644 --- a/test/pending/run/bugs425-and-816.scala +++ b/test/pending/run/bugs425-and-816.scala @@ -1,41 +1,27 @@ object Test { - object bug816 { - abstract class Atest(val data: String) - case class Btest(override val data: String, val b: Boolean) extends Atest(data) - case class Ctest(override val data: String) extends Btest(data, true) - - class testCaseClass { - def test(x: Atest) = x match { - case Ctest(data) => "C" - case Btest(data, b) => "B" - } - } - def go() = { - val tcc = new testCaseClass() - - tcc.test(Ctest("foo")) + tcc.test(Btest("bar", true)) - } - } - object bug425 { case class A(x: Int) case class B(override val x: Int, y: Double) extends A(x) val b: A = B(5, 3.3) - def flail = b match { - case B(x, y) => "B" - case A(x) => "A" + b match { + case B(x, y) => Console.println(y) + case A(x) => Console.println(x) } - def flail2 = (B(10, 5.5): Any) match { - case A(20) => "1" - case A(10) => "2" - case _ => "fail" - } - def go() = flail + flail2 } - def main(args: Array[String]): Unit = { - assert(bug816.go() == "CB") - assert(bug425.go() == "B2") + object bug816 { + abstract class Atest(val data: String) + + case class Btest(override val data: String, val b: boolean) extends Atest(data) + + case class Ctest(override val data: String) extends Btest(data, true) + + class testCaseClass { + def test(x: Atest) = x match { + case Ctest(data) => Console.println("C") + case Btest(data, b) => Console.println("B") + } + } } } diff --git a/test/pending/run/t2005.scala b/test/pending/run/t2005.scala deleted file mode 100644 index 8e4243a768..0000000000 --- a/test/pending/run/t2005.scala +++ /dev/null @@ -1,24 +0,0 @@ -Object Bug { - def main(args: Array[String]) { - val a = new Array[Array[Int]](2,2) - test(a) - } - def test[A](t: Array[Array[A]]) { - val tmp = t(0) - t(1) = tmp - } -} -java.lang.ArrayStoreException: scala.runtime.BoxedIntArray - at scala.runtime.BoxedObjectArray.update(BoxedObjectArray.scala:26) - at Bug$.test(Bug.scala:12) - at Bug$.main(Bug.scala:7) - at Bug.main(Bug.scala) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) - at java.lang.reflect.Method.invoke(Method.java:585) - at scala.tools.nsc.ObjectRunner$$anonfun$run$1.apply(ObjectRunner.scala:75) - at scala.tools.nsc.ObjectRunner$.withContextClassLoader(ObjectRunner.scala:49) - at scala.tools.nsc.ObjectRunner$.run(ObjectRunner.scala:74) - at scala.tools.nsc.MainGenericRunner$.main(MainGenericRunner.scala:154) - at scala.tools.nsc.MainGenericRunner.main(MainGenericRunner.scala) |