diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/pos/matthias4.scala | 4 | ||||
-rw-r--r-- | test/files/run/Course-2002-07.scala | 2 | ||||
-rw-r--r-- | test/pos/matthias4.scala | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/files/pos/matthias4.scala b/test/files/pos/matthias4.scala index 32200cccd1..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; } } -abstract class a() 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,7 +67,7 @@ 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 a() with Linker() { + class M() extends MObject with a123() with Linker() { def test() = { val x: B.X = B.getX(); A.setX(x); diff --git a/test/files/run/Course-2002-07.scala b/test/files/run/Course-2002-07.scala index 2a45805138..01a0e183b8 100644 --- a/test/files/run/Course-2002-07.scala +++ b/test/files/run/Course-2002-07.scala @@ -504,7 +504,7 @@ object MB { private def vars: List[String] = match { case Var(n) => List(n) case Mul(l,r) => l.vars ::: r.vars - case Pow(l,n) => { val vs = l.vars; List.range(0,n).flatMap(i => vs) } + case Pow(l,n) => { val vs = l.vars; Predef.List.range(0,n).flatMap(i => vs) } case _ => List() } diff --git a/test/pos/matthias4.scala b/test/pos/matthias4.scala index 32200cccd1..bcda93746b 100644 --- a/test/pos/matthias4.scala +++ b/test/pos/matthias4.scala @@ -29,7 +29,7 @@ trait _a extends Object with _b { def setX(x: B.X): Unit; } } -abstract class a() 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,7 +67,7 @@ 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 a() with Linker() { + class M() extends MObject with a123() with Linker() { def test() = { val x: B.X = B.getX(); A.setX(x); |