diff options
author | Paul Phillips <paulp@improving.org> | 2011-08-09 17:36:18 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-08-09 17:36:18 +0000 |
commit | 97da3af7a45a2cb88717ad8224e6b0b10531a734 (patch) | |
tree | 3bb29d4fb71278a9c6acdac7e6313cb9e635d346 /test/files/run | |
parent | c1aaf1fc7ad3d76bb5376d796577e0effdd70bf4 (diff) | |
download | scala-97da3af7a45a2cb88717ad8224e6b0b10531a734.tar.gz scala-97da3af7a45a2cb88717ad8224e6b0b10531a734.tar.bz2 scala-97da3af7a45a2cb88717ad8224e6b0b10531a734.zip |
Fix java signature generation for traits: no cl...
Fix java signature generation for traits: no classes as parents. Closes
SI-4891, review by grek.
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/bug4891.check | 9 | ||||
-rw-r--r-- | test/files/run/bug4891/J_2.java | 13 | ||||
-rw-r--r-- | test/files/run/bug4891/S_1.scala | 26 | ||||
-rw-r--r-- | test/files/run/bug4891/S_3.scala | 5 |
4 files changed, 53 insertions, 0 deletions
diff --git a/test/files/run/bug4891.check b/test/files/run/bug4891.check new file mode 100644 index 0000000000..2e84168ed4 --- /dev/null +++ b/test/files/run/bug4891.check @@ -0,0 +1,9 @@ +test.generic.T1 + (m) public abstract A test.generic.T1.t1(A) +test.generic.C1 + (m) public void test.generic.C1.m1() +test.generic.C2 + (m) public void test.generic.C1.m1() + (m) public A test.generic.C2.t1(A) (bridge) +null +interface scala.ScalaObject diff --git a/test/files/run/bug4891/J_2.java b/test/files/run/bug4891/J_2.java new file mode 100644 index 0000000000..db1cc52b13 --- /dev/null +++ b/test/files/run/bug4891/J_2.java @@ -0,0 +1,13 @@ +import test.generic.*; + +public class J_2 { + public static <A> void foo(T1<A> x) { + // x.m1(); + } + + public static void main(String[] args) { + Bug4891.main(null); + T1<Object> x = new C2<Object>(); + foo(x); + } +} diff --git a/test/files/run/bug4891/S_1.scala b/test/files/run/bug4891/S_1.scala new file mode 100644 index 0000000000..927c3ad93d --- /dev/null +++ b/test/files/run/bug4891/S_1.scala @@ -0,0 +1,26 @@ +package test.generic { + class C1[A] { + def m1(): Unit = () + } + + trait T1[A] extends C1[A] { + def t1(x: A) = x + } + + class C2[A] extends T1[A] +} + +import scala.tools.partest._ + +object Bug4891 extends SigTest { + import test.generic._ + + def main(args: Array[String]): Unit = { + show[T1[_]]() + show[C1[_]]() + show[C2[_]]() + + println(classOf[T1[_]].getGenericSuperclass) + classOf[T1[_]].getGenericInterfaces foreach println + } +} diff --git a/test/files/run/bug4891/S_3.scala b/test/files/run/bug4891/S_3.scala new file mode 100644 index 0000000000..0da4912bc5 --- /dev/null +++ b/test/files/run/bug4891/S_3.scala @@ -0,0 +1,5 @@ +object Test { + def main(args: Array[String]): Unit = { + J_2 main null + } +} |