From c012f9230600552b491b000f18252d0f832426be Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 10 Oct 2006 09:34:08 +0000 Subject: added svn:keywords to scala/actors/*.scala --- src/actors/scala/actors/InputChannel.scala | 15 +++++++++++++++ src/actors/scala/actors/OutputChannel.scala | 15 +++++++++++++++ src/actors/scala/actors/Scheduler.scala | 16 ++++++++++------ .../scala/tools/nsc/typechecker/EtaExpansion.scala | 22 ++++++++++++---------- src/library/scala/collection/immutable/Tree.scala | 2 +- 5 files changed, 53 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/actors/scala/actors/InputChannel.scala b/src/actors/scala/actors/InputChannel.scala index ba97703b1a..6ddde7e911 100644 --- a/src/actors/scala/actors/InputChannel.scala +++ b/src/actors/scala/actors/InputChannel.scala @@ -1,5 +1,20 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.actors +/** + * The trait InputChannel ... + * + * @author Philipp Haller + */ trait InputChannel[Msg] { def receive[R](f: PartialFunction[Msg, R]): R def receiveWithin[R](msec: long)(f: PartialFunction[Any, R]): R diff --git a/src/actors/scala/actors/OutputChannel.scala b/src/actors/scala/actors/OutputChannel.scala index e189571378..964c9dada1 100644 --- a/src/actors/scala/actors/OutputChannel.scala +++ b/src/actors/scala/actors/OutputChannel.scala @@ -1,5 +1,20 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.actors +/** + * The trait OutputChannel ... + * + * @author Philipp Haller + */ trait OutputChannel[Msg] { def !(msg: Msg): Unit def forward(msg: Msg): Unit diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index e595cb73c8..4899f545d8 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -10,7 +10,7 @@ package scala.actors -import scala.collection.mutable.{ArrayBuffer, Buffer, Queue} +import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue} /** * The Scheduler object is used by @@ -142,14 +142,18 @@ class SpareWorkerScheduler extends IScheduler { } } - +/** + * The class TickedScheduler ... + * + * @author Philipp Haller + */ class TickedScheduler extends IScheduler { private val tasks = new Queue[Reaction] private var workers: Buffer[WorkerThread] = new ArrayBuffer[WorkerThread] private val idle = new Queue[WorkerThread] - private val ticks = new scala.collection.mutable.HashMap[WorkerThread, long] - private val executing = new scala.collection.mutable.HashMap[Reactor, WorkerThread] + private val ticks = new HashMap[WorkerThread, long] + private val executing = new HashMap[Reactor, WorkerThread] private var terminating = false @@ -263,8 +267,8 @@ class QuitException extends Throwable { /** - * This class is used by schedulers to execute reactor tasks on - * multiple threads. + * The class WorkerThread is used by schedulers to execute + * reactor tasks on multiple threads. * * @author Philipp Haller */ diff --git a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala index 154ec66c09..0077da5a8f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala +++ b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala @@ -19,18 +19,20 @@ trait EtaExpansion requires Analyzer { import global._ import posAssigner.atPos - /** Expand partial function applications of type `type'. - * + /**

+ * Expand partial function applications of type type. + * 

    *  p.f(es_1)...(es_n)
    *     ==>  {
-   *            private synthetic val eta$f    = p.f   // if p is not stable
+   *            private synthetic val eta$f   = p.f   // if p is not stable
+   *            ...
+   *            private synthetic val eta$e_i = e_i    // if e_i is not stable
    *            ...
-   *            private synthetic val eta$e_i = e_i    // if e_i is not stable
-   *             ...
-   *
    *            (ps_1 => ... => ps_m => eta$f([es_1])...([es_m])(ps_1)...(ps_m))
-   *          }
-   *  tree is already attributed
+   *          }
+ *

+ * tree is already attributed + *

*/ def etaExpand(tree: Tree): Tree = { val tpe = tree.tpe @@ -38,8 +40,8 @@ trait EtaExpansion requires Analyzer { def freshName() = { cnt = cnt + 1; newTermName("eta$" + cnt) } val defs = new ListBuffer[Tree] - /** Append to `defs' value definitions for all non-stable subexpressions - * of the function application tree + /** Append to defs value definitions for all non-stable + * subexpressions of the function application tree. * * @param tree ... * @return ... diff --git a/src/library/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala index c21520cffe..8e7a447df3 100644 --- a/src/library/scala/collection/immutable/Tree.scala +++ b/src/library/scala/collection/immutable/Tree.scala @@ -52,7 +52,7 @@ package scala.collection.immutable *

The tree consists of entries conatining a key with an order.

*

When instanciating the tree an order for the keys has to be * supplied.

- *
+ *
*
Direct Known Subclasses:
*
* TreeMap, -- cgit v1.2.3