diff options
| author | michelou <michelou@epfl.ch> | 2006-06-22 16:19:14 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-06-22 16:19:14 +0000 |
| commit | c3426a231bc6f30646e29acc97638435425b62d8 (patch) | |
| tree | 299966784fc25ae5d8b35bee1462a18569529661 /docs | |
| parent | 9d39ff267ef9994bab3fde4a2f25ae5d509d09a4 (diff) | |
| download | scala-c3426a231bc6f30646e29acc97638435425b62d8.tar.gz scala-c3426a231bc6f30646e29acc97638435425b62d8.tar.bz2 scala-c3426a231bc6f30646e29acc97638435425b62d8.zip | |
removed 'mixin' from files in docs/examples/
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/examples/parsers2.scala | 4 | ||||
| -rw-r--r-- | docs/examples/typeinf.scala | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/docs/examples/parsers2.scala b/docs/examples/parsers2.scala index f15ca56e0a..8ae5d50ea5 100644 --- a/docs/examples/parsers2.scala +++ b/docs/examples/parsers2.scala @@ -7,11 +7,11 @@ object parsers2 { case class Num(n: int) extends Tree case class Lst(elems: List[Tree]) extends Tree - def isLetter = c: char => Character.isLetter(c) + def isLetter = (c: char) => Character.isLetter(c) def isLetterOrDigit: char => boolean = Character.isLetterOrDigit def isDigit: char => boolean = Character.isDigit - mixin class ListParsers extends CharParsers { + trait ListParsers extends CharParsers { def ident: Parser[Tree] = for ( diff --git a/docs/examples/typeinf.scala b/docs/examples/typeinf.scala index d9b2b5f3d1..f21d514f87 100644 --- a/docs/examples/typeinf.scala +++ b/docs/examples/typeinf.scala @@ -149,7 +149,7 @@ object typeInfer { ) } - mixin class MiniMLParsers extends CharParsers { + trait MiniMLParsers extends CharParsers { /** whitespace */ def whitespace = rep{chr(' ') ||| chr('\t') ||| chr('\n')} @@ -157,11 +157,14 @@ object typeInfer { /** A given character, possible preceded by whitespace */ def wschr(ch: char) = whitespace &&& chr(ch) + def isLetter = (c: char) => Character.isLetter(c) + def isLetterOrDigit: char => boolean = Character.isLetterOrDigit + /** identifiers or keywords */ def id: Parser[String] = for ( - val c: char <- rep(chr(' ')) &&& chr(Character.isLetter); - val cs: List[char] <- rep(chr(Character.isLetterOrDigit)) + val c: char <- rep(chr(' ')) &&& chr(isLetter); + val cs: List[char] <- rep(chr(isLetterOrDigit)) ) yield (c :: cs).mkString("", "", "") /** Non-keyword identifiers */ |