From e8ad9d9f30e20dc10f5fe012ed8833c9df3e1912 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Thu, 6 May 2010 17:16:54 +0000 Subject: Merged revisions 21810-21811,21816-21818,21826,... Merged revisions 21810-21811,21816-21818,21826,21829 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21810 | imaier | 2010-05-05 11:59:25 +0200 (Wed, 05 May 2010) | 1 line Fixed #3358. Added explicit expected types to cachedWrapper calls, deprecated explicit resizing of UIElements. ........ r21811 | rytz | 2010-05-05 13:53:31 +0200 (Wed, 05 May 2010) | 1 line revert the revert of r21791 (fix constructor parameter annotations). close #3390. together with a new starr it builds. no review. ........ r21816 | extempore | 2010-05-05 18:56:55 +0200 (Wed, 05 May 2010) | 2 lines Rolled back a subset of partest to use StreamAppender and avoid io.Process. No review. ........ r21817 | dragos | 2010-05-05 19:59:21 +0200 (Wed, 05 May 2010) | 3 lines Tightened what gets specialized: only when the type parameter appears at top level, or as a type argument to a Java array. For example T, Array[T] cause specialization, but List[T] does not. Resurrected spec-matrix, forgotten among the disabled tests. No review. ........ r21818 | dragos | 2010-05-05 20:26:17 +0200 (Wed, 05 May 2010) | 1 line Removed some logging and prune CollectMethodBodies to not traverse more than necessary. No review. ........ r21826 | extempore | 2010-05-06 16:57:56 +0200 (Thu, 06 May 2010) | 1 line Fixed bug in transpose, closes #3397, no review. ........ r21829 | extempore | 2010-05-06 18:37:13 +0200 (Thu, 06 May 2010) | 5 lines Rolled partest back to r21328. Attempted to make the minimum changes necessary to plug it back in while preserving everything which has happened since then in tests and such, but we should be the lookout for overreversion. Review by phaller (but as a formality, I don't think it requires direct review.) ........ --- test/files/continuations-run/match0.scala | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/files/continuations-run/match0.scala (limited to 'test/files/continuations-run/match0.scala') diff --git a/test/files/continuations-run/match0.scala b/test/files/continuations-run/match0.scala new file mode 100644 index 0000000000..bd36238d7f --- /dev/null +++ b/test/files/continuations-run/match0.scala @@ -0,0 +1,18 @@ +// $Id$ + +import scala.util.continuations._ + + +object Test { + + def test(x:Int) = x match { + case 7 => shift { k: (Int=>Int) => k(k(k(x))) } + case 8 => shift { k: (Int=>Int) => k(x) } + } + + def main(args: Array[String]): Any = { + println(reset(1 + test(7))) + println(reset(1 + test(8))) + } + +} \ No newline at end of file -- cgit v1.2.3