From ffd7b9649cde61553f16c25f64c3072ecfa6c713 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Tue, 26 Feb 2013 01:16:40 +0100 Subject: Remove CPS dependency from default async implementation - move all CPS-related code to `continuations` sub package - fix CPS-based async implementation - enable testing of CPS-based async implementation --- .../continuations/ScalaConcurrentCPSFallback.scala | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala (limited to 'src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala') diff --git a/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala b/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala new file mode 100644 index 0000000..018ad05 --- /dev/null +++ b/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2012 Typesafe Inc. + */ + +package scala.async +package continuations + +import scala.util.continuations._ +import scala.concurrent.{Future, Promise, ExecutionContext} + +trait ScalaConcurrentCPSFallback { + self: AsyncBaseWithCPSFallback => + + import ExecutionContext.Implicits.global + + lazy val futureSystem = ScalaConcurrentFutureSystem + type FS = ScalaConcurrentFutureSystem.type + + /* Fall-back for `await` when it is called at an unsupported position. + */ + override def awaitFallback[T](awaitable: futureSystem.Fut[T]): T @cps[Future[Any]] = + shift { + (k: (T => Future[Any])) => + val fr = Promise[Any]() + awaitable onComplete { + case tr => fr completeWith k(tr.get) + } + fr.future + } + +} -- cgit v1.2.3