Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit f794987

Browse files
Merge pull request #167 from Philippus/indent-scala-style
Update scala section in readme
2 parents 02183d8 + 695279f commit f794987

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

‎README.md‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
scala-parser-combinators [<img src="https://img.shields.io/travis/scala/scala-parser-combinators.svg"/>](https://travis-ci.org/scala/scala-parser-combinators) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.12.svg?label=latest%20release%20for%202.12"/>](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)
2-
========================
1+
# scala-parser-combinators [<img src="https://img.shields.io/travis/scala/scala-parser-combinators.svg"/>](https://travis-ci.org/scala/scala-parser-combinators) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.12.svg?label=latest%20release%20for%202.12"/>](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)
32

43
### Scala Standard Parser Combinator Library
54

@@ -29,24 +28,23 @@ To support multiple Scala versions, see the example in [scala/scala-module-depen
2928
import scala.util.parsing.combinator._
3029

3130
case class WordFreq(word: String, count: Int) {
32-
override def toString = "Word <" + word + "> " +
33-
"occurs with frequency " + count
31+
override def toString = s"Word <$word> occurs with frequency $count"
3432
}
3533

3634
class SimpleParser extends RegexParsers {
37-
def word: Parser[String] = """[a-z]+""".r ^^ { _.toString }
38-
def number: Parser[Int] = """(0|[1-9]\d*)""".r ^^ { _.toInt }
39-
def freq: Parser[WordFreq] = word ~ number ^^ { case wd ~ fr => WordFreq(wd,fr) }
35+
def word: Parser[String] = """[a-z]+""".r ^^ { _.toString }
36+
def number: Parser[Int] = """(0|[1-9]\d*)""".r ^^ { _.toInt }
37+
def freq: Parser[WordFreq] = word ~ number ^^ { case wd ~ fr => WordFreq(wd,fr) }
4038
}
4139

4240
object TestSimpleParser extends SimpleParser {
43-
def main(args: Array[String]) = {
44-
parse(freq, "johnny 121") match {
45-
case Success(matched,_) => println(matched)
46-
case Failure(msg,_) => println("FAILURE: " + msg)
47-
case Error(msg,_) => println("ERROR: " + msg)
48-
}
41+
def main(args: Array[String]) = {
42+
parse(freq, "johnny 121") match {
43+
case Success(matched,_) => println(matched)
44+
case Failure(msg,_) => println(s"FAILURE: $msg")
45+
case Error(msg,_) => println(s"ERROR: $msg")
4946
}
47+
}
5048
}
5149
```
5250

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /