summaryrefslogtreecommitdiff
path: root/test/files/pos5/ilya
diff options
context:
space:
mode:
authorDavid MacIver <david.maciver@gmail.com>2008-10-30 23:21:27 +0000
committerDavid MacIver <david.maciver@gmail.com>2008-10-30 23:21:27 +0000
commitbcbf5a12672f5b364c24398b6d98cd04ecb2e2be (patch)
tree6249bd524b6c0270db505f9698f6789a9c18ff62 /test/files/pos5/ilya
parent99529c51c054b3873442c5cbef34b81b84798434 (diff)
downloadscala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.tar.gz
scala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.tar.bz2
scala-bcbf5a12672f5b364c24398b6d98cd04ecb2e2be.zip
Martin's tests for mixed Scala/Java.
A couple things are in pending because of partest weirdness. As far as I can tell they work but partest is doing the wrong thing with them. I'll open a ticket.
Diffstat (limited to 'test/files/pos5/ilya')
-rw-r--r--test/files/pos5/ilya/J.java14
-rw-r--r--test/files/pos5/ilya/S.scala5
2 files changed, 19 insertions, 0 deletions
diff --git a/test/files/pos5/ilya/J.java b/test/files/pos5/ilya/J.java
new file mode 100644
index 0000000000..c44169ca1b
--- /dev/null
+++ b/test/files/pos5/ilya/J.java
@@ -0,0 +1,14 @@
+package test;
+
+class Foo {
+}
+
+class Boo<T extends Foo>{}
+
+class Bar<BooT extends Boo<FooT>, FooT extends Foo>{
+ private final int myInt;
+
+ public Bar(int i) {
+ myInt = i;
+ }
+} \ No newline at end of file
diff --git a/test/files/pos5/ilya/S.scala b/test/files/pos5/ilya/S.scala
new file mode 100644
index 0000000000..952c004ccc
--- /dev/null
+++ b/test/files/pos5/ilya/S.scala
@@ -0,0 +1,5 @@
+package test
+
+class ScBar[BooT <: Boo[FooT], FooT <: Foo](i: Int) extends Bar[BooT, FooT](i) {
+
+}