diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-03-25 19:08:47 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-03-25 19:08:47 +0100 |
| commit | ed1de3a26e00e5b7f4113ce32fa00c2f992deafa (patch) | |
| tree | c2a4475353919246f513f39a3f7bd7739784012a /tests | |
| parent | c22d468e0cf10010c798b1a7d991925a5091700c (diff) | |
| parent | 77997f30b28b3588967052647ad3d5164a585f40 (diff) | |
| download | dotty-ed1de3a26e00e5b7f4113ce32fa00c2f992deafa.tar.gz dotty-ed1de3a26e00e5b7f4113ce32fa00c2f992deafa.tar.bz2 dotty-ed1de3a26e00e5b7f4113ce32fa00c2f992deafa.zip | |
Merge pull request #428 from dotty-staging/trait-constructors
New phase: trait constructors
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pos/approximateUnion.scala | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/pos/approximateUnion.scala b/tests/pos/approximateUnion.scala index c3fe0e162..d23c3ca0e 100644 --- a/tests/pos/approximateUnion.scala +++ b/tests/pos/approximateUnion.scala @@ -10,8 +10,8 @@ object approximateUnion { trait B extends C[B] with D val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{} ) val xtest: C[A | B] & D = x val ytest: Some[C[A | B] & D] = y @@ -22,8 +22,8 @@ object approximateUnion { trait B extends C[X[B]] with D with E val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{}) val xtest: C[X[A & B]] & D = x val ytest: Some[C[X[A & B]] & D] = y @@ -42,8 +42,8 @@ object approximateUnion2 { trait B extends C[B] with D val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{}) val xtest: C[_ >: A & B <: A | B] & D = x val ytest: Some[C[_ >: A & B <: A | B] & D] = y @@ -54,8 +54,8 @@ object approximateUnion2 { trait B extends C[X[B]] with D with E val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{}) val xtest: C[_ >: X[A | B] <: X[A & B]] & D = x val ytest: Some[C[_ >: X[A | B] <: X[A & B]]] = y @@ -74,8 +74,8 @@ object approximateUnion3 { trait B extends C[B] with D val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{}) val xtest: C[A & B] & D = x val ytest: Some[C[A & B] & D] = y @@ -86,8 +86,8 @@ object approximateUnion3 { trait B extends C[X[B]] with D with E val coin = true - val x = if (coin) new A else new B - val y = Some(if (coin) new A else new B) + val x = if (coin) new A{} else new B{} + val y = Some(if (coin) new A{} else new B{}) val xtest: C[X[A | B]] & D = x val ytest2: Some[C[X[A | B]] & D] = y |