summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-10-10 09:34:08 +0000
committermichelou <michelou@epfl.ch>2006-10-10 09:34:08 +0000
commitc012f9230600552b491b000f18252d0f832426be (patch)
treeb6ab2913469ba2c77b37cef7ee5a8b385ba90fe1 /src
parent7cd471c22306ba63836ab3b863a14e86d0813fd6 (diff)
downloadscala-c012f9230600552b491b000f18252d0f832426be.tar.gz
scala-c012f9230600552b491b000f18252d0f832426be.tar.bz2
scala-c012f9230600552b491b000f18252d0f832426be.zip
added svn:keywords to scala/actors/*.scala
Diffstat (limited to 'src')
-rw-r--r--src/actors/scala/actors/InputChannel.scala15
-rw-r--r--src/actors/scala/actors/OutputChannel.scala15
-rw-r--r--src/actors/scala/actors/Scheduler.scala16
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala22
-rw-r--r--src/library/scala/collection/immutable/Tree.scala2
5 files changed, 53 insertions, 17 deletions
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 <code>InputChannel</code> ...
+ *
+ * @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 <code>OutputChannel</code> ...
+ *
+ * @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 <code>Scheduler</code> object is used by
@@ -142,14 +142,18 @@ class SpareWorkerScheduler extends IScheduler {
}
}
-
+/**
+ * The class <code>TickedScheduler</code> ...
+ *
+ * @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 <code>WorkerThread</code> 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'.
- *
+ /** <p>
+ * Expand partial function applications of type <code>type</code>.
+ * </p><pre>
* p.f(es_1)...(es_n)
* ==> {
- * private synthetic val eta$f = p.f // if p is not stable
+ * <b>private synthetic val</b> eta$f = p.f // if p is not stable
+ * ...
+ * <b>private synthetic val</b> 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
+ * }</pre>
+ * <p>
+ * tree is already attributed
+ * </p>
*/
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 <code>tree</code>
+ /** Append to <code>defs</code> value definitions for all non-stable
+ * subexpressions of the function application <code>tree</code>.
*
* @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
* <p>The tree consists of entries conatining a key with an order.</p>
* <p>When instanciating the tree an order for the keys has to be
* supplied.</p>
- * <dl>
+ * <dl class="subclasses">
* <dt><b>Direct Known Subclasses:</b></dt>
* <dd>
* <a href="TreeMap.html" target="contentFrame">TreeMap</a>,