summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-05-10 23:19:55 -0700
committerPaul Phillips <paulp@improving.org>2012-05-10 23:20:56 -0700
commitef32a8b9334307d15d9fa68d3da3f6f80b200788 (patch)
treee4727e50d595de563c8d6c6936389c4090e4db60
parentdf10f921158ea13ce8fb53c8e15ec290ace69d83 (diff)
downloadscala-ef32a8b9334307d15d9fa68d3da3f6f80b200788.tar.gz
scala-ef32a8b9334307d15d9fa68d3da3f6f80b200788.tar.bz2
scala-ef32a8b9334307d15d9fa68d3da3f6f80b200788.zip
Removing redunant/passing tests from pending.
-rw-r--r--test/files/pos/t1987a.scala (renamed from test/files/pos/t1987.scala)0
-rw-r--r--test/files/run/backreferences.check2
-rw-r--r--test/files/run/backreferences.scala13
-rw-r--r--test/pending/neg/t796.scala20
-rw-r--r--test/pending/pos/unapplyGeneric.scala11
-rw-r--r--test/pending/run/t3702.scala10
-rw-r--r--test/pending/run/t5629.scala25
7 files changed, 15 insertions, 66 deletions
diff --git a/test/files/pos/t1987.scala b/test/files/pos/t1987a.scala
index ccab133716..ccab133716 100644
--- a/test/files/pos/t1987.scala
+++ b/test/files/pos/t1987a.scala
diff --git a/test/files/run/backreferences.check b/test/files/run/backreferences.check
new file mode 100644
index 0000000000..1d474d5255
--- /dev/null
+++ b/test/files/run/backreferences.check
@@ -0,0 +1,2 @@
+false
+true
diff --git a/test/files/run/backreferences.scala b/test/files/run/backreferences.scala
new file mode 100644
index 0000000000..335cd6c7de
--- /dev/null
+++ b/test/files/run/backreferences.scala
@@ -0,0 +1,13 @@
+case class Elem[T](x: T, y: T)
+
+object Test {
+ def unrolled[T](x: Any, y: Any, z: Any) = (x, y, z) match {
+ case (el: Elem[_], el.x, el.y) => true
+ case _ => false
+ }
+
+ def main(args: Array[String]): Unit = {
+ println(unrolled(Elem("bippy", 5), "bippy", 6))
+ println(unrolled(Elem("bippy", 5), "bippy", 5))
+ }
+}
diff --git a/test/pending/neg/t796.scala b/test/pending/neg/t796.scala
deleted file mode 100644
index c013f49686..0000000000
--- a/test/pending/neg/t796.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-case class CaseClass( value: Int );
-
-object PatternMatchBug {
- def matcher( a: AnyRef, b: Any ) {
- (a, b) match {
- case ( instance: CaseClass, instance.value ) =>
- System.out.println( "Match succeeded!" );
- case _ =>
- System.out.println( "Match failed!" );
- }
- }
-
- def main( args : Array[String] ) {
- val caseClassInstance = CaseClass( 42 )
-
- matcher( caseClassInstance, 13 )
- matcher( caseClassInstance, 42 )
- }
-}
-
diff --git a/test/pending/pos/unapplyGeneric.scala b/test/pending/pos/unapplyGeneric.scala
deleted file mode 100644
index bf88816885..0000000000
--- a/test/pending/pos/unapplyGeneric.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object Bar {
- def unapply[A,B](bar:Bar[A,B]) = Some(bar)
-}
-
-class Bar[A,B](val _1:A, val _2:B) extends Product2[A,B]
-
-object Test {
- new Bar(2, 'a') match {
- case Bar(x,y) =>
- }
-}
diff --git a/test/pending/run/t3702.scala b/test/pending/run/t3702.scala
deleted file mode 100644
index e08fc12e76..0000000000
--- a/test/pending/run/t3702.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object Test {
- def main(args: Array[String]) {
- foo(Nil, Nil)
- }
-
- def foo(h: Any, t: List[Any]) = h match {
- case 5 :: _ => ()
- case List(from) => List(from, from, from)
- }
-}
diff --git a/test/pending/run/t5629.scala b/test/pending/run/t5629.scala
deleted file mode 100644
index 28e74a1c94..0000000000
--- a/test/pending/run/t5629.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-import scala.{specialized => spec}
-
-trait GrandParent[@spec(Int) -A] {
- def foo(a:A): Unit
- def bar[B <: A](b:B): Unit = println("grandparent got: %s" format b)
-}
-
-trait Parent[@spec(Int) -A] extends GrandParent[A] {
- def foo(a:A) = bar(a)
-}
-
-class IntChild extends Parent[Int] {
- override def bar[B <: Int](b:B): Unit = println("int child got: %s" format b)
-}
-
-class AnyChild extends Parent[Any] {
- override def bar[B <: Any](b:B): Unit = println("any child got: %s" format b)
-}
-
-object Test {
- def main(args:Array[String]) {
- new IntChild().foo(33)
- new AnyChild().foo(33)
- }
-}