diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-15 15:44:54 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-15 15:44:54 +0000 |
commit | 10830eaae2955766378369b8d1bcc0e6963b9b7f (patch) | |
tree | 595d0d162d94eda17062d4d13710378930b7ac7f /test/files/pos/t1263 | |
parent | fbf991833d5ec0d9890ac1e7df9f53209e313552 (diff) | |
download | scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.gz scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.bz2 scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.zip |
1.4-related cleanup and reorganization.
Removed a bunch of now useless 1.4 code, merged
back jvm5-specific partest tests into the
general jvm tests, documentation updates.
Diffstat (limited to 'test/files/pos/t1263')
-rw-r--r-- | test/files/pos/t1263/Test.java | 16 | ||||
-rw-r--r-- | test/files/pos/t1263/test.scala | 10 |
2 files changed, 26 insertions, 0 deletions
diff --git a/test/files/pos/t1263/Test.java b/test/files/pos/t1263/Test.java new file mode 100644 index 0000000000..0eb43e881a --- /dev/null +++ b/test/files/pos/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/pos/t1263/test.scala b/test/files/pos/t1263/test.scala new file mode 100644 index 0000000000..92d8c1cdfa --- /dev/null +++ b/test/files/pos/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 + } +} + |