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

StringVerbatim is now stateless

This commit is contained in:
e.e d3si9n 2012-03-11 13:19:13 -04:00
parent e6e778a1a3
commit feb315b878
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/complete/Parsers.scala
View File

@ -66,21 +66,9 @@ trait Parsers
(neg.toSeq ++ digits).mkString.toInt
lazy val Bool = ("true" ^^^ true) | ("false" ^^^ false)
lazy val StringBasic = StringVerbatim | StringEscapable | NotQuoted
def StringVerbatim: Parser[String] = {
var dqcount = 0
val p = VerbatimDQuotes ~
charClass(_ match {
case DQuoteChar =>
dqcount += 1
dqcount < 3
case _ =>
dqcount = 0
true
}).*.string ~ DQuoteChar
p map { case ((s, p), c) => s + p + c.toString } filter(
{ _.endsWith(VerbatimDQuotes) }, _ => "Expected '%s'" format VerbatimDQuotes) map { s =>
s.substring(3, s.length - 3) }
}
lazy val StringVerbatim: Parser[String] = VerbatimDQuotes ~>
any.+.string.filter(!_.contains(VerbatimDQuotes), _ => "Invalid verbatim string") <~
VerbatimDQuotes
lazy val StringEscapable: Parser[String] = {
val p = DQuoteChar ~>
(EscapeSequence | NotDQuoteBackslashClass map {_.toString}).* <~ DQuoteChar