Merge commit '9cdbe28' into merge/2.10.x-to-master

Conflicts:
	build.examples.xml
	build.xml
	docs/examples/actors/pingpong.scala
	docs/examples/fors.scala
	docs/examples/iterators.scala
	docs/examples/jolib/Ref.scala
	docs/examples/jolib/parallelOr.scala
	docs/examples/monads/callccInterpreter.scala
	docs/examples/monads/directInterpreter.scala
	docs/examples/monads/errorInterpreter.scala
	docs/examples/monads/simpleInterpreter.scala
	docs/examples/monads/stateInterpreter.scala
	docs/examples/parsing/ArithmeticParser.scala
	docs/examples/patterns.scala
	docs/examples/pilib/elasticBuffer.scala
	docs/examples/pilib/handover.scala
	docs/examples/pilib/piNat.scala
	docs/examples/typeinf.scala
	src/build/pack.xml

1 files changed, 0 insertions, 72 deletions

diff --git a/docs/examples/pilib/semaphore.scala b/docs/examples/pilib/semaphore.scala
deleted file mode 100644
index 951c90e8d4..0000000000
--- a/docs/examples/pilib/semaphore.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-package examples.pilib
-
-import scala.concurrent.pilib._
-
-/** Solution of exercise session 6 (first question). */
-object semaphore {
-
-  class Signal extends Chan[Unit] {
-    def send = write(())
-    def receive = read
-  }
-
-  /** Interface. */
-  trait Semaphore {
-    def get: Unit
-    def release: Unit
-  }
-
-  /** First implementation. */
-  class Sem1 extends Semaphore {
-
-    private val g = new Signal
-    private val r = new Signal
-
-    def get: Unit = g.send
-    def release: Unit = r.send
-
-    private def Sched: Unit = choice (
-      g * (x => { r.receive; Sched }),
-      r * (x => Sched)
-    )
-    spawn< Sched >
-  }
-
-  /** Second implementation. */
-  class Sem2 extends Semaphore {
-
-    private val a = new Signal
-    private val na = new Signal
-
-    def get { a.receive; spawn< na.send > }
-    def release: Unit = choice (
-      a * (x => spawn< a.send >),
-      na * (x => spawn< a.send >)
-    )
-    spawn< a.send >
-  }
-
-  /** Test program. */
-  def main(args: Array[String]) {
-    val random = new util.Random()
-    val sem = new Sem2
-    def mutex(p: => Unit) { sem.get; p; sem.release }
-
-    spawn< {
-      Thread.sleep(1 + random.nextInt(100));
-      mutex( {
-        println("a1");
-        Thread.sleep(1 + random.nextInt(100));
-        println("a2")
-      } )
-    } | {
-      Thread.sleep(1 + random.nextInt(100));
-      mutex( {
-        println("b1");
-        Thread.sleep(1 + random.nextInt(100));
-        println("b2")
-      } ) 
-    } >;
-  }
-}
-