diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/vincent.scala | 14 | ||||
-rw-r--r-- | test/files/neg/vincent1.scala | 6 | ||||
-rw-r--r-- | test/files/pos/matthias3.scala | 2 | ||||
-rw-r--r-- | test/files/pos/matthias5.scala | 2 | ||||
-rw-r--r-- | test/neg/vincent.scala | 14 | ||||
-rw-r--r-- | test/neg/vincent1.scala | 6 | ||||
-rw-r--r-- | test/pos/matthias3.scala | 2 | ||||
-rw-r--r-- | test/pos/matthias5.scala | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/test/files/neg/vincent.scala b/test/files/neg/vincent.scala index 0af526d6aa..b61c8c4127 100644 --- a/test/files/neg/vincent.scala +++ b/test/files/neg/vincent.scala @@ -4,17 +4,17 @@ module test { trait B { type T; } - /** def functor(x: A): B with { type T = x.T } */ + /** def functor(x: A): B { type T = x.T } */ abstract class functor() { val arg: A; - val res: B with { type T = arg.T } = - new B with { type T = arg.T; }; + val res: B { type T = arg.T } = + new B { type T = arg.T; }; } - val a = new A with { type T = String }; - /** val b: B with { type T = String } = functor(a) */ - val b: B with { type T = String } = { - val tmp = new functor() with { val arg = a }; + val a = new A { type T = String }; + /** val b: B { type T = String } = functor(a) */ + val b: B { type T = String } = { + val tmp = new functor() { val arg = a }; tmp.res } diff --git a/test/files/neg/vincent1.scala b/test/files/neg/vincent1.scala index afcb9a94f4..53104be640 100644 --- a/test/files/neg/vincent1.scala +++ b/test/files/neg/vincent1.scala @@ -4,12 +4,12 @@ module test { trait B { type T; } - def functor(x: A): B with { type T = x.T } = - new B with { + def functor(x: A): B { type T = x.T } = + new B { type T = x.T; }; - val a = new A with { type T = String }; + val a = new A { type T = String }; val b = functor(a); val s: b.T = "coucou"; diff --git a/test/files/pos/matthias3.scala b/test/files/pos/matthias3.scala index c76d291245..6e86afeca6 100644 --- a/test/files/pos/matthias3.scala +++ b/test/files/pos/matthias3.scala @@ -8,6 +8,6 @@ class B() extends A() { } abstract class C() { val b: B = new B(); - val a: A with { val y: b.type }; + val a: A { val y: b.type }; } diff --git a/test/files/pos/matthias5.scala b/test/files/pos/matthias5.scala index a6c9808c9e..0dcb7f833d 100644 --- a/test/files/pos/matthias5.scala +++ b/test/files/pos/matthias5.scala @@ -7,6 +7,6 @@ class B() extends A() { } abstract class C() { val b: B = new B(); - val a: A with { val y: b.type }; + val a: A { val y: b.type }; } diff --git a/test/neg/vincent.scala b/test/neg/vincent.scala index 0af526d6aa..b61c8c4127 100644 --- a/test/neg/vincent.scala +++ b/test/neg/vincent.scala @@ -4,17 +4,17 @@ module test { trait B { type T; } - /** def functor(x: A): B with { type T = x.T } */ + /** def functor(x: A): B { type T = x.T } */ abstract class functor() { val arg: A; - val res: B with { type T = arg.T } = - new B with { type T = arg.T; }; + val res: B { type T = arg.T } = + new B { type T = arg.T; }; } - val a = new A with { type T = String }; - /** val b: B with { type T = String } = functor(a) */ - val b: B with { type T = String } = { - val tmp = new functor() with { val arg = a }; + val a = new A { type T = String }; + /** val b: B { type T = String } = functor(a) */ + val b: B { type T = String } = { + val tmp = new functor() { val arg = a }; tmp.res } diff --git a/test/neg/vincent1.scala b/test/neg/vincent1.scala index afcb9a94f4..53104be640 100644 --- a/test/neg/vincent1.scala +++ b/test/neg/vincent1.scala @@ -4,12 +4,12 @@ module test { trait B { type T; } - def functor(x: A): B with { type T = x.T } = - new B with { + def functor(x: A): B { type T = x.T } = + new B { type T = x.T; }; - val a = new A with { type T = String }; + val a = new A { type T = String }; val b = functor(a); val s: b.T = "coucou"; diff --git a/test/pos/matthias3.scala b/test/pos/matthias3.scala index c76d291245..6e86afeca6 100644 --- a/test/pos/matthias3.scala +++ b/test/pos/matthias3.scala @@ -8,6 +8,6 @@ class B() extends A() { } abstract class C() { val b: B = new B(); - val a: A with { val y: b.type }; + val a: A { val y: b.type }; } diff --git a/test/pos/matthias5.scala b/test/pos/matthias5.scala index a6c9808c9e..0dcb7f833d 100644 --- a/test/pos/matthias5.scala +++ b/test/pos/matthias5.scala @@ -7,6 +7,6 @@ class B() extends A() { } abstract class C() { val b: B = new B(); - val a: A with { val y: b.type }; + val a: A { val y: b.type }; } |