summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid MacIver <david.maciver@gmail.com>2008-10-31 16:01:54 +0000
committerDavid MacIver <david.maciver@gmail.com>2008-10-31 16:01:54 +0000
commit7efd2d6eb00017db48c21e1808eeaea97e92c494 (patch)
treecca78010082028f8cb164978b4728e7b8c07d63d /test
parentfa88dfe5cdc88779ed0734893cae538db833ccc4 (diff)
downloadscala-7efd2d6eb00017db48c21e1808eeaea97e92c494.tar.gz
scala-7efd2d6eb00017db48c21e1808eeaea97e92c494.tar.bz2
scala-7efd2d6eb00017db48c21e1808eeaea97e92c494.zip
Test from some of Ismael's tickets.
Diffstat (limited to 'test')
-rw-r--r--test/files/pos5/t1235/Test.java9
-rw-r--r--test/files/pos5/t1263/Test.java16
-rw-r--r--test/files/pos5/t1263/test.scala10
3 files changed, 35 insertions, 0 deletions
diff --git a/test/files/pos5/t1235/Test.java b/test/files/pos5/t1235/Test.java
new file mode 100644
index 0000000000..7bb83a8491
--- /dev/null
+++ b/test/files/pos5/t1235/Test.java
@@ -0,0 +1,9 @@
+import scala.collection.immutable.HashMap;
+
+public class Test {
+
+ void foo() {
+ new HashMap<String, String>();
+ }
+}
+
diff --git a/test/files/pos5/t1263/Test.java b/test/files/pos5/t1263/Test.java
new file mode 100644
index 0000000000..0eb43e881a
--- /dev/null
+++ b/test/files/pos5/t1263/Test.java
@@ -0,0 +1,16 @@
+package test;
+
+import java.rmi.RemoteException;
+
+import test.Map;
+
+public class Test implements Map<String, String> {
+ public Map<String, String>.MapTo plus(String o) {
+ return null;
+ }
+
+ public int $tag() throws RemoteException {
+ return 0;
+ }
+}
+
diff --git a/test/files/pos5/t1263/test.scala b/test/files/pos5/t1263/test.scala
new file mode 100644
index 0000000000..92d8c1cdfa
--- /dev/null
+++ b/test/files/pos5/t1263/test.scala
@@ -0,0 +1,10 @@
+package test
+
+trait Map[A, +B] {
+ def plus(key: A): MapTo = new MapTo(key)
+
+ class MapTo(key: A) {
+ def arrow [B1 >: B](value: B1) = null
+ }
+}
+