From eec68ee8dae398cf6b2b1db99f00c5fe726b1ffe Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 17 Jun 2011 18:03:59 -0400 Subject: [PATCH] minor changes to parsers --- util/complete/Parser.scala | 4 ++-- util/complete/Parsers.scala | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/util/complete/Parser.scala b/util/complete/Parser.scala index 6eb9c135b..82b00db66 100644 --- a/util/complete/Parser.scala +++ b/util/complete/Parser.scala @@ -243,8 +243,8 @@ trait ParserMain def string(implicit ev: A <:< Seq[Char]): Parser[String] = map(_.mkString) def flatMap[B](f: A => Parser[B]) = bindParser(a, f) } - implicit def literalRichParser(c: Char): RichParser[Char] = richParser(c) - implicit def literalRichParser(s: String): RichParser[String] = richParser(s) + implicit def literalRichCharParser(c: Char): RichParser[Char] = richParser(c) + implicit def literalRichStringParser(s: String): RichParser[String] = richParser(s) def invalid(msgs: => Seq[String]): Parser[Nothing] = Invalid(mkFailures(msgs)) def failure(msg: => String): Parser[Nothing] = invalid(msg :: Nil) diff --git a/util/complete/Parsers.scala b/util/complete/Parsers.scala index c6f157827..93ab9b9ac 100644 --- a/util/complete/Parsers.scala +++ b/util/complete/Parsers.scala @@ -46,6 +46,7 @@ trait Parsers lazy val NatBasic = mapOrFail( Digit.+ )( _.mkString.toInt ) private[this] def toInt(neg: Option[Char], digits: Seq[Char]): Int = (neg.toSeq ++ digits).mkString.toInt + lazy val Bool = ("true" ^^^ true) | ("false" ^^^ false) def repsep[T](rep: Parser[T], sep: Parser[_]): Parser[Seq[T]] = rep1sep(rep, sep) ?? Nil