Backport of r25948

Author: Antonio Cunei

docs/examples/actors/producers.scala

@@ -6,13 +6,13 @@ import scala.actors.Actor._
 abstract class Producer[T] {
 
   /** A signal that the next value should be produced. */
-  private val Next = new Object
+  private val Next = new Object 
 
   /** A label for an undefined state of the iterators. */
   private val Undefined = new Object
 
   /** A signal to stop the coordinator. */
-  private val Stop = new Object
+  private val Stop = new Object 
 
   protected def produce(x: T) {
     coordinator ! Some(x)
@@ -53,10 +53,10 @@ abstract class Producer[T] {
   }
 
   private val producer: Actor = actor {
-    receive {
-      case Next =>
+    receive { 
+      case Next => 
         produceValues
-        coordinator ! None
+        coordinator ! None 
     }
   }
 }
@@ -70,7 +70,7 @@ object producers extends Application {
   def tree = node(node(node(3), 4, node(6)), 8, node(node(9), 10, node(11)))
 
   class PreOrder(n: Tree) extends Producer[Int] {
-    def produceValues = traverse(n)
+    def produceValues = traverse(n) 
     def traverse(n: Tree) {
       if (n != null) {
         produce(n.elem)
@@ -81,7 +81,7 @@ object producers extends Application {
   }
 
   class PostOrder(n: Tree) extends Producer[Int] {
-    def produceValues = traverse(n)
+    def produceValues = traverse(n) 
     def traverse(n: Tree) {
       if (n != null) {
         traverse(n.left)
@@ -92,7 +92,7 @@ object producers extends Application {
   }
 
   class InOrder(n: Tree) extends Producer[Int] {
-    def produceValues = traverse(n)
+    def produceValues = traverse(n) 
     def traverse(n: Tree) {
       if (n != null) {
         traverse(n.left)

docs/examples/jolib/Ref.scala

@@ -12,7 +12,7 @@ import concurrent.SyncVar;
 import concurrent.jolib._;
 
 class Ref[a](init: a) extends Join {
-
+  
   object get extends Synchr[a](this) { case class C() extends SyncVar[a]; }
   object set extends Synchr[unit](this) { case class C(x: a) extends SyncVar[unit]; }
   object state extends Asynchr(this) { case class C(x: a); }
@@ -25,7 +25,7 @@ class Ref[a](init: a) extends Join {
   );
 
   state(state.C(init));
-
+  
   def Get: a = get(get.C());
   def Set(x: a): unit = set(set.C(x));
 }

docs/examples/jolib/parallelOr.scala

@@ -13,27 +13,27 @@ import concurrent.SyncVar;
 
 /** Implementation in the join-calculus of a parallel OR. */
 object or extends Join {
-
+  
   object res extends Synchr[boolean](this) { case class C() extends SyncVar[boolean] };
   object res1 extends Asynchr(this) { case class C(b: boolean); }
   object res2 extends Asynchr(this) { case class C(b: boolean); }
   object res1False extends Synchr[boolean](this) { case class C() extends SyncVar[boolean] };
   object res2False extends Synchr[boolean](this) { case class C() extends SyncVar[boolean] };
-
+  
   rules(
     Pair(List(res, res1), { case List(r @ res.C(), res1.C(b)) =>
       if (b) r.set(b) else r.set(res1False(res1False.C())) }),
-
+    
     Pair(List(res, res2), { case List(r @ res.C(), res2.C(b)) =>
       if (b) r.set(b) else r.set(res2False(res2False.C())) }),
-
+    
     Pair(List(res1False, res2),  { case List(r @ res1False.C(), res2.C(b)) =>
       r.set(b) }),
-
+    
     Pair(List(res2False, res1),  { case List(r @ res2False.C(), res1.C(b)) =>
       r.set(b) })
   );
-
+  
   def apply(b1: => boolean, b2: => boolean): boolean = {
     concurrent.ops.spawn(res1(res1.C(b1)));
     concurrent.ops.spawn(res2(res2.C(b2)));
@@ -42,7 +42,7 @@ object or extends Join {
 }
 */
 object parallelOr {
-
+  
   def main(args: Array[String]): unit = {
     def loop: boolean = { while (true) {}; true };
 /*

docs/examples/monads/callccInterpreter.scala

@@ -14,7 +14,7 @@ object callccInterpreter {
 
   def showM(m: M[Value]): String = (m in id).toString();
 
-  def callCC[A](h: (A => M[A]) => M[A]) =
+  def callCC[A](h: (A => M[A]) => M[A]) = 
     M[A](c => h(a => M[A](d => c(a))) in c);
 
   type Name = String;
@@ -30,7 +30,7 @@ object callccInterpreter {
   trait Value;
   case object Wrong extends Value {
    override def toString() = "wrong"
-  }
+  } 
   case class Num(n: Int) extends Value {
     override def toString() = n.toString();
   }
@@ -70,7 +70,7 @@ object callccInterpreter {
     case Ccc(x, t) => callCC(k => interp(t, Pair(x, Fun(k)) :: e))
   }
 
-  def test(t: Term): String =
+  def test(t: Term): String = 
     showM(interp(t, List()));
 
   val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11)));

docs/examples/monads/directInterpreter.scala

@@ -45,11 +45,11 @@ object directInterpreter {
     case App(f, t) => apply(interp(f, e), interp(t, e))
   }
 
-  def test(t: Term): String =
+  def test(t: Term): String = 
     showval(interp(t, List()));
 
   val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11)));
 
-  def main(args: Array[String]) =
+  def main(args: Array[String]) = 
     System.out.println(test(term0));
 }

docs/examples/monads/simpleInterpreter.scala

@@ -22,7 +22,7 @@ object simpleInterpreter {
   trait Value;
   case object Wrong extends Value {
    override def toString() = "wrong"
-  }
+  } 
   case class Num(n: Int) extends Value {
     override def toString() = n.toString();
   }
@@ -61,7 +61,7 @@ object simpleInterpreter {
 		      yield c
   }
 
-  def test(t: Term): String =
+  def test(t: Term): String = 
     showM(interp(t, List()));
 
   val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11)));

docs/examples/monads/stateInterpreter.scala

@@ -7,7 +7,7 @@ object stateInterpreter {
   val tickS = new M(s => Pair((), s + 1));
 
   case class M[A](in: State => Pair[A, State]) {
-    def bind[B](k: A => M[B]) = M[B]{ s0 =>
+    def bind[B](k: A => M[B]) = M[B]{ s0 => 
       val Pair(a, s1) = this in s0; k(a) in s1
     }
     def map[B](f: A => B): M[B]        = bind(x => unitM(f(x)));
@@ -72,7 +72,7 @@ object stateInterpreter {
 		      yield c
   }
 
-  def test(t: Term): String =
+  def test(t: Term): String = 
     showM(interp(t, List()));
 
   val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11)));

docs/examples/parsing/ArithmeticParser.scala

@@ -15,16 +15,16 @@ import scala.util.parsing.combinator.syntactical.StdTokenParsers
  *   a term is a sequence of factors, separated by * or /
  *   a factor is a parenthesized expression or a number
  *
- * @author Adriaan Moors
- */
-object arithmeticParser extends StdTokenParsers {
+ * @author Adriaan Moors 
+ */ 
+object arithmeticParser extends StdTokenParsers {   
   type Tokens = StdLexical ; val lexical = new StdLexical
   lexical.delimiters ++= List("(", ")", "+", "-", "*", "/")
 
   lazy val expr =   term*("+" ^^^ {(x: int, y: int) => x + y} | "-" ^^^ {(x: int, y: int) => x - y})
   lazy val term = factor*("*" ^^^ {(x: int, y: int) => x * y} | "/" ^^^ {(x: int, y: int) => x / y})
   lazy val factor: Parser[int] = "(" ~> expr <~ ")" | numericLit ^^ (_.toInt)
-
+  
   def main(args: Array[String]) {
     println(
       if (args.length == 1) {
@@ -37,14 +37,14 @@ object arithmeticParser extends StdTokenParsers {
 }
 
 
-object arithmeticParserDesugared extends StdTokenParsers {
+object arithmeticParserDesugared extends StdTokenParsers {   
   type Tokens = StdLexical ; val lexical = new StdLexical
   lexical.delimiters ++= List("(", ")", "+", "-", "*", "/")
 
   lazy val expr = chainl1(term, (keyword("+").^^^{(x: int, y: int) => x + y}).|(keyword("-").^^^{(x: int, y: int) => x - y}))
   lazy val term = chainl1(factor, (keyword("*").^^^{(x: int, y: int) => x * y}).|(keyword("/").^^^{(x: int, y: int) => x / y}))
-  lazy val factor: Parser[int] = keyword("(").~>(expr.<~(keyword(")"))).|(numericLit.^^(x => x.toInt))
-
+  lazy val factor: Parser[int] = keyword("(").~>(expr.<~(keyword(")"))).|(numericLit.^^(x => x.toInt))   
+  
   def main(args: Array[String]) {
     println(
       if (args.length == 1) {

docs/examples/parsing/ArithmeticParsers.scala

@@ -2,7 +2,7 @@ package examples.parsing
 
 import scala.util.parsing.combinator1.syntactical.StandardTokenParsers
 
-object ArithmeticParsers extends StandardTokenParsers {
+object ArithmeticParsers extends StandardTokenParsers {   
   lexical.delimiters ++= List("(", ")", "+", "-", "*", "/")
 
   def expr: Parser[Any] = term ~ rep("+" ~ term | "-" ~ term)
@@ -16,11 +16,11 @@ object ArithmeticParsers extends StandardTokenParsers {
   }
 }
 
-object ArithmeticParsers1 extends StandardTokenParsers {
+object ArithmeticParsers1 extends StandardTokenParsers {   
   lexical.delimiters ++= List("(", ")", "+", "-", "*", "/")
 
   val reduceList: Int ~ List[String ~ Int] => Int = {
-    case i ~ ps => (i /: ps)(reduce)
+    case i ~ ps => (i /: ps)(reduce) 
   }
 
   def reduce(x: Int, r: String ~ Int) = (r: @unchecked) match {
@@ -45,11 +45,11 @@ class Expr
 case class BinOp(op: String, l: Expr, r: Expr) extends Expr
 case class Num(n: Int) extends Expr
 
-object ArithmeticParsers2 extends StandardTokenParsers {
+object ArithmeticParsers2 extends StandardTokenParsers {   
   lexical.delimiters ++= List("(", ")", "+", "-", "*", "/")
 
   val reduceList: Expr ~ List[String ~ Expr] => Expr = {
-    case i ~ ps => (i /: ps)(reduce)
+    case i ~ ps => (i /: ps)(reduce) 
   }
 
   def reduce(l: Expr, r: String ~ Expr) = BinOp(r._1, l, r._2)

docs/examples/parsing/JSON.scala

@@ -2,14 +2,14 @@ package examples.parsing
 
 import scala.util.parsing.combinator1.syntactical.StandardTokenParsers
 
-object JSON extends StandardTokenParsers {
+object JSON extends StandardTokenParsers {   
   lexical.delimiters += ("{", "}", "[", "]", ":", ",")
   lexical.reserved += ("null", "true", "false")
 
   def obj   : Parser[Any] = "{" ~ repsep(member, ",") ~ "}"
   def arr   : Parser[Any] = "[" ~ repsep(value, ",") ~ "]"
   def member: Parser[Any] = ident ~ ":" ~ value
-  def value : Parser[Any] = ident | numericLit | obj | arr |
+  def value : Parser[Any] = ident | numericLit | obj | arr | 
                             "null" | "true" | "false"
 
   def main(args: Array[String]) {
@@ -18,20 +18,20 @@ object JSON extends StandardTokenParsers {
     println(phrase(value)(tokens))
   }
 }
-object JSON1 extends StandardTokenParsers {
+object JSON1 extends StandardTokenParsers {   
   lexical.delimiters += ("{", "}", "[", "]", ":", ",")
   lexical.reserved += ("null", "true", "false")
 
-  def obj: Parser[Map[String, Any]] =
+  def obj: Parser[Map[String, Any]] = 
     "{" ~> repsep(member, ",") <~ "}" ^^ (Map() ++ _)
 
   def arr: Parser[List[Any]] =
-    "[" ~> repsep(value, ",") <~ "]"
+    "[" ~> repsep(value, ",") <~ "]" 
 
-  def member: Parser[(String, Any)] =
+  def member: Parser[(String, Any)] = 
     ident ~ ":" ~ value ^^ { case name ~ ":" ~ value => (name -> value) }
 
-  def value: Parser[Any] =
+  def value: Parser[Any] = 
     ident | numericLit ^^ (_.toInt) | obj | arr |
     "null" ^^^ null | "true" ^^^ true | "false" ^^^ false