gixed gilles' gadt problems. Added some tests

7 files changed, 87 insertions, 0 deletions

diff --git a/test/files/pos/gadt-gilles.scala b/test/files/pos/gadt-gilles.scala
new file mode 100644
index 0000000000..662be9017d
--- /dev/null
+++ b/test/files/pos/gadt-gilles.scala
@@ -0,0 +1,37 @@
+object Test {
+    trait A[T]
+    trait B[U, V] extends A[U with V] // indirect constraint
+    trait C
+    trait D
+
+  val x: A[C with D] = new B[C, D] {}
+  val y: A[C with D] = x match { case b: B[u, v] => (new B[u, v] {}): A[u with v] } // OK
+
+
+  def f[T, U](p: A[T with U]): A[T with U] = p match { case b: B[u, v] => new A[u with v] {} } // Not OK
+}
+
+object Test1 {
+
+ trait T[U, V <: U]
+
+ def f(r: Any) = r match {
+
+   case t: T[u, v] => new T[u, v]{}
+
+ }
+
+}
+object Test2 {
+
+ trait T[U, V <: U]
+
+ val x: T[Int, Int] = new T[Int, Int]{}
+
+ x match {
+
+   case t: T[u, v] => new T[u, v]{}
+
+ }
+
+}
diff --git a/test/files/pos/t0504.scala b/test/files/pos/t0504.scala
new file mode 100644
index 0000000000..b2b0b85e43
--- /dev/null
+++ b/test/files/pos/t0504.scala
@@ -0,0 +1,9 @@
+package b {
+  class B
+}
+
+package a.b {
+  class A {
+    val x = new _root_.b.B
+  }
+}
diff --git a/test/files/pos/t0971.java b/test/files/pos/t0971.java
new file mode 100755
index 0000000000..d852ef698d
--- /dev/null
+++ b/test/files/pos/t0971.java
@@ -0,0 +1,4 @@
+class A {
+    int y = 1, z;
+    static Object x = new java.util.HashMap<Object , Object > () ;
+}
\ No newline at end of file
diff --git a/test/files/run/t0883.check b/test/files/run/t0883.check
new file mode 100644
index 0000000000..2c94e48371
--- /dev/null
+++ b/test/files/run/t0883.check
@@ -0,0 +1,2 @@
+OK
+OK
diff --git a/test/files/run/t0883.scala b/test/files/run/t0883.scala
new file mode 100755
index 0000000000..5cd4418f5b
--- /dev/null
+++ b/test/files/run/t0883.scala
@@ -0,0 +1,13 @@
+case class Foo(name: String)
+case object Bar extends Foo("Bar")
+case class Baz extends Foo("Baz")
+object Test extends Application {
+  Foo("Bar") match {
+    case Bar => println("What?")
+    case _ => println("OK")
+  }
+  Foo("Baz") match {
+    case Baz() => println("What?")
+    case _ => println("OK")
+  }
+}
diff --git a/test/pending/run/t0508.scala b/test/pending/run/t0508.scala
new file mode 100755
index 0000000000..7ef6f8197f
--- /dev/null
+++ b/test/pending/run/t0508.scala
@@ -0,0 +1,13 @@
+object Test extends Application {
+
+  case class Foo(s: String, n: Int)
+
+  def foo[A, B, C](unapply1: A => Option[(B, C)], v: A) = {
+    unapply1(v) match {
+      case Some((fst, snd)) => println("first: " + fst, " second: " + snd)
+      case _ => println(":(")
+    }
+  }
+
+  foo(Foo.unapply, Foo("this might be fun", 10))
+}
diff --git a/test/pending/run/t0889.scala b/test/pending/run/t0889.scala
new file mode 100755
index 0000000000..db6076e8e2
--- /dev/null
+++ b/test/pending/run/t0889.scala
@@ -0,0 +1,9 @@
+object Test extends Application {
+
+  val a = List("a")
+
+  a match {
+    case Seq("a", "b", rest @ _*) => println("a, b, " + rest)
+    case Seq(first, rest @ _*) => println("first: " + first + ", rest: " + rest)
+  }
+}