From 3d3787b6d4217b4837196e2a02f64c18f1eb98ab Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 6 Oct 2005 16:51:09 +0000 Subject: *** empty log message *** --- test/files/pos/gui.scala | 2 +- test/files/pos/matthias4.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/files') diff --git a/test/files/pos/gui.scala b/test/files/pos/gui.scala index b40759fb01..27863f7368 100644 --- a/test/files/pos/gui.scala +++ b/test/files/pos/gui.scala @@ -49,7 +49,7 @@ object GUI { def enable(b: Boolean): this.type; } - trait MouseCtl extends Ctl { + trait MouseCtl with Ctl { def mouseDown(p: Geom.Point): unit; } diff --git a/test/files/pos/matthias4.scala b/test/files/pos/matthias4.scala index c6ce79d682..bcda93746b 100644 --- a/test/files/pos/matthias4.scala +++ b/test/files/pos/matthias4.scala @@ -29,7 +29,7 @@ trait _a extends Object with _b { def setX(x: B.X): Unit; } } -trait a123 extends Object with _a with _b { +abstract class a123() extends Object with _a with _b { val a: this.type = this; val A: A = new A(); class A() extends AObject { @@ -67,13 +67,13 @@ trait _m { abstract class m() extends Object with _m with _b { val m: this.type = this; val M: M = new M(); - class M() extends MObject with a123 with Linker { + class M() extends MObject with a123() with Linker() { def test() = { val x: B.X = B.getX(); A.setX(x); } } - trait Linker { + abstract class Linker() { val b: m.this.b.type = m.this.b; val B: m.this.B.type = m.this.B; type B = m.this.B; -- cgit v1.2.3