From ded727e045d47103ccd9a576d2e15bb1ca2695a2 Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Fri, 18 Feb 2005 18:40:21 +0000
Subject: - Fixed and added bug 399

---
 test/files/pos/compile.scala | 17 +++++++++++++++++
 test/files/run/bugs.check    |  4 ++++
 test/files/run/bugs.scala    | 18 ++++++++++++++++++
 3 files changed, 39 insertions(+)

(limited to 'test')

diff --git a/test/files/pos/compile.scala b/test/files/pos/compile.scala
index b926456753..3979c9737a 100644
--- a/test/files/pos/compile.scala
+++ b/test/files/pos/compile.scala
@@ -130,3 +130,20 @@ class Test2_3() {
 }
 
 //############################################################################
+// Test 3 - Super Calls with Mixins
+
+class Test3Foo;
+
+trait Test3A[T] {
+  def fun: T = fun;
+}
+
+class Test3B with Test3A[Test3Foo];
+
+trait Test3M extends Test3A[Test3Foo] {
+  override def fun: Test3Foo = super.fun;
+}
+
+class Test3C extends Test3B with Test3M;
+
+//############################################################################
diff --git a/test/files/run/bugs.check b/test/files/run/bugs.check
index 7dd6a42bfb..d61bdf9afc 100644
--- a/test/files/run/bugs.check
+++ b/test/files/run/bugs.check
@@ -91,3 +91,7 @@ B
 C
 >>> bug 396
 
+<<< bug 399
+a
+>>> bug 399
+
diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala
index 494ed35b53..d8b21b7b59 100644
--- a/test/files/run/bugs.scala
+++ b/test/files/run/bugs.scala
@@ -431,6 +431,23 @@ object Bug396Test extends Bug396B with Bug396C with Application {
   (new I2).run
 }
 
+//############################################################################
+// Bug 399
+
+object Bug399Test {
+  def f(x: String): String = {
+    trait C { def f: String = x; }
+    class D with C;
+    class F with C;
+    class G extends D with F;
+    (new G).f
+  }
+
+  def main(args: Array[String]): Unit = {
+    System.out.println(f("a"));
+  }
+}
+
 //############################################################################
 // Main
 
@@ -478,6 +495,7 @@ object Test  {
     test(316, Bug316Test.main(args));
     test(328, Bug328Test.main(args));
     test(396, Bug396Test.main(args));
+    test(399, Bug399Test.main(args));
 
     if (errors > 0) {
       System.out.println();
-- 
cgit v1.2.3