aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/dotc/tests.scala1
-rw-r--r--tests/disabled/java-interop/pos/t1711/Seq.scala (renamed from tests/untried/pos/t1711/Seq.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1711/Test.java (renamed from tests/untried/pos/t1711/Test.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1745/J.java (renamed from tests/untried/pos/t1745/J.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1745/S.scala (renamed from tests/untried/pos/t1745/S.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1751/A1_2.scala (renamed from tests/untried/pos/t1751/A1_2.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1751/A2_1.scala (renamed from tests/untried/pos/t1751/A2_1.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1751/SuiteClasses.java (renamed from tests/untried/pos/t1751/SuiteClasses.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1782/Ann.java (renamed from tests/untried/pos/t1782/Ann.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1782/Days.java (renamed from tests/untried/pos/t1782/Days.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1782/ImplementedBy.java (renamed from tests/untried/pos/t1782/ImplementedBy.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1782/Test_1.scala (renamed from tests/untried/pos/t1782/Test_1.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1836/J.java (renamed from tests/untried/pos/t1836/J.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1836/S.scala (renamed from tests/untried/pos/t1836/S.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1840/J.java (renamed from tests/untried/pos/t1840/J.java)0
-rw-r--r--tests/disabled/java-interop/pos/t1840/S.scala (renamed from tests/untried/pos/t1840/S.scala)0
-rw-r--r--tests/disabled/java-interop/pos/t1937/NumberGenerator.java (renamed from tests/untried/pos/t1937/NumberGenerator.java)0
-rw-r--r--tests/disabled/not-representable/pos/t1803.flags (renamed from tests/untried/pos/t1803.flags)0
-rw-r--r--tests/disabled/not-representable/pos/t1803.scala (renamed from tests/untried/pos/t1803.scala)1
-rw-r--r--tests/neg/t1843.scala (renamed from tests/untried/pos/t1843.scala)0
-rwxr-xr-xtests/pending/pos/t1756.scala (renamed from tests/untried/pos/t1756.scala)0
-rw-r--r--tests/pending/pos/t1832.scala10
-rw-r--r--tests/pos/t160.scala (renamed from tests/new/t160.scala)0
-rw-r--r--tests/pos/t1642b.scala (renamed from tests/new/t1642b.scala)0
-rw-r--r--tests/pos/t1659.scala (renamed from tests/new/t1659.scala)0
-rw-r--r--tests/pos/t1675.scala (renamed from tests/new/t1675.scala)0
-rw-r--r--tests/pos/t1722-A.scala (renamed from tests/untried/pos/t1722-A.scala)0
-rwxr-xr-xtests/pos/t1722/Test.scala (renamed from tests/untried/pos/t1722/Test.scala)0
-rwxr-xr-xtests/pos/t1722/Top.scala (renamed from tests/untried/pos/t1722/Top.scala)0
-rw-r--r--tests/pos/t175.scala (renamed from tests/untried/pos/t175.scala)0
-rw-r--r--tests/pos/t177.scala (renamed from tests/untried/pos/t177.scala)0
-rw-r--r--tests/pos/t1785.scala (renamed from tests/untried/pos/t1785.scala)0
-rw-r--r--tests/pos/t1786-counter.scala (renamed from tests/untried/pos/t1786-counter.scala)0
-rw-r--r--tests/pos/t1786-cycle.scala (renamed from tests/untried/pos/t1786-cycle.scala)0
-rw-r--r--tests/pos/t1789.scala (renamed from tests/untried/pos/t1789.scala)0
-rw-r--r--tests/pos/t1798.scala (renamed from tests/untried/pos/t1798.scala)0
-rw-r--r--tests/pos/t183.scala (renamed from tests/untried/pos/t183.scala)0
-rw-r--r--tests/pos/t1843.scala25
-rw-r--r--tests/pos/t1858.scala (renamed from tests/untried/pos/t1858.scala)0
-rw-r--r--tests/pos/t1896/D0.scala (renamed from tests/untried/pos/t1896/D0.scala)0
-rw-r--r--tests/pos/t1896/D1.scala (renamed from tests/untried/pos/t1896/D1.scala)0
-rw-r--r--tests/pos/t1942/A_1.scala (renamed from tests/untried/pos/t1942/A_1.scala)0
-rw-r--r--tests/pos/t1942/Test_2.scala (renamed from tests/untried/pos/t1942/Test_2.scala)0
-rw-r--r--tests/pos/t1957.scala (renamed from tests/untried/pos/t1957.scala)0
-rw-r--r--tests/pos/t1974.scala (renamed from tests/untried/pos/t1974.scala)0
-rw-r--r--tests/pos/t1987a.scala (renamed from tests/untried/pos/t1987a.scala)0
-rw-r--r--tests/pos/t1987b/a.scala (renamed from tests/untried/pos/t1987b/a.scala)0
-rw-r--r--tests/pos/t1987b/b.scala (renamed from tests/untried/pos/t1987b/b.scala)0
-rw-r--r--tests/pos/t1996.scala (renamed from tests/untried/pos/t1996.scala)0
-rw-r--r--tests/untried/pos/t1832.scala8
50 files changed, 37 insertions, 8 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 31ab15b57..9a173a5ce 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -83,6 +83,7 @@ class tests extends CompilerTest {
@Test def neg_tailcall = compileFile(negDir, "tailcall/tailrec", xerrors = 7)
@Test def neg_tailcall2 = compileFile(negDir, "tailcall/tailrec-2", xerrors = 2)
@Test def neg_tailcall3 = compileFile(negDir, "tailcall/tailrec-3", xerrors = 2)
+ @Test def neg_t1843 = compileFile(negDir, "t1843", xerrors = 1)
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)
diff --git a/tests/untried/pos/t1711/Seq.scala b/tests/disabled/java-interop/pos/t1711/Seq.scala
index c18f05cd7..c18f05cd7 100644
--- a/tests/untried/pos/t1711/Seq.scala
+++ b/tests/disabled/java-interop/pos/t1711/Seq.scala
diff --git a/tests/untried/pos/t1711/Test.java b/tests/disabled/java-interop/pos/t1711/Test.java
index 5ec0f2297..5ec0f2297 100644
--- a/tests/untried/pos/t1711/Test.java
+++ b/tests/disabled/java-interop/pos/t1711/Test.java
diff --git a/tests/untried/pos/t1745/J.java b/tests/disabled/java-interop/pos/t1745/J.java
index 8444eabb2..8444eabb2 100644
--- a/tests/untried/pos/t1745/J.java
+++ b/tests/disabled/java-interop/pos/t1745/J.java
diff --git a/tests/untried/pos/t1745/S.scala b/tests/disabled/java-interop/pos/t1745/S.scala
index 84c437133..84c437133 100644
--- a/tests/untried/pos/t1745/S.scala
+++ b/tests/disabled/java-interop/pos/t1745/S.scala
diff --git a/tests/untried/pos/t1751/A1_2.scala b/tests/disabled/java-interop/pos/t1751/A1_2.scala
index 354d5eecd..354d5eecd 100644
--- a/tests/untried/pos/t1751/A1_2.scala
+++ b/tests/disabled/java-interop/pos/t1751/A1_2.scala
diff --git a/tests/untried/pos/t1751/A2_1.scala b/tests/disabled/java-interop/pos/t1751/A2_1.scala
index c768062e4..c768062e4 100644
--- a/tests/untried/pos/t1751/A2_1.scala
+++ b/tests/disabled/java-interop/pos/t1751/A2_1.scala
diff --git a/tests/untried/pos/t1751/SuiteClasses.java b/tests/disabled/java-interop/pos/t1751/SuiteClasses.java
index a415e4f57..a415e4f57 100644
--- a/tests/untried/pos/t1751/SuiteClasses.java
+++ b/tests/disabled/java-interop/pos/t1751/SuiteClasses.java
diff --git a/tests/untried/pos/t1782/Ann.java b/tests/disabled/java-interop/pos/t1782/Ann.java
index 0dcfbd2ed..0dcfbd2ed 100644
--- a/tests/untried/pos/t1782/Ann.java
+++ b/tests/disabled/java-interop/pos/t1782/Ann.java
diff --git a/tests/untried/pos/t1782/Days.java b/tests/disabled/java-interop/pos/t1782/Days.java
index 203a87b1c..203a87b1c 100644
--- a/tests/untried/pos/t1782/Days.java
+++ b/tests/disabled/java-interop/pos/t1782/Days.java
diff --git a/tests/untried/pos/t1782/ImplementedBy.java b/tests/disabled/java-interop/pos/t1782/ImplementedBy.java
index 6aa8b4fa9..6aa8b4fa9 100644
--- a/tests/untried/pos/t1782/ImplementedBy.java
+++ b/tests/disabled/java-interop/pos/t1782/ImplementedBy.java
diff --git a/tests/untried/pos/t1782/Test_1.scala b/tests/disabled/java-interop/pos/t1782/Test_1.scala
index 6467a74c2..6467a74c2 100644
--- a/tests/untried/pos/t1782/Test_1.scala
+++ b/tests/disabled/java-interop/pos/t1782/Test_1.scala
diff --git a/tests/untried/pos/t1836/J.java b/tests/disabled/java-interop/pos/t1836/J.java
index a009a59e2..a009a59e2 100644
--- a/tests/untried/pos/t1836/J.java
+++ b/tests/disabled/java-interop/pos/t1836/J.java
diff --git a/tests/untried/pos/t1836/S.scala b/tests/disabled/java-interop/pos/t1836/S.scala
index 88ce1063e..88ce1063e 100644
--- a/tests/untried/pos/t1836/S.scala
+++ b/tests/disabled/java-interop/pos/t1836/S.scala
diff --git a/tests/untried/pos/t1840/J.java b/tests/disabled/java-interop/pos/t1840/J.java
index fd98b6c4a..fd98b6c4a 100644
--- a/tests/untried/pos/t1840/J.java
+++ b/tests/disabled/java-interop/pos/t1840/J.java
diff --git a/tests/untried/pos/t1840/S.scala b/tests/disabled/java-interop/pos/t1840/S.scala
index ff513d2c1..ff513d2c1 100644
--- a/tests/untried/pos/t1840/S.scala
+++ b/tests/disabled/java-interop/pos/t1840/S.scala
diff --git a/tests/untried/pos/t1937/NumberGenerator.java b/tests/disabled/java-interop/pos/t1937/NumberGenerator.java
index 59d604733..59d604733 100644
--- a/tests/untried/pos/t1937/NumberGenerator.java
+++ b/tests/disabled/java-interop/pos/t1937/NumberGenerator.java
diff --git a/tests/untried/pos/t1803.flags b/tests/disabled/not-representable/pos/t1803.flags
index d1a824416..d1a824416 100644
--- a/tests/untried/pos/t1803.flags
+++ b/tests/disabled/not-representable/pos/t1803.flags
diff --git a/tests/untried/pos/t1803.scala b/tests/disabled/not-representable/pos/t1803.scala
index 42f4e784a..94b59a480 100644
--- a/tests/untried/pos/t1803.scala
+++ b/tests/disabled/not-representable/pos/t1803.scala
@@ -1,2 +1,3 @@
+// No parameter type inference in Dotty
class A { def foo[A](a: A) = a }
class B extends A { override def foo[A](b) = b }
diff --git a/tests/untried/pos/t1843.scala b/tests/neg/t1843.scala
index 8504bf342..8504bf342 100644
--- a/tests/untried/pos/t1843.scala
+++ b/tests/neg/t1843.scala
diff --git a/tests/untried/pos/t1756.scala b/tests/pending/pos/t1756.scala
index 1d067c3b0..1d067c3b0 100755
--- a/tests/untried/pos/t1756.scala
+++ b/tests/pending/pos/t1756.scala
diff --git a/tests/pending/pos/t1832.scala b/tests/pending/pos/t1832.scala
new file mode 100644
index 000000000..9ad9703c2
--- /dev/null
+++ b/tests/pending/pos/t1832.scala
@@ -0,0 +1,10 @@
+trait Cloning {
+ trait Foo
+ def fn(g: Any => Unit): Foo
+
+ class Star { def *(a: Cloning.this.Foo): Cloning.this.Foo }
+
+ implicit def mkStar(i: Int): Star = new Star { def *(a: Foo): Foo = null }
+
+ val pool = 4 * fn { case ghostSYMBOL: Int => ghostSYMBOL * 2 }
+}
diff --git a/tests/new/t160.scala b/tests/pos/t160.scala
index 91ac2ba84..91ac2ba84 100644
--- a/tests/new/t160.scala
+++ b/tests/pos/t160.scala
diff --git a/tests/new/t1642b.scala b/tests/pos/t1642b.scala
index 72e53b0c9..72e53b0c9 100644
--- a/tests/new/t1642b.scala
+++ b/tests/pos/t1642b.scala
diff --git a/tests/new/t1659.scala b/tests/pos/t1659.scala
index 10470d66f..10470d66f 100644
--- a/tests/new/t1659.scala
+++ b/tests/pos/t1659.scala
diff --git a/tests/new/t1675.scala b/tests/pos/t1675.scala
index 8630890ee..8630890ee 100644
--- a/tests/new/t1675.scala
+++ b/tests/pos/t1675.scala
diff --git a/tests/untried/pos/t1722-A.scala b/tests/pos/t1722-A.scala
index d059bf22f..d059bf22f 100644
--- a/tests/untried/pos/t1722-A.scala
+++ b/tests/pos/t1722-A.scala
diff --git a/tests/untried/pos/t1722/Test.scala b/tests/pos/t1722/Test.scala
index f236d3fdc..f236d3fdc 100755
--- a/tests/untried/pos/t1722/Test.scala
+++ b/tests/pos/t1722/Test.scala
diff --git a/tests/untried/pos/t1722/Top.scala b/tests/pos/t1722/Top.scala
index 4ac52412a..4ac52412a 100755
--- a/tests/untried/pos/t1722/Top.scala
+++ b/tests/pos/t1722/Top.scala
diff --git a/tests/untried/pos/t175.scala b/tests/pos/t175.scala
index 4c0eb28ba..4c0eb28ba 100644
--- a/tests/untried/pos/t175.scala
+++ b/tests/pos/t175.scala
diff --git a/tests/untried/pos/t177.scala b/tests/pos/t177.scala
index 33b4de926..33b4de926 100644
--- a/tests/untried/pos/t177.scala
+++ b/tests/pos/t177.scala
diff --git a/tests/untried/pos/t1785.scala b/tests/pos/t1785.scala
index 0b1fafb27..0b1fafb27 100644
--- a/tests/untried/pos/t1785.scala
+++ b/tests/pos/t1785.scala
diff --git a/tests/untried/pos/t1786-counter.scala b/tests/pos/t1786-counter.scala
index a2431343d..a2431343d 100644
--- a/tests/untried/pos/t1786-counter.scala
+++ b/tests/pos/t1786-counter.scala
diff --git a/tests/untried/pos/t1786-cycle.scala b/tests/pos/t1786-cycle.scala
index 9de149fbc..9de149fbc 100644
--- a/tests/untried/pos/t1786-cycle.scala
+++ b/tests/pos/t1786-cycle.scala
diff --git a/tests/untried/pos/t1789.scala b/tests/pos/t1789.scala
index 1a37d48d0..1a37d48d0 100644
--- a/tests/untried/pos/t1789.scala
+++ b/tests/pos/t1789.scala
diff --git a/tests/untried/pos/t1798.scala b/tests/pos/t1798.scala
index 1624e3025..1624e3025 100644
--- a/tests/untried/pos/t1798.scala
+++ b/tests/pos/t1798.scala
diff --git a/tests/untried/pos/t183.scala b/tests/pos/t183.scala
index d7ed27f73..d7ed27f73 100644
--- a/tests/untried/pos/t183.scala
+++ b/tests/pos/t183.scala
diff --git a/tests/pos/t1843.scala b/tests/pos/t1843.scala
new file mode 100644
index 000000000..e9b5c5d2d
--- /dev/null
+++ b/tests/pos/t1843.scala
@@ -0,0 +1,25 @@
+/**
+* Scala Compiler Will Crash On this File
+* ... Or Will It?
+*
+*/
+
+object Crash {
+ trait UpdateType[A]
+ case class StateUpdate[+A](updateType : UpdateType[A], value : A)
+ case object IntegerUpdateType extends UpdateType[Integer]
+
+ //However this method will cause a crash
+ def crash(updates: List[StateUpdate[_]]): Unit = {
+ updates match {
+ case Nil =>
+ case u::us =>
+ u match {
+ //Line below seems to be the crashing line
+ case StateUpdate(key, newValue) if (key == IntegerUpdateType) =>
+ println("Requires a statement to induce the crash")
+ case _ =>
+ }
+ }
+ }
+}
diff --git a/tests/untried/pos/t1858.scala b/tests/pos/t1858.scala
index c06e73e7e..c06e73e7e 100644
--- a/tests/untried/pos/t1858.scala
+++ b/tests/pos/t1858.scala
diff --git a/tests/untried/pos/t1896/D0.scala b/tests/pos/t1896/D0.scala
index 6b3150d96..6b3150d96 100644
--- a/tests/untried/pos/t1896/D0.scala
+++ b/tests/pos/t1896/D0.scala
diff --git a/tests/untried/pos/t1896/D1.scala b/tests/pos/t1896/D1.scala
index e1ab50679..e1ab50679 100644
--- a/tests/untried/pos/t1896/D1.scala
+++ b/tests/pos/t1896/D1.scala
diff --git a/tests/untried/pos/t1942/A_1.scala b/tests/pos/t1942/A_1.scala
index 4915b54a6..4915b54a6 100644
--- a/tests/untried/pos/t1942/A_1.scala
+++ b/tests/pos/t1942/A_1.scala
diff --git a/tests/untried/pos/t1942/Test_2.scala b/tests/pos/t1942/Test_2.scala
index 6c045bbce..6c045bbce 100644
--- a/tests/untried/pos/t1942/Test_2.scala
+++ b/tests/pos/t1942/Test_2.scala
diff --git a/tests/untried/pos/t1957.scala b/tests/pos/t1957.scala
index 711ce17de..711ce17de 100644
--- a/tests/untried/pos/t1957.scala
+++ b/tests/pos/t1957.scala
diff --git a/tests/untried/pos/t1974.scala b/tests/pos/t1974.scala
index 3f4d41e7f..3f4d41e7f 100644
--- a/tests/untried/pos/t1974.scala
+++ b/tests/pos/t1974.scala
diff --git a/tests/untried/pos/t1987a.scala b/tests/pos/t1987a.scala
index ccab13371..ccab13371 100644
--- a/tests/untried/pos/t1987a.scala
+++ b/tests/pos/t1987a.scala
diff --git a/tests/untried/pos/t1987b/a.scala b/tests/pos/t1987b/a.scala
index ff27044b6..ff27044b6 100644
--- a/tests/untried/pos/t1987b/a.scala
+++ b/tests/pos/t1987b/a.scala
diff --git a/tests/untried/pos/t1987b/b.scala b/tests/pos/t1987b/b.scala
index a469ca6ea..a469ca6ea 100644
--- a/tests/untried/pos/t1987b/b.scala
+++ b/tests/pos/t1987b/b.scala
diff --git a/tests/untried/pos/t1996.scala b/tests/pos/t1996.scala
index 273012819..273012819 100644
--- a/tests/untried/pos/t1996.scala
+++ b/tests/pos/t1996.scala
diff --git a/tests/untried/pos/t1832.scala b/tests/untried/pos/t1832.scala
deleted file mode 100644
index 3a5280640..000000000
--- a/tests/untried/pos/t1832.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Cloning {
- trait Foo
- def fn(g: Any => Unit): Foo
-
- implicit def mkStar(i: Int): AnyRef{def *(a: Cloning.this.Foo): Cloning.this.Foo} = new { def *(a: Foo): Foo = null }
-
- val pool = 4 * fn { case ghostSYMBOL: Int => ghostSYMBOL * 2 }
-}