From 4069be072e8ad7ec53a1d91a639c03ad96d98070 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Wed, 23 Dec 2009 11:36:08 +0000 Subject: Merged revisions 20262-20263,20266-20267,20269-... Merged revisions 20262-20263,20266-20267,20269-20270,20284,20287-20289,20292,20294-20297, 20300 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r20262 | phaller | 2009-12-21 17:03:07 +0100 (Mon, 21 Dec 2009) | 1 line closed #2829. review by rompf. ........ r20263 | phaller | 2009-12-21 17:36:37 +0100 (Mon, 21 Dec 2009) | 1 line small correction in doc comment. no review. ........ r20266 | phaller | 2009-12-21 18:16:55 +0100 (Mon, 21 Dec 2009) | 1 line closed #2181. no review. ........ r20267 | odersky | 2009-12-21 18:30:23 +0100 (Mon, 21 Dec 2009) | 3 lines (1) Added some classes to allow arbitrary patches to source buffers. These are not yet complete so do not need a review yet I think. (2) Avoided reflexive array operations in ScalaRunTime. review by community. ........ r20269 | phaller | 2009-12-21 20:28:18 +0100 (Mon, 21 Dec 2009) | 1 line closed #1449. review by community. ........ r20270 | odersky | 2009-12-21 20:41:51 +0100 (Mon, 21 Dec 2009) | 2 lines Closed #2709. Thanks for the patch! Review by community. ........ r20284 | rytz | 2009-12-22 10:56:21 +0100 (Tue, 22 Dec 2009) | 1 line close #2809. thanks for the small example. review by community ........ r20287 | rytz | 2009-12-22 13:22:56 +0100 (Tue, 22 Dec 2009) | 1 line fix the build. no review. ........ r20288 | prokopec | 2009-12-22 15:00:58 +0100 (Tue, 22 Dec 2009) | 2 lines fixed #2548 - reverse, reverseIterator for views bug. Also - reverseMap for views now should work. review by phaller. ........ r20289 | prokopec | 2009-12-22 15:32:16 +0100 (Tue, 22 Dec 2009) | 2 lines Small change in test. no review ........ r20292 | odersky | 2009-12-22 18:11:54 +0100 (Tue, 22 Dec 2009) | 1 line Closes #2819, #2705, #2805. Review by community. ........ r20294 | odersky | 2009-12-22 18:57:13 +0100 (Tue, 22 Dec 2009) | 1 line Closes #2812 (and removed a left-over println in Types). no review necessary. ........ r20295 | phaller | 2009-12-22 19:15:43 +0100 (Tue, 22 Dec 2009) | 1 line Closes #2538. no review necessary. ........ r20296 | extempore | 2009-12-22 21:11:29 +0100 (Tue, 22 Dec 2009) | 3 lines Took full advantage of the new =>? alias for the superverbosely named PartialFunction by renaming every usage of the latter except when in comments. ........ r20297 | odersky | 2009-12-23 00:42:37 +0100 (Wed, 23 Dec 2009) | 2 lines tentative fix for RC5 lift build problem. ........ r20300 | odersky | 2009-12-23 01:22:11 +0100 (Wed, 23 Dec 2009) | 2 lines Another fix to make lift build under RC5; review by dragos ........ --- test/files/jvm/future-awaitall-zero.check | 1 + test/files/jvm/future-awaitall-zero.scala | 17 +++++++++++++++++ test/files/jvm/t1449.check | 1 + test/files/jvm/t1449.scala | 15 +++++++++++++++ test/files/neg/names-defaults-neg-ref.check | 2 +- test/files/pos/t2809.scala | 20 ++++++++++++++++++++ test/files/run/ReverseSeqView.scala | 25 +++++++++++++++++++++++++ 7 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 test/files/jvm/future-awaitall-zero.check create mode 100644 test/files/jvm/future-awaitall-zero.scala create mode 100644 test/files/jvm/t1449.check create mode 100644 test/files/jvm/t1449.scala create mode 100644 test/files/pos/t2809.scala create mode 100644 test/files/run/ReverseSeqView.scala (limited to 'test') diff --git a/test/files/jvm/future-awaitall-zero.check b/test/files/jvm/future-awaitall-zero.check new file mode 100644 index 0000000000..d86bac9de5 --- /dev/null +++ b/test/files/jvm/future-awaitall-zero.check @@ -0,0 +1 @@ +OK diff --git a/test/files/jvm/future-awaitall-zero.scala b/test/files/jvm/future-awaitall-zero.scala new file mode 100644 index 0000000000..49c51f2c7e --- /dev/null +++ b/test/files/jvm/future-awaitall-zero.scala @@ -0,0 +1,17 @@ +import scala.actors.Futures._ +import scala.actors.Actor._ + +object Test { + def main(args: Array[String]) { + val ft1 = future { reactWithin(1000) { + case _ => println("FAIL") + } } + + val ft2 = future { reactWithin(2000) { + case _ => println("FAIL") + } } + + val res = awaitAll(0, ft1, ft2) + println("OK") + } +} diff --git a/test/files/jvm/t1449.check b/test/files/jvm/t1449.check new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/test/files/jvm/t1449.check @@ -0,0 +1 @@ +42 diff --git a/test/files/jvm/t1449.scala b/test/files/jvm/t1449.scala new file mode 100644 index 0000000000..08c153afc0 --- /dev/null +++ b/test/files/jvm/t1449.scala @@ -0,0 +1,15 @@ +import scala.actors.Actor._ +import scala.actors.Future +import scala.actors.Futures._ +object Test { + def main(args: Array[String]) { + val a = actor { + react { + case ft: Future[a] => + println(ft()) + } + } + val ft = future { 42 } + a ! ft + } +} diff --git a/test/files/neg/names-defaults-neg-ref.check b/test/files/neg/names-defaults-neg-ref.check index ac37816762..00052c72dc 100644 --- a/test/files/neg/names-defaults-neg-ref.check +++ b/test/files/neg/names-defaults-neg-ref.check @@ -2,7 +2,7 @@ names-defaults-neg-ref.scala:3: error: in anonymous class $anon, multiple overlo The members with defaults are defined in trait B2235 and trait A2235. new A2235 with B2235 ^ -names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments() +names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments. class A { ^ names-defaults-neg-ref.scala:17: error: in class C, multiple overloaded alternatives of method bar define default arguments. diff --git a/test/files/pos/t2809.scala b/test/files/pos/t2809.scala new file mode 100644 index 0000000000..1f68b0b07a --- /dev/null +++ b/test/files/pos/t2809.scala @@ -0,0 +1,20 @@ +package p1 { + abstract class T1 { + protected def bug(p: Int = 1): Int // without 'protected' compiles fine + } +} +package p2 { // all being in the same package compiles fine + import p1._ + abstract class T2 extends T1 { + class A { + bug() + } + } + + abstract class T3 extends T2 { + class A { + bug() + } + } +} + diff --git a/test/files/run/ReverseSeqView.scala b/test/files/run/ReverseSeqView.scala new file mode 100644 index 0000000000..836e4d6a1f --- /dev/null +++ b/test/files/run/ReverseSeqView.scala @@ -0,0 +1,25 @@ + + + + + + +object Test extends Application { + + val lstv = List(1, 2, 3).view + val lstvr = lstv.reverse + assert(lstvr.iterator.toList == List(3, 2, 1)) + assert(lstvr.reverse == List(1, 2, 3)) + assert(lstvr.reverseIterator.toList == List(1, 2, 3)) + assert(lstvr.reverseMap(_ + 1) == List(2, 3, 4)) + +} + + + + + + + + + -- cgit v1.2.3