diff --git a/README.md b/README.md index b9e97aac..cb85d55b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -scala-parser-combinators [](https://travis-ci.org/scala/scala-parser-combinators) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators) -======================== +# scala-parser-combinators [](https://travis-ci.org/scala/scala-parser-combinators) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators) ### Scala Standard Parser Combinator Library @@ -29,24 +28,23 @@ To support multiple Scala versions, see the example in [scala/scala-module-depen import scala.util.parsing.combinator._ case class WordFreq(word: String, count: Int) { - override def toString = "Word <" + word + "> " + - "occurs with frequency " + count + override def toString = s"Word <$word> occurs with frequency $count" } class SimpleParser extends RegexParsers { - def word: Parser[String] = """[a-z]+""".r ^^ { _.toString } - def number: Parser[Int] = """(0|[1-9]\d*)""".r ^^ { _.toInt } - def freq: Parser[WordFreq] = word ~ number ^^ { case wd ~ fr => WordFreq(wd,fr) } + def word: Parser[String] = """[a-z]+""".r ^^ { _.toString } + def number: Parser[Int] = """(0|[1-9]\d*)""".r ^^ { _.toInt } + def freq: Parser[WordFreq] = word ~ number ^^ { case wd ~ fr => WordFreq(wd,fr) } } object TestSimpleParser extends SimpleParser { - def main(args: Array[String]) = { - parse(freq, "johnny 121") match { - case Success(matched,_) => println(matched) - case Failure(msg,_) => println("FAILURE: " + msg) - case Error(msg,_) => println("ERROR: " + msg) - } + def main(args: Array[String]) = { + parse(freq, "johnny 121") match { + case Success(matched,_) => println(matched) + case Failure(msg,_) => println(s"FAILURE: $msg") + case Error(msg,_) => println(s"ERROR: $msg") } + } } ```