aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-01-18 19:04:05 +0100
committerMartin Odersky <odersky@gmail.com>2015-01-18 19:04:05 +0100
commit9b260d087a4c63c39e404fd6ba7ade286fdfd8e8 (patch)
treecf25fbfcc868d7736314a314930b1f58b585996d /tests
parent14f4c964953535cb7375343ec5e8575e37083aba (diff)
downloaddotty-9b260d087a4c63c39e404fd6ba7ade286fdfd8e8.tar.gz
dotty-9b260d087a4c63c39e404fd6ba7ade286fdfd8e8.tar.bz2
dotty-9b260d087a4c63c39e404fd6ba7ade286fdfd8e8.zip
Moved previously failing tests to pos
GADTs now work again (they stopped workign when we went to the inductive satisfiability checks). The deep for expression also works, even with some more levels added.
Diffstat (limited to 'tests')
-rw-r--r--tests/pending/pos/t2624.scala4
-rw-r--r--tests/pending/pos/t267.scala55
-rw-r--r--tests/pos/i0268.scala (renamed from tests/pending/pos/i0268.scala)0
-rw-r--r--tests/pos/t0674.scala (renamed from tests/pending/pos/t0674.scala)13
-rw-r--r--tests/pos/t1208.scala (renamed from tests/pending/pos/t1208.scala)0
5 files changed, 6 insertions, 66 deletions
diff --git a/tests/pending/pos/t2624.scala b/tests/pending/pos/t2624.scala
deleted file mode 100644
index 76f0e3036..000000000
--- a/tests/pending/pos/t2624.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test {
- List(1).map(identity(_))
- List(1).map(identity) // this didn't typecheck before the fix
-}
diff --git a/tests/pending/pos/t267.scala b/tests/pending/pos/t267.scala
deleted file mode 100644
index 7e5876eae..000000000
--- a/tests/pending/pos/t267.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package expAbstractData
-
-/** A base class consisting of
- * - a root trait (i.e. abstract class) `Exp' with an `eval' function
- * - an abstract type `exp' bounded by `Exp'
- * - a concrete instance class `Num' of `Exp' for numeric literals
- */
-trait Base {
- type exp <: Exp
-
- trait Exp {
- def eval: Int
- }
- class Num(v: Int) extends Exp { self: exp =>
- val value = v
- def eval = value
- }
-}
-
-object testBase extends App with Base {
- type exp = Exp
- val term = new Num(2);
- Console.println(term.eval)
-}
-
-/** Data extension: An extension of `Base' with `Plus' expressions
- */
-trait BasePlus extends Base {
- class Plus(l: exp, r: exp) extends Exp { self: exp =>
- val left = l
- val right = r
- def eval = left.eval + right.eval
- }
-}
-
-/** Operation extension: An extension of `Base' with 'show' methods.
- */
-trait Show extends Base {
- type exp <: Exp1
-
- trait Exp1 extends Exp {
- def show: String
- }
- class Num1(v: Int) extends Num(v) with Exp1 { self: exp with Num1 =>
- def show = value.toString()
- }
-}
-
-/** Operation extension: An extension of `BasePlus' with 'show' methods.
- */
-trait ShowPlus extends BasePlus with Show {
- class Plus1(l: exp, r: exp) extends Plus(l, r) with Exp1 { self: exp with Plus1 =>
- def show = left.show + " + " + right.show
- }
-}
diff --git a/tests/pending/pos/i0268.scala b/tests/pos/i0268.scala
index 6ac0c5c90..6ac0c5c90 100644
--- a/tests/pending/pos/i0268.scala
+++ b/tests/pos/i0268.scala
diff --git a/tests/pending/pos/t0674.scala b/tests/pos/t0674.scala
index e405f4b8d..a734091da 100644
--- a/tests/pending/pos/t0674.scala
+++ b/tests/pos/t0674.scala
@@ -11,8 +11,7 @@ for(a <- Some(1);
i <- Some(9);
j <- Some(10);
k <- Some(11);
- l <- Some(12)
-/*
+ l <- Some(12);
m <- Some(13);
n <- Some(14);
o <- Some(15);
@@ -40,10 +39,10 @@ for(a <- Some(1);
l <- Some(12);
m <- Some(13);
n <- Some(14);
- o <- Some(15)*/
-// p <- Some(16);
-// q <- Some(17)
-// r <- Some(18);
-// s <- Some(19)
+ o <- Some(15);
+ p <- Some(16);
+ q <- Some(17);
+ r <- Some(18);
+ s <- Some(19)
) yield a)
}
diff --git a/tests/pending/pos/t1208.scala b/tests/pos/t1208.scala
index 7b14aadca..7b14aadca 100644
--- a/tests/pending/pos/t1208.scala
+++ b/tests/pos/t1208.scala