summaryrefslogtreecommitdiff
path: root/test/pos
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-08-15 12:54:18 +0000
committerMartin Odersky <odersky@gmail.com>2003-08-15 12:54:18 +0000
commit5fdf691280325593178fb60c1eee97255dcddf8a (patch)
treeb577b7a9c9b5cc5fafef1f03686331905bd71e48 /test/pos
parentcce804c34f58e904cdc66889ba9990b3edd827f5 (diff)
downloadscala-5fdf691280325593178fb60c1eee97255dcddf8a.tar.gz
scala-5fdf691280325593178fb60c1eee97255dcddf8a.tar.bz2
scala-5fdf691280325593178fb60c1eee97255dcddf8a.zip
*** empty log message ***
Diffstat (limited to 'test/pos')
-rw-r--r--test/pos/michel2.scala19
-rw-r--r--test/pos/override.scala2
2 files changed, 15 insertions, 6 deletions
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;
}