From 5fdf691280325593178fb60c1eee97255dcddf8a Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Fri, 15 Aug 2003 12:54:18 +0000
Subject: *** empty log message ***

---
 test/files/neg/S7.check       |  2 +-
 test/files/neg/bug71.check    |  4 ----
 test/files/neg/bug71.scala    | 10 ----------
 test/files/pos/michel2.scala  | 19 ++++++++++++++-----
 test/files/pos/override.scala |  2 +-
 test/neg/S7.check             |  2 +-
 test/neg/bug71.check          |  4 ----
 test/neg/bug71.scala          | 10 ----------
 test/pos/michel2.scala        | 19 ++++++++++++++-----
 test/pos/override.scala       |  2 +-
 10 files changed, 32 insertions(+), 42 deletions(-)
 delete mode 100644 test/files/neg/bug71.check
 delete mode 100644 test/files/neg/bug71.scala
 delete mode 100644 test/neg/bug71.check
 delete mode 100644 test/neg/bug71.scala

(limited to 'test')

diff --git a/test/files/neg/S7.check b/test/files/neg/S7.check
index 59c57786b3..c12c624cd7 100644
--- a/test/files/neg/S7.check
+++ b/test/files/neg/S7.check
@@ -1,4 +1,4 @@
 S7.scala:6: illegal cyclic reference involving class S7.A
     class C() extends a.A() {}
-                       ^
+                         ^
 one error found
diff --git a/test/files/neg/bug71.check b/test/files/neg/bug71.check
deleted file mode 100644
index 8a939dbbae..0000000000
--- a/test/files/neg/bug71.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug71.scala:3: class ga2 needs to be abstract, since method foo in class gu.ga1 is not defined
-object ga2 extends gu.ga1() {
-       ^
-one error found
diff --git a/test/files/neg/bug71.scala b/test/files/neg/bug71.scala
deleted file mode 100644
index 67c3cdd7f9..0000000000
--- a/test/files/neg/bug71.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// ga2
-
-object ga2 extends gu.ga1() {
-  // implementation of foo()
-  def foo():java.lang.String = "foo";
-  // my main inherited
-  def main( args:Array[String] ):Unit = {
-    mymain ();
-  }
-}
diff --git a/test/files/pos/michel2.scala b/test/files/pos/michel2.scala
index d5b61dda21..e6976b0f40 100644
--- a/test/files/pos/michel2.scala
+++ b/test/files/pos/michel2.scala
@@ -1,7 +1,16 @@
-trait A extends Object {
-  def f : Int = 1
+object Test {
+
+  trait A extends Object {
+    def f : Int = 1
+  }
+
+  class B extends Object with A {
+    override def f : Int = super[A].f
+  }
+
+  def main(args: Array[String]) =
+    System.out.println(new B().f);
 }
 
-trait B extends Object with A {
-  override def f : Int = super.f
-}
\ No newline at end of file
+
+
diff --git a/test/files/pos/override.scala b/test/files/pos/override.scala
index a6c81c9b8a..9f068b8ecd 100644
--- a/test/files/pos/override.scala
+++ b/test/files/pos/override.scala
@@ -8,7 +8,7 @@ trait B extends Object {
 }
 
 trait C extends Object with A with B {
-  override def f = super.f;
+  override def f = super[B].f;
   val a: A;
   val x: a.type = a;
 }
diff --git a/test/neg/S7.check b/test/neg/S7.check
index 59c57786b3..c12c624cd7 100644
--- a/test/neg/S7.check
+++ b/test/neg/S7.check
@@ -1,4 +1,4 @@
 S7.scala:6: illegal cyclic reference involving class S7.A
     class C() extends a.A() {}
-                       ^
+                         ^
 one error found
diff --git a/test/neg/bug71.check b/test/neg/bug71.check
deleted file mode 100644
index 8a939dbbae..0000000000
--- a/test/neg/bug71.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug71.scala:3: class ga2 needs to be abstract, since method foo in class gu.ga1 is not defined
-object ga2 extends gu.ga1() {
-       ^
-one error found
diff --git a/test/neg/bug71.scala b/test/neg/bug71.scala
deleted file mode 100644
index 67c3cdd7f9..0000000000
--- a/test/neg/bug71.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// ga2
-
-object ga2 extends gu.ga1() {
-  // implementation of foo()
-  def foo():java.lang.String = "foo";
-  // my main inherited
-  def main( args:Array[String] ):Unit = {
-    mymain ();
-  }
-}
diff --git a/test/pos/michel2.scala b/test/pos/michel2.scala
index d5b61dda21..e6976b0f40 100644
--- a/test/pos/michel2.scala
+++ b/test/pos/michel2.scala
@@ -1,7 +1,16 @@
-trait A extends Object {
-  def f : Int = 1
+object Test {
+
+  trait A extends Object {
+    def f : Int = 1
+  }
+
+  class B extends Object with A {
+    override def f : Int = super[A].f
+  }
+
+  def main(args: Array[String]) =
+    System.out.println(new B().f);
 }
 
-trait B extends Object with A {
-  override def f : Int = super.f
-}
\ No newline at end of file
+
+
diff --git a/test/pos/override.scala b/test/pos/override.scala
index a6c81c9b8a..9f068b8ecd 100644
--- a/test/pos/override.scala
+++ b/test/pos/override.scala
@@ -8,7 +8,7 @@ trait B extends Object {
 }
 
 trait C extends Object with A with B {
-  override def f = super.f;
+  override def f = super[B].f;
   val a: A;
   val x: a.type = a;
 }
-- 
cgit v1.2.3