aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/disabled/java-interop/pos/t2377/Q.java (renamed from tests/untried/pos/t2377/Q.java)0
-rw-r--r--tests/disabled/java-interop/pos/t2377/a.scala (renamed from tests/untried/pos/t2377/a.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t2409/J.java (renamed from tests/untried/pos/t2409/J.java)0
-rw-r--r--tests/disabled/java-interop/pos/t2409/t2409.scala (renamed from tests/untried/pos/t2409/t2409.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t2413/TestJava.java (renamed from tests/untried/pos/t2413/TestJava.java)0
-rw-r--r--tests/disabled/java-interop/pos/t2413/TestScalac.scala (renamed from tests/untried/pos/t2413/TestScalac.scala)0
-rwxr-xr-xtests/disabled/java-interop/pos/t2433/A.java (renamed from tests/untried/pos/t2433/A.java)0
-rwxr-xr-xtests/disabled/java-interop/pos/t2433/B.java (renamed from tests/untried/pos/t2433/B.java)0
-rwxr-xr-xtests/disabled/java-interop/pos/t2433/Test.scala (renamed from tests/untried/pos/t2433/Test.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t2464/JavaOne.java (renamed from tests/untried/pos/t2464/JavaOne.java)0
-rw-r--r--tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala (renamed from tests/untried/pos/t2464/ScalaOne_1.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t2464/t2464_2.scala (renamed from tests/untried/pos/t2464/t2464_2.scala)0
-rw-r--r--tests/new/t2405.scala (renamed from tests/untried/pos/t2405.scala)0
-rw-r--r--tests/new/t2421.scala (renamed from tests/untried/pos/t2421.scala)0
-rw-r--r--tests/new/t2421b_pos.scala (renamed from tests/untried/pos/t2421b_pos.scala)0
-rw-r--r--tests/new/t2421c.scala (renamed from tests/untried/pos/t2421c.scala)0
-rwxr-xr-xtests/new/t2425.scala (renamed from tests/untried/pos/t2425.scala)0
-rw-r--r--tests/new/t2435.scala (renamed from tests/untried/pos/t2435.scala)0
-rw-r--r--tests/new/t2441pos.scala (renamed from tests/untried/pos/t2441pos.scala)0
-rw-r--r--tests/new/t2444.scala (renamed from tests/untried/pos/t2444.scala)0
-rw-r--r--tests/new/t245.scala (renamed from tests/untried/pos/t245.scala)0
-rw-r--r--tests/new/t247.scala (renamed from tests/untried/pos/t247.scala)0
-rwxr-xr-xtests/new/t2484.scala (renamed from tests/untried/pos/t2484.scala)0
-rw-r--r--tests/new/t2486.scala (renamed from tests/untried/pos/t2486.scala)0
-rwxr-xr-xtests/pending/pos/t2429.scala (renamed from tests/untried/pos/t2429.scala)0
-rw-r--r--tests/pending/pos/t2454.scala (renamed from tests/untried/pos/t2454.scala)0
-rw-r--r--tests/pos/t2208_pos.scala (renamed from tests/untried/pos/t2208_pos.scala)0
-rw-r--r--tests/pos/t2234.scala (renamed from tests/untried/pos/t2234.scala)0
-rw-r--r--tests/pos/t2260.scala (renamed from tests/untried/pos/t2260.scala)0
-rw-r--r--tests/pos/t2261.scala (renamed from tests/untried/pos/t2261.scala)0
-rw-r--r--tests/pos/t229.scala (renamed from tests/untried/pos/t229.scala)0
-rw-r--r--tests/pos/t2293.scala (renamed from tests/untried/pos/t2293.scala)0
-rw-r--r--tests/pos/t2305.scala (renamed from tests/untried/pos/t2305.scala)0
-rw-r--r--tests/pos/t2310.scala (renamed from tests/untried/pos/t2310.scala)0
-rw-r--r--tests/pos/t2331.scala (renamed from tests/untried/pos/t2331.scala)0
-rw-r--r--tests/pos/t2399.scala (renamed from tests/untried/pos/t2399.scala)0
-rw-r--r--tests/untried/pos/t2421_delitedsl.scala37
37 files changed, 0 insertions, 37 deletions
diff --git a/tests/untried/pos/t2377/Q.java b/tests/disabled/java-interop/pos/t2377/Q.java
index e3d11c70e..e3d11c70e 100644
--- a/tests/untried/pos/t2377/Q.java
+++ b/tests/disabled/java-interop/pos/t2377/Q.java
diff --git a/tests/untried/pos/t2377/a.scala b/tests/disabled/java-interop/pos/t2377/a.scala
index bda59ce0d..bda59ce0d 100644
--- a/tests/untried/pos/t2377/a.scala
+++ b/tests/disabled/java-interop/pos/t2377/a.scala
diff --git a/tests/untried/pos/t2409/J.java b/tests/disabled/java-interop/pos/t2409/J.java
index 6b7c45ff6..6b7c45ff6 100644
--- a/tests/untried/pos/t2409/J.java
+++ b/tests/disabled/java-interop/pos/t2409/J.java
diff --git a/tests/untried/pos/t2409/t2409.scala b/tests/disabled/java-interop/pos/t2409/t2409.scala
index 0412f7d82..0412f7d82 100644
--- a/tests/untried/pos/t2409/t2409.scala
+++ b/tests/disabled/java-interop/pos/t2409/t2409.scala
diff --git a/tests/untried/pos/t2413/TestJava.java b/tests/disabled/java-interop/pos/t2413/TestJava.java
index 252c01fbc..252c01fbc 100644
--- a/tests/untried/pos/t2413/TestJava.java
+++ b/tests/disabled/java-interop/pos/t2413/TestJava.java
diff --git a/tests/untried/pos/t2413/TestScalac.scala b/tests/disabled/java-interop/pos/t2413/TestScalac.scala
index 098e852dd..098e852dd 100644
--- a/tests/untried/pos/t2413/TestScalac.scala
+++ b/tests/disabled/java-interop/pos/t2413/TestScalac.scala
diff --git a/tests/untried/pos/t2433/A.java b/tests/disabled/java-interop/pos/t2433/A.java
index 340690c40..340690c40 100755
--- a/tests/untried/pos/t2433/A.java
+++ b/tests/disabled/java-interop/pos/t2433/A.java
diff --git a/tests/untried/pos/t2433/B.java b/tests/disabled/java-interop/pos/t2433/B.java
index 151dd71ca..151dd71ca 100755
--- a/tests/untried/pos/t2433/B.java
+++ b/tests/disabled/java-interop/pos/t2433/B.java
diff --git a/tests/untried/pos/t2433/Test.scala b/tests/disabled/java-interop/pos/t2433/Test.scala
index 02fd89b64..02fd89b64 100755
--- a/tests/untried/pos/t2433/Test.scala
+++ b/tests/disabled/java-interop/pos/t2433/Test.scala
diff --git a/tests/untried/pos/t2464/JavaOne.java b/tests/disabled/java-interop/pos/t2464/JavaOne.java
index ff36868a0..ff36868a0 100644
--- a/tests/untried/pos/t2464/JavaOne.java
+++ b/tests/disabled/java-interop/pos/t2464/JavaOne.java
diff --git a/tests/untried/pos/t2464/ScalaOne_1.scala b/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala
index 1caf8ecae..1caf8ecae 100644
--- a/tests/untried/pos/t2464/ScalaOne_1.scala
+++ b/tests/disabled/java-interop/pos/t2464/ScalaOne_1.scala
diff --git a/tests/untried/pos/t2464/t2464_2.scala b/tests/disabled/java-interop/pos/t2464/t2464_2.scala
index 13a52c952..13a52c952 100644
--- a/tests/untried/pos/t2464/t2464_2.scala
+++ b/tests/disabled/java-interop/pos/t2464/t2464_2.scala
diff --git a/tests/untried/pos/t2405.scala b/tests/new/t2405.scala
index 224b2ce83..224b2ce83 100644
--- a/tests/untried/pos/t2405.scala
+++ b/tests/new/t2405.scala
diff --git a/tests/untried/pos/t2421.scala b/tests/new/t2421.scala
index 2544a1cb3..2544a1cb3 100644
--- a/tests/untried/pos/t2421.scala
+++ b/tests/new/t2421.scala
diff --git a/tests/untried/pos/t2421b_pos.scala b/tests/new/t2421b_pos.scala
index 679b8a8d6..679b8a8d6 100644
--- a/tests/untried/pos/t2421b_pos.scala
+++ b/tests/new/t2421b_pos.scala
diff --git a/tests/untried/pos/t2421c.scala b/tests/new/t2421c.scala
index bd24cacd7..bd24cacd7 100644
--- a/tests/untried/pos/t2421c.scala
+++ b/tests/new/t2421c.scala
diff --git a/tests/untried/pos/t2425.scala b/tests/new/t2425.scala
index 477d5467a..477d5467a 100755
--- a/tests/untried/pos/t2425.scala
+++ b/tests/new/t2425.scala
diff --git a/tests/untried/pos/t2435.scala b/tests/new/t2435.scala
index 697e9e1f2..697e9e1f2 100644
--- a/tests/untried/pos/t2435.scala
+++ b/tests/new/t2435.scala
diff --git a/tests/untried/pos/t2441pos.scala b/tests/new/t2441pos.scala
index 25eb2232c..25eb2232c 100644
--- a/tests/untried/pos/t2441pos.scala
+++ b/tests/new/t2441pos.scala
diff --git a/tests/untried/pos/t2444.scala b/tests/new/t2444.scala
index fac1e95d0..fac1e95d0 100644
--- a/tests/untried/pos/t2444.scala
+++ b/tests/new/t2444.scala
diff --git a/tests/untried/pos/t245.scala b/tests/new/t245.scala
index 570ac4178..570ac4178 100644
--- a/tests/untried/pos/t245.scala
+++ b/tests/new/t245.scala
diff --git a/tests/untried/pos/t247.scala b/tests/new/t247.scala
index fdcafeb2c..fdcafeb2c 100644
--- a/tests/untried/pos/t247.scala
+++ b/tests/new/t247.scala
diff --git a/tests/untried/pos/t2484.scala b/tests/new/t2484.scala
index 15165c247..15165c247 100755
--- a/tests/untried/pos/t2484.scala
+++ b/tests/new/t2484.scala
diff --git a/tests/untried/pos/t2486.scala b/tests/new/t2486.scala
index 69fe4c127..69fe4c127 100644
--- a/tests/untried/pos/t2486.scala
+++ b/tests/new/t2486.scala
diff --git a/tests/untried/pos/t2429.scala b/tests/pending/pos/t2429.scala
index 4cda3bde1..4cda3bde1 100755
--- a/tests/untried/pos/t2429.scala
+++ b/tests/pending/pos/t2429.scala
diff --git a/tests/untried/pos/t2454.scala b/tests/pending/pos/t2454.scala
index 00f2e6f67..00f2e6f67 100644
--- a/tests/untried/pos/t2454.scala
+++ b/tests/pending/pos/t2454.scala
diff --git a/tests/untried/pos/t2208_pos.scala b/tests/pos/t2208_pos.scala
index dd6d686ba..dd6d686ba 100644
--- a/tests/untried/pos/t2208_pos.scala
+++ b/tests/pos/t2208_pos.scala
diff --git a/tests/untried/pos/t2234.scala b/tests/pos/t2234.scala
index 218e9f5e5..218e9f5e5 100644
--- a/tests/untried/pos/t2234.scala
+++ b/tests/pos/t2234.scala
diff --git a/tests/untried/pos/t2260.scala b/tests/pos/t2260.scala
index 4e4cc5ab2..4e4cc5ab2 100644
--- a/tests/untried/pos/t2260.scala
+++ b/tests/pos/t2260.scala
diff --git a/tests/untried/pos/t2261.scala b/tests/pos/t2261.scala
index 06360d500..06360d500 100644
--- a/tests/untried/pos/t2261.scala
+++ b/tests/pos/t2261.scala
diff --git a/tests/untried/pos/t229.scala b/tests/pos/t229.scala
index 72ddfa74f..72ddfa74f 100644
--- a/tests/untried/pos/t229.scala
+++ b/tests/pos/t229.scala
diff --git a/tests/untried/pos/t2293.scala b/tests/pos/t2293.scala
index 536d4ec3d..536d4ec3d 100644
--- a/tests/untried/pos/t2293.scala
+++ b/tests/pos/t2293.scala
diff --git a/tests/untried/pos/t2305.scala b/tests/pos/t2305.scala
index 3338ab911..3338ab911 100644
--- a/tests/untried/pos/t2305.scala
+++ b/tests/pos/t2305.scala
diff --git a/tests/untried/pos/t2310.scala b/tests/pos/t2310.scala
index 68912b496..68912b496 100644
--- a/tests/untried/pos/t2310.scala
+++ b/tests/pos/t2310.scala
diff --git a/tests/untried/pos/t2331.scala b/tests/pos/t2331.scala
index a7f80ac98..a7f80ac98 100644
--- a/tests/untried/pos/t2331.scala
+++ b/tests/pos/t2331.scala
diff --git a/tests/untried/pos/t2399.scala b/tests/pos/t2399.scala
index a99998a0a..a99998a0a 100644
--- a/tests/untried/pos/t2399.scala
+++ b/tests/pos/t2399.scala
diff --git a/tests/untried/pos/t2421_delitedsl.scala b/tests/untried/pos/t2421_delitedsl.scala
deleted file mode 100644
index 2580592d9..000000000
--- a/tests/untried/pos/t2421_delitedsl.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-trait DeliteDSL {
- abstract class <~<[-From, +To] extends (From => To)
- implicit def trivial[A]: A <~< A = new (A <~< A) {def apply(x: A) = x}
-
- trait Forcible[T]
- object Forcible {
- def factory[T](f: T => Forcible[T]) = new (T <~< Forcible[T]){def apply(x: T) = f(x)}
- }
-
- case class DeliteInt(x: Int) extends Forcible[Int]
- implicit val forcibleInt: DeliteDSL.this.<~<[Int,DeliteDSL.this.Forcible[Int]] = Forcible.factory(DeliteInt(_: Int))
-
- import scala.collection.Traversable
- class DeliteCollection[T](val xs: Traversable[T]) {
- // must use existential in bound of P, instead of T itself, because we cannot both have:
- // Test.x below: DeliteCollection[T=Int] -> P=DeliteInt <: Forcible[T=Int], as T=Int <~< P=DeliteInt
- // Test.xAlready below: DeliteCollection[T=DeliteInt] -> P=DeliteInt <: Forcible[T=DeliteInt], as T=DeliteInt <~< P=DeliteInt
- // this would required DeliteInt <: Forcible[Int] with Forcible[DeliteInt]
-
- def headProxy[P <: Forcible[_]](implicit w: T <~< P): P = xs.head
- }
- // If T is already a proxy (it is forcible), the compiler should use
- // forcibleIdentity to deduce that P=T. If T is Int, the compiler
- // should use intToForcible to deduce that P=DeliteInt.
- //
- // Without this feature, the user must write 'xs.proxyOfFirst[DeliteInt]',
- // with the feature they can write 'xs.proxyOfFirst', which is shorter and
- // avoids exposing internal DELITE types to the world.
-
- object Test {
- val x = new DeliteCollection(List(1,2,3)).headProxy
- // inferred: val x: Forcible[Int] = new DeliteCollection[Int](List.apply[Int](1, 2, 3)).headProxy[Forcible[Int]](forcibleInt);
-
- val xAlready = new DeliteCollection(List(DeliteInt(1),DeliteInt(2),DeliteInt(3))).headProxy
- // inferred: val xAlready: DeliteInt = new DeliteCollection[DeliteInt](List.apply[DeliteInt](DeliteInt(1), DeliteInt(2), DeliteInt(3))).headProxy[DeliteInt](trivial[DeliteInt]);
- }
-}