diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-12-18 13:57:26 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-12-18 13:57:26 +1000 |
commit | 41ae70758a8c5b841a8b63445f82bd056a0a964f (patch) | |
tree | 19413879ab94f946c0456e97a660fb86f179a5a8 /src/main/scala/scala/async/internal/TransformUtils.scala | |
parent | 61b4c183fa2392522051305ec12ab5f433cc09a7 (diff) | |
parent | 063492a14a004cb519f553a6cd30f8b3e41f0453 (diff) | |
download | scala-async-41ae70758a8c5b841a8b63445f82bd056a0a964f.tar.gz scala-async-41ae70758a8c5b841a8b63445f82bd056a0a964f.tar.bz2 scala-async-41ae70758a8c5b841a8b63445f82bd056a0a964f.zip |
Merge pull request #98 from retronym/ticket/73
Make `f(await(completedFuture))` execute `f` synchronously
Diffstat (limited to 'src/main/scala/scala/async/internal/TransformUtils.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 5e73a7f..0b8cd00 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -49,6 +49,7 @@ private[async] trait TransformUtils { private def isByName(fun: Tree): ((Int, Int) => Boolean) = { if (Boolean_ShortCircuits contains fun.symbol) (i, j) => true + else if (fun.tpe == null) (x, y) => false else { val paramss = fun.tpe.paramss val byNamess = paramss.map(_.map(_.isByNameParam)) @@ -72,10 +73,6 @@ private[async] trait TransformUtils { self.splice.contains(elem.splice) } - def mkFunction_apply[A, B](self: Expr[Function1[A, B]])(arg: Expr[A]) = reify { - self.splice.apply(arg.splice) - } - def mkAny_==(self: Expr[Any])(other: Expr[Any]) = reify { self.splice == other.splice } |