From c3426a231bc6f30646e29acc97638435425b62d8 Mon Sep 17 00:00:00 2001 From: michelou Date: Thu, 22 Jun 2006 16:19:14 +0000 Subject: removed 'mixin' from files in docs/examples/ --- docs/examples/parsers2.scala | 4 ++-- docs/examples/typeinf.scala | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'docs') 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 */ -- cgit v1.2.3