luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly chain Incompletes for flatMap

This commit is contained in:
Mark Harrah 2011-04-06 20:44:54 -04:00
parent 159a3fe8f3
commit 32d1bc9e4e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/Execute.scala
View File

@ -116,7 +116,7 @@ final class Execute[A[_] <: AnyRef](checkCycles: Boolean)(implicit view: NodeVie
results(node) = result
state(node) = Done
remove( reverse, node ) foreach { dep => notifyDone(node, dep) }
callers.remove( node ).flatten.foreach { c => retire(c, result) }
callers.remove( node ).flatten.foreach { c => retire(c, callerResult(c, result)) }
post {
assert( done(node) )
@ -126,6 +126,11 @@ final class Execute[A[_] <: AnyRef](checkCycles: Boolean)(implicit view: NodeVie
assert( ! (callers contains node) )
}
}
def callerResult[T](node: A[T], result: Result[T]): Result[T] =
result match {
case _: Value[T] => result
case Inc(i) => Inc(Incomplete(Some(node), tpe = i.tpe, causes = i :: Nil))
}
def notifyDone( node: A[_], dependent: A[_] )(implicit strategy: Strategy)
{