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

Merge branch 'parsing_changes' into 0.12

This commit is contained in:
Mark Harrah 2012-01-15 13:09:41 -05:00
parent c3c7c92053 74eaee5a5e
commit f11a053cc9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/collection/Relation.scala
View File

@ -17,7 +17,6 @@ object Relation
make(forward, reverse)
}
private[sbt] def remove[X,Y](map: M[X,Y], from: X, to: Y): M[X,Y] =
map.get(from) match {
case Some(tos) =>

4
util/collection/Show.scala
View File

@ -2,4 +2,8 @@ package sbt
trait Show[T] {
def apply(t: T): String
}
object Show
{
def apply[T](f: T => String): Show[T] = new Show[T] { def apply(t: T): String = f(t) }
}

3
util/complete/Parser.scala
View File

@ -431,7 +431,8 @@ private final class ParserSeq[T](a: Seq[Parser[T]], errors: => Seq[String]) exte
{
val res = a.map(_.resultEmpty)
val (failures, values) = separate(res)(_.toEither)
if(failures.isEmpty) Value(values) else mkFailures(failures.flatMap(_()) ++ errors)
// if(failures.isEmpty) Value(values) else mkFailures(failures.flatMap(_()) ++ errors)
if(values.nonEmpty) Value(values) else mkFailures(failures.flatMap(_()) ++ errors)
}
def result = {
val success = a.flatMap(_.result)