changed 'mixin class' into 'trait' in docs/exam...

changed 'mixin class' into 'trait' in docs/examples/*.scala

3 files changed, 5 insertions, 5 deletions

diff --git a/docs/examples/Parsers.scala b/docs/examples/Parsers.scala
index 3d83d05fb9..15dc0ce9ef 100644
--- a/docs/examples/Parsers.scala
+++ b/docs/examples/Parsers.scala
@@ -91,7 +91,7 @@ class Tokenizer(in: Iterator[char], delimiters: String) extends Iterator[String]
   }
 }
 
-mixin class TokenParsers extends Parsers {
+trait TokenParsers extends Parsers {
   type inputType = Stream[String]
   def nextToken() = new Parser[String] {
     def apply(in: inputType): Result =
@@ -99,7 +99,7 @@ mixin class TokenParsers extends Parsers {
   }
 }
 
-mixin class CharParsers extends Parsers {
+trait CharParsers extends Parsers {
   def any: Parser[char]
   def chr(ch: char) =
     for (val c <- any; c == ch) yield c
diff --git a/docs/examples/boundedbuffer.scala b/docs/examples/boundedbuffer.scala
index f7aa26036e..414566adef 100644
--- a/docs/examples/boundedbuffer.scala
+++ b/docs/examples/boundedbuffer.scala
@@ -40,7 +40,7 @@ object boundedbuffer {
     def consumeString(ss: String) = Console.println(ss)
     spawn { while (true) { val ssss = produceString; buf.put(ssss) } }
     spawn { while (true) { val s = buf.get; consumeString(s) } }
-    kill(5000)
+    kill(1000)
   }
 
 }
diff --git a/docs/examples/parsers1.scala b/docs/examples/parsers1.scala
index f2a5c48ac3..cdd68470d4 100644
--- a/docs/examples/parsers1.scala
+++ b/docs/examples/parsers1.scala
@@ -44,7 +44,7 @@ object parsers1 {
     def rep1(p: Parser): Parser = p &&& rep(p)  // p+ = p p*
   }
 
-  mixin class ListParsers extends Parsers {
+  trait ListParsers extends Parsers {
     def chr(p: char => boolean): Parser
     def chr(c: char): Parser = chr(d: char => d == c)
 
@@ -58,7 +58,7 @@ object parsers1 {
     def expr      : Parser = ident ||| number ||| list
   }
 
-  mixin class ExprParsers extends Parsers {
+  trait ExprParsers extends Parsers {
     def chr(p: char => boolean): Parser
     def chr(c: char): Parser = chr(d: char => d == c)