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

Translate `show x y` into `;show x ;show y` . fixes #495

This commit is contained in:
Mark Harrah 2012-07-06 10:28:51 -04:00
parent 8d20a7ea19
commit 364d49d4b4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/Act.scala
View File

@ -226,10 +226,17 @@ object Act
{
val extracted = Project extract state
import extracted.{showKey, structure}
import Aggregation.evaluatingParser
showParser.flatMap { show =>
aggregatedKeyParser(extracted) flatMap { kvs =>
Aggregation.evaluatingParser(state, structure, show)( keyValues(structure)(kvs) )
}
val akp = aggregatedKeyParser(extracted)
def evaluate(kvs: Seq[ScopedKey[T]] forSome { type T}): Parser[() => State] = evaluatingParser(state, structure, show)( keyValues(structure)(kvs) )
def reconstruct(arg: String): String = ShowCommand + " " + arg
if(show)
( akp ~ (token(Space) ~> matched(akp)).* ) flatMap { case (kvs, tail) =>
evaluate(kvs) map { f => () => tail.map(reconstruct) ::: f() }
}
else
akp flatMap evaluate
}
}
def showParser = token( (ShowCommand ~ Space) ^^^ true) ?? false