summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-03-24 16:33:53 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-03-24 16:33:53 +0000
commit6c398fa52bfa7a0de1179d6657a8429c6d82e36e (patch)
tree1405a4c539f888bcf51f592e3c93bad8c17ea630 /test/files/pos
parent26643c870b0308e903eb097cae8bae78180c0f4a (diff)
downloadscala-6c398fa52bfa7a0de1179d6657a8429c6d82e36e.tar.gz
scala-6c398fa52bfa7a0de1179d6657a8429c6d82e36e.tar.bz2
scala-6c398fa52bfa7a0de1179d6657a8429c6d82e36e.zip
Merged revisions 24551-24564,24567 via svnmerge...
Merged revisions 24551-24564,24567 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24551 | odersky | 2011-03-23 16:31:04 +0100 (Wed, 23 Mar 2011) | 2 lines Squashing the signature bugs. The trick is that mixed in methods are declared as bridges. Review by extempore. ........ r24552 | odersky | 2011-03-23 16:33:58 +0100 (Wed, 23 Mar 2011) | 1 line Simple test case to see whether Java understands mixed in signatures. This should be extended with more cases. Review by extempore. ........ r24553 | odersky | 2011-03-23 19:32:39 +0100 (Wed, 23 Mar 2011) | 1 line Moving signature tests to pending, because they operate under wrong assumptions now that mixed in members are bridges. Review by extempore. ........ r24554 | odersky | 2011-03-23 22:44:13 +0100 (Wed, 23 Mar 2011) | 1 line Fixes #4298. Review by extempore. ........ r24555 | extempore | 2011-03-23 23:35:09 +0100 (Wed, 23 Mar 2011) | 2 lines Spiced up the signature test infrastructure a bunch, wrote some more tests, restored the tests in pending. No review. ........ r24556 | extempore | 2011-03-24 02:10:26 +0100 (Thu, 24 Mar 2011) | 2 lines Restoring my higher-kinded-Array signature check which martin callously blew away while fixing all our other problems. Review by odersky. ........ r24557 | extempore | 2011-03-24 03:35:22 +0100 (Thu, 24 Mar 2011) | 1 line Looks like I accidentally committed a test log, no review. ........ r24558 | extempore | 2011-03-24 06:49:53 +0100 (Thu, 24 Mar 2011) | 2 lines Discovered Range.foreach inlining was broken due to a Nothing signature appearing and confusing the loader. No review. ........ r24559 | extempore | 2011-03-24 08:04:32 +0100 (Thu, 24 Mar 2011) | 3 lines Removing empty directories the newly informative partest told me about. No review. ........ r24560 | extempore | 2011-03-24 09:46:55 +0100 (Thu, 24 Mar 2011) | 2 lines Changed App-using tests to use main() to see if that's our trouble. No review. ........ r24561 | odersky | 2011-03-24 12:15:37 +0100 (Thu, 24 Mar 2011) | 1 line Moved failing tests to pending after having diagnosed that the only problem is a difference in output between Java 1.5 and 1.6 reflection libraries. Can we moved back once that's fixed. For now, it's more important to ghet the build back. ........ r24562 | phaller | 2011-03-24 15:09:18 +0100 (Thu, 24 Mar 2011) | 1 line Deprecated unused members in scala.concurrent. Added documentation to scala.concurrent.ops and scala.concurrent.FutureTaskRunner. ........ r24563 | phaller | 2011-03-24 15:19:35 +0100 (Thu, 24 Mar 2011) | 1 line Added implicit TaskRunner parameters to scala.concurrent.ops.{par, replicate}. Review by prokopec. ........ r24564 | prokopec | 2011-03-24 16:00:41 +0100 (Thu, 24 Mar 2011) | 5 lines Added a temporary fix for #4351, but disabled it because the extend specialized class with nonspecialized type-parameters is used in the stdlib already. Disabling scala.parallel package, adding the currently disabled scala.concurrent package which will be implemented in some of the next releases. Review by phaller. ........ r24567 | odersky | 2011-03-24 17:32:15 +0100 (Thu, 24 Mar 2011) | 1 line Three things to make Eclipse more robust against deadlocks: (1) catch stale responses in presentation compile thread. (2) Avoid stale responses by two try-finallys in getEnteredParsed, askLoadedTyped. ........
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/hkarray.flags1
-rw-r--r--test/files/pos/hkarray.scala5
-rw-r--r--test/files/pos/javaReadsSigs/fromjava.java16
-rw-r--r--test/files/pos/switchUnbox-pos.log2
4 files changed, 22 insertions, 2 deletions
diff --git a/test/files/pos/hkarray.flags b/test/files/pos/hkarray.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/files/pos/hkarray.flags
@@ -0,0 +1 @@
+-Xfatal-warnings \ No newline at end of file
diff --git a/test/files/pos/hkarray.scala b/test/files/pos/hkarray.scala
new file mode 100644
index 0000000000..af1160300a
--- /dev/null
+++ b/test/files/pos/hkarray.scala
@@ -0,0 +1,5 @@
+trait Foo[CC[_]] { }
+
+class Bip {
+ val x = new Foo[Array] { }
+} \ No newline at end of file
diff --git a/test/files/pos/javaReadsSigs/fromjava.java b/test/files/pos/javaReadsSigs/fromjava.java
new file mode 100644
index 0000000000..d31244bb95
--- /dev/null
+++ b/test/files/pos/javaReadsSigs/fromjava.java
@@ -0,0 +1,16 @@
+import scala.collection.immutable.Vector;
+import scala.collection.immutable.List;
+
+public class fromjava {
+
+ void main(String[] args, Vector<String> x) {
+ Vector<String> y = x.take(2);
+ String h = y.head();
+ System.out.println(h);
+ }
+ void main(String[] args, List<String> x) {
+ List<String> y = x.drop(2);
+ String h = y.head();
+ System.out.println(h);
+ }
+} \ No newline at end of file
diff --git a/test/files/pos/switchUnbox-pos.log b/test/files/pos/switchUnbox-pos.log
deleted file mode 100644
index 9c146726d7..0000000000
--- a/test/files/pos/switchUnbox-pos.log
+++ /dev/null
@@ -1,2 +0,0 @@
-partest error: bad flags: -Ysqueeze:on
-one error found