From 0168aae0c66db75a48b52e871a64d93507ff67cd Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 21 Jun 2010 21:25:02 -0400 Subject: [PATCH] fix overloading issue in task demo --- tasks/src/test/scala/DemoTask.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/src/test/scala/DemoTask.scala b/tasks/src/test/scala/DemoTask.scala index 8ed192794..1574c4240 100644 --- a/tasks/src/test/scala/DemoTask.scala +++ b/tasks/src/test/scala/DemoTask.scala @@ -52,12 +52,12 @@ object Task def pure[T](name: String, f: => T): Task[T] = new Pure(f _) { override def toString = name } implicit def toPure[T](f: () => T): Task[T] = new Pure(f) - implicit def toTasks[S](in: Seq[S]): Seq[Task[S]] = in.map(s => pure(s)) + implicit def pureTasks[S](in: Seq[S]): Seq[Task[S]] = in.map(s => pure(s)) implicit def toTasks[S](in: Seq[() => S]): Seq[Task[S]] = in.map(toPure) implicit def iterableTask[S](in: Seq[S]): ForkTask[S, Seq] = new ForkTask[S, Seq] { def fork[T](f: S => T): Seq[Task[T]] = in.map(x => pure(x) map f) } - implicit def joinTasks[S](in: Seq[S]): JoinTask[S, Seq] = joinTasks(toTasks(in)) + implicit def pureJoin[S](in: Seq[S]): JoinTask[S, Seq] = joinTasks(pureTasks(in)) implicit def joinTasks[S](in: Seq[Task[S]]): JoinTask[S, Seq] = new JoinTask[S, Seq] { def join: Task[Seq[S]] = new Join(in, (s: Seq[S]) => Right(s) ) //def join[T](f: Iterable[S] => T): Task[Iterable[T]] = new MapAll( MList.fromTCList[Task](in), ml => f(ml.toList))