From 7c40b03aa9210dc1989cc08c0f03f7d4dd4e9e47 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 21 Dec 2014 12:59:28 +0100 Subject: test reorg Moved working tests to pos, annotated non-working ones. --- tests/pending/pos/bounds.scala | 11 ----------- tests/pending/pos/caseClassInMethod.scala | 5 ----- tests/pending/pos/channels.scala | 4 +++- tests/pending/pos/class-dependent-extension-method.scala | 3 --- tests/pos/bounds.scala | 11 +++++++++++ tests/pos/caseClassInMethod.scala | 5 +++++ tests/pos/class-dependent-extension-method.scala | 3 +++ 7 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 tests/pending/pos/bounds.scala delete mode 100644 tests/pending/pos/caseClassInMethod.scala delete mode 100644 tests/pending/pos/class-dependent-extension-method.scala create mode 100644 tests/pos/bounds.scala create mode 100644 tests/pos/caseClassInMethod.scala create mode 100644 tests/pos/class-dependent-extension-method.scala diff --git a/tests/pending/pos/bounds.scala b/tests/pending/pos/bounds.scala deleted file mode 100644 index 26bc84a1b..000000000 --- a/tests/pending/pos/bounds.scala +++ /dev/null @@ -1,11 +0,0 @@ -trait Map[A, +C] { - def ++ [B1 >: C] (kvs: Iterable[Tuple2[A, B1]]): Map[A, B1] = this - def ++ [B1 >: C] (kvs: Iterator[Tuple2[A, B1]]): Map[A, B1] = this -} - -class ListMap[A, +B] extends Map[A, B] {} - -object ListMap { - def empty[X, Y] = new ListMap[X, Y] - def apply[A1, B2](elems: Tuple2[A1, B2]*): Map[A1, B2] = empty[A1,B2].++(elems.iterator) -} diff --git a/tests/pending/pos/caseClassInMethod.scala b/tests/pending/pos/caseClassInMethod.scala deleted file mode 100644 index 958e5dd47..000000000 --- a/tests/pending/pos/caseClassInMethod.scala +++ /dev/null @@ -1,5 +0,0 @@ -object t { - def f = { object C; case class C(); 1 } - // pending: def g = { case class D(x: Int); object D; 2 } - def h = { case class E(y: Int = 10); 3 } -} diff --git a/tests/pending/pos/channels.scala b/tests/pending/pos/channels.scala index b2f0cdc32..77736305f 100644 --- a/tests/pending/pos/channels.scala +++ b/tests/pending/pos/channels.scala @@ -1,3 +1,5 @@ +// To compile this test, we need some more elaborate GADT capabilities. +// Not sure yet we should invest to get them. class Channel[a] import collection.mutable.Set @@ -16,7 +18,7 @@ object Test extends App { def f[b](x: ![b]): Int = x match { case send: ![c] => send.chan match { - case IC => send.data + case IC => send.data // Here, from the fact that `chan` is an IC, we need to conclude that `c` is Int. } } } diff --git a/tests/pending/pos/class-dependent-extension-method.scala b/tests/pending/pos/class-dependent-extension-method.scala deleted file mode 100644 index b557dfa8f..000000000 --- a/tests/pending/pos/class-dependent-extension-method.scala +++ /dev/null @@ -1,3 +0,0 @@ -class C(val a: String) extends AnyVal { - def foo[U <: a.type]: Unit = foo[U] -} diff --git a/tests/pos/bounds.scala b/tests/pos/bounds.scala new file mode 100644 index 000000000..26bc84a1b --- /dev/null +++ b/tests/pos/bounds.scala @@ -0,0 +1,11 @@ +trait Map[A, +C] { + def ++ [B1 >: C] (kvs: Iterable[Tuple2[A, B1]]): Map[A, B1] = this + def ++ [B1 >: C] (kvs: Iterator[Tuple2[A, B1]]): Map[A, B1] = this +} + +class ListMap[A, +B] extends Map[A, B] {} + +object ListMap { + def empty[X, Y] = new ListMap[X, Y] + def apply[A1, B2](elems: Tuple2[A1, B2]*): Map[A1, B2] = empty[A1,B2].++(elems.iterator) +} diff --git a/tests/pos/caseClassInMethod.scala b/tests/pos/caseClassInMethod.scala new file mode 100644 index 000000000..958e5dd47 --- /dev/null +++ b/tests/pos/caseClassInMethod.scala @@ -0,0 +1,5 @@ +object t { + def f = { object C; case class C(); 1 } + // pending: def g = { case class D(x: Int); object D; 2 } + def h = { case class E(y: Int = 10); 3 } +} diff --git a/tests/pos/class-dependent-extension-method.scala b/tests/pos/class-dependent-extension-method.scala new file mode 100644 index 000000000..b557dfa8f --- /dev/null +++ b/tests/pos/class-dependent-extension-method.scala @@ -0,0 +1,3 @@ +class C(val a: String) extends AnyVal { + def foo[U <: a.type]: Unit = foo[U] +} -- cgit v1.2.3