diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-23 11:17:27 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-23 11:17:27 -0700 |
commit | 9600d2b7432ddde7c19ecf672ad3247615bd6475 (patch) | |
tree | 1b193fb4f688a191e583ef8162ff692d8b3b5395 | |
parent | 7b351dca8458f599f5fafef4daa307351031ef06 (diff) | |
parent | ed34bcb651ed9911d48c88d9f1e6b3adfd88a2f8 (diff) | |
download | scala-9600d2b7432ddde7c19ecf672ad3247615bd6475.tar.gz scala-9600d2b7432ddde7c19ecf672ad3247615bd6475.tar.bz2 scala-9600d2b7432ddde7c19ecf672ad3247615bd6475.zip |
Merge pull request #2870 from retronym/ticket/7778
SI-942 A test case, five years adrift.
-rw-r--r-- | test/files/pos/t942/Amount_1.java | 5 | ||||
-rw-r--r-- | test/files/pos/t942/Test_2.scala | 3 | ||||
-rw-r--r-- | test/pending/pos/t7778/Foo_1.java | 6 | ||||
-rw-r--r-- | test/pending/pos/t7778/Test_2.scala | 3 |
4 files changed, 17 insertions, 0 deletions
diff --git a/test/files/pos/t942/Amount_1.java b/test/files/pos/t942/Amount_1.java new file mode 100644 index 0000000000..d9d37d127b --- /dev/null +++ b/test/files/pos/t942/Amount_1.java @@ -0,0 +1,5 @@ +import java.util.concurrent.Callable; + +public abstract class Amount_1<Q> extends Object + implements Callable<Amount_1<?>> { +} diff --git a/test/files/pos/t942/Test_2.scala b/test/files/pos/t942/Test_2.scala new file mode 100644 index 0000000000..3cc84dae3c --- /dev/null +++ b/test/files/pos/t942/Test_2.scala @@ -0,0 +1,3 @@ +abstract class Foo { + val x: Amount_1[Foo] +} diff --git a/test/pending/pos/t7778/Foo_1.java b/test/pending/pos/t7778/Foo_1.java new file mode 100644 index 0000000000..65431ffd46 --- /dev/null +++ b/test/pending/pos/t7778/Foo_1.java @@ -0,0 +1,6 @@ +import java.util.concurrent.Callable; + +public abstract class Foo_1<T> implements Callable<Foo_1<Object>.Inner> { + public abstract class Inner { + } +} diff --git a/test/pending/pos/t7778/Test_2.scala b/test/pending/pos/t7778/Test_2.scala new file mode 100644 index 0000000000..306303a99e --- /dev/null +++ b/test/pending/pos/t7778/Test_2.scala @@ -0,0 +1,3 @@ +class Test { + null: Foo_1[_] +} |