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

'definitive' Parser failures 

Support a definitive flag for Failure that ignores later failures
instead of appending them.  This is useful to override the default
behavior of listing the failures of alternative parsers.
This commit is contained in:
Mark Harrah 2013-06-17 12:06:13 -04:00
parent 3dd714b1fa
commit d4f6b9cf78
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/complete/src/main/scala/sbt/complete/Parser.scala
View File

@ -100,7 +100,7 @@ object Parser extends ParserMain
def filter(f: T => Boolean, msg: => String): Result[T] = if(f(value)) this else mkFailure(msg) def filter(f: T => Boolean, msg: => String): Result[T] = if(f(value)) this else mkFailure(msg)
def toEither = Right(value) def toEither = Right(value)
} }
final class Failure(mkErrors: => Seq[String]) extends Result[Nothing] { final class Failure private[sbt](mkErrors: => Seq[String], val definitive: Boolean) extends Result[Nothing] {
lazy val errors: Seq[String] = mkErrors lazy val errors: Seq[String] = mkErrors
def isFailure = true def isFailure = true
def isValid = false def isValid = false
@ -108,11 +108,11 @@ object Parser extends ParserMain
def flatMap[B](f: Nothing => Result[B]) = this def flatMap[B](f: Nothing => Result[B]) = this
def or[B](b: => Result[B]): Result[B] = b match { def or[B](b: => Result[B]): Result[B] = b match {
case v: Value[B] => v case v: Value[B] => v
case f: Failure => concatErrors(f) case f: Failure => if(definitive) this else concatErrors(f)
} }
def either[B](b: => Result[B]): Result[Either[Nothing,B]] = b match { def either[B](b: => Result[B]): Result[Either[Nothing,B]] = b match {
case Value(v) => Value(Right(v)) case Value(v) => Value(Right(v))
case f: Failure => concatErrors(f) case f: Failure => if(definitive) this else concatErrors(f)
} }
def filter(f: Nothing => Boolean, msg: => String) = this def filter(f: Nothing => Boolean, msg: => String) = this
def app[B,C](b: => Result[B])(f: (Nothing, B) => C): Result[C] = this def app[B,C](b: => Result[B])(f: (Nothing, B) => C): Result[C] = this
@ -121,8 +121,8 @@ object Parser extends ParserMain
private[this] def concatErrors(f: Failure) = mkFailures(errors ++ f.errors) private[this] def concatErrors(f: Failure) = mkFailures(errors ++ f.errors)
} }
def mkFailures(errors: => Seq[String]): Failure = new Failure(errors.distinct) def mkFailures(errors: => Seq[String], definitive: Boolean = false): Failure = new Failure(errors.distinct, definitive)
def mkFailure(error: => String): Failure = new Failure(error :: Nil) def mkFailure(error: => String, definitive: Boolean = false): Failure = new Failure(error :: Nil, definitive)
def checkMatches(a: Parser[_], completions: Seq[String]) def checkMatches(a: Parser[_], completions: Seq[String])
{ {