From 23bf3e55c790797402ab6a674d32da22246194f6 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 14 Aug 2010 09:50:22 -0400 Subject: [PATCH] merge two Tasked methods In practice, the returned task is coupled to the conversion function, so task and taskToNode were merged. Also, renamed 'task' to 'act'. --- main/Command.scala | 3 +-- main/Main.scala | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/main/Command.scala b/main/Command.scala index 7fa07de28..981d1e6ef 100644 --- a/main/Command.scala +++ b/main/Command.scala @@ -86,8 +86,7 @@ trait Member[Node <: Member[Node]] trait Tasked { type Task[T] <: AnyRef - def task(name: String, state: State): Option[Task[State]] - implicit def taskToNode: NodeView[Task] + def act(in: Input, state: State): Option[(Task[State], NodeView[Task])] def help: Seq[Help] } trait TaskSetup diff --git a/main/Main.scala b/main/Main.scala index 1b553076e..caf2675ca 100644 --- a/main/Main.scala +++ b/main/Main.scala @@ -200,8 +200,8 @@ object Commands case c: TaskSetup => (c.checkCycles, c.maxThreads) case _ => (false, Runtime.getRuntime.availableProcessors) } - for(task <- p.task(in.name, s)) yield - processResult(runTask(task, checkCycles, maxThreads)(p.taskToNode), s) + for( (task, taskToNode) <- p.act(in, s)) yield + processResult(runTask(task, checkCycles, maxThreads)(taskToNode), s) } } }