From a15e48df88fde5172526f68939530862f72f19ca Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 27 Oct 2010 00:59:25 +0000
Subject: Merge branch 'oct26' of /scala/trunk

---
 test/files/run/bug576-regress.scala | 17 --------------
 test/files/run/bug576.check         |  5 +++++
 test/files/run/bug576.scala         | 45 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 17 deletions(-)
 delete mode 100644 test/files/run/bug576-regress.scala
 create mode 100644 test/files/run/bug576.check
 create mode 100644 test/files/run/bug576.scala

(limited to 'test/files/run')

diff --git a/test/files/run/bug576-regress.scala b/test/files/run/bug576-regress.scala
deleted file mode 100644
index b608dd5a42..0000000000
--- a/test/files/run/bug576-regress.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-class A {
-  override def equals(other: Any) = other match {
-    case _: this.type => true
-    case _            => false
-  }
-}
-
-object Test {
-  def main(args: Array[String]): Unit = {
-    val x1 = new A
-    val x2 = new A
-    assert(x1 == x1)
-    assert(x1 != x2)
-    assert(x1 != ())
-    assert(x2 != x1)
-  }
-}
\ No newline at end of file
diff --git a/test/files/run/bug576.check b/test/files/run/bug576.check
new file mode 100644
index 0000000000..8a1218a102
--- /dev/null
+++ b/test/files/run/bug576.check
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5
diff --git a/test/files/run/bug576.scala b/test/files/run/bug576.scala
new file mode 100644
index 0000000000..2fc929f325
--- /dev/null
+++ b/test/files/run/bug576.scala
@@ -0,0 +1,45 @@
+class A {
+  override def equals(other: Any) = other match {
+    case _: this.type => true
+    case _            => false
+  }
+}
+
+object Dingus {
+  def IamDingus = 5
+}
+
+object Test {
+  val x1 = new A
+  val x2 = new A
+
+  val x3 = new { self =>
+    override def equals(other : Any) = other match {
+      case that: self.type    => true
+      case _                  => false
+    }
+  }
+  val x4 = new { self =>
+    def f(x: Any) = x match {
+      case _: x1.type     => 1
+      case _: x2.type     => 2
+      case _: x3.type     => 3
+      case _: self.type   => 4
+      case x: Dingus.type => x.IamDingus
+    }
+  }
+
+  def main(args: Array[String]): Unit = {
+
+    assert(x1 == x1)
+    assert(x1 != x2)
+    assert(x1 != ())
+    assert(x2 != x1)
+
+    assert(x3 == x3)
+    assert(x3 != x2)
+    assert(x2 != x3)
+
+    List(x1, x2, x3, x4, Dingus) map x4.f foreach println
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3