diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-28 15:34:32 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-28 15:34:32 +0000 |
commit | 0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47 (patch) | |
tree | d506f42b6847b9ece5240d062bb9e4b97a450019 /test/disabled/pos | |
parent | 5da8a164cdd276e191ab6429e5a64e02529bbe45 (diff) | |
download | scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.gz scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.bz2 scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.zip |
Re-enabled a number of previously disabled tests;
according to my tests, they all currently work.
Diffstat (limited to 'test/disabled/pos')
-rw-r--r-- | test/disabled/pos/t1053.scala | 6 | ||||
-rw-r--r-- | test/disabled/pos/t2619.scala | 80 | ||||
-rw-r--r-- | test/disabled/pos/ticket2251.scala | 25 |
3 files changed, 0 insertions, 111 deletions
diff --git a/test/disabled/pos/t1053.scala b/test/disabled/pos/t1053.scala deleted file mode 100644 index 1d4dfb637e..0000000000 --- a/test/disabled/pos/t1053.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait T[A] { trait U { type W = A; val x = 3 } } - -object Test { - val x : ({ type V = T[this.type] })#V = null - val y = new x.U { } -} diff --git a/test/disabled/pos/t2619.scala b/test/disabled/pos/t2619.scala deleted file mode 100644 index 565bc9572b..0000000000 --- a/test/disabled/pos/t2619.scala +++ /dev/null @@ -1,80 +0,0 @@ -abstract class F { - final def apply(x: Int): AnyRef = null -} -abstract class AbstractModule { - def as: List[AnyRef] - def ms: List[AbstractModule] - def fs: List[F] = Nil - def rs(x: Int): List[AnyRef] = fs.map(_(x)) -} -abstract class ModuleType1 extends AbstractModule {} -abstract class ModuleType2 extends AbstractModule {} - -object ModuleAE extends ModuleType1 { - def as = Nil - def ms = Nil -} -object ModuleAF extends ModuleType2 { - def as = Nil - def ms = List(ModuleAE) -} -object ModuleAG extends ModuleType1 { - def as = List("") - def ms = Nil -} -object ModuleAI extends ModuleType1 { - def as = Nil - def ms = List(ModuleAE) -} -object ModuleAK extends ModuleType2 { - def as = Nil - def ms = List(ModuleAF) -} -object ModuleAL extends ModuleType1 { - def as = Nil - def ms = List( - ModuleAG, - ModuleAI - ) -} -object ModuleAM extends ModuleType1 { - def as = Nil - def ms = List( - ModuleAL, - ModuleAE - ) ::: List(ModuleAK) -} -object ModuleBE extends ModuleType1 { - def as = Nil - def ms = Nil -} -object ModuleBF extends ModuleType2 { - def as = Nil - def ms = List(ModuleBE) -} -object ModuleBG extends ModuleType1 { - def as = List("") - def ms = Nil -} -object ModuleBI extends ModuleType1 { - def as = Nil - def ms = List(ModuleBE) -} -object ModuleBK extends ModuleType2 { - def as = Nil - def ms = List(ModuleBF) -} -object ModuleBL extends ModuleType1 { - def as = Nil - def ms = List( - ModuleBG, - ModuleBI - ) -} -object ModuleBM extends ModuleType1 { - def as = Nil - def ms = List( - ModuleBL, - ModuleBE - ) ::: List(ModuleBK) -}
\ No newline at end of file diff --git a/test/disabled/pos/ticket2251.scala b/test/disabled/pos/ticket2251.scala deleted file mode 100644 index 7b6efb0ea0..0000000000 --- a/test/disabled/pos/ticket2251.scala +++ /dev/null @@ -1,25 +0,0 @@ - -// Martin: I am not sure this is a solvable problem right now. I'll leave it in pending. -// derived from pos/bug1001 -class A -trait B[T <: B[T]] extends A -class C extends B[C] -class D extends B[D] - -class Data { - // force computing lub of C and D (printLubs enabled:) - -/* -lub of List(D, C) at depth 2 - lub of List(D, C) at depth 1 - lub of List(D, C) at depth 0 - lub of List(D, C) is A - lub of List(D, C) is B[_1] forSome { type _1 >: D with C <: A } -lub of List(D, C) is B[_2] forSome { type _2 >: D with C{} <: B[_1] forSome { type _1 >: D with C{} <: A } } -*/ -// --> result = WRONG - - // should be: B[X] forSome {type X <: B[X]} -- can this be done automatically? for now, just detect f-bounded polymorphism and fall back to more coarse approximation - - val data: List[A] = List(new C, new D) -} |