diff options
65 files changed, 324 insertions, 153 deletions
diff --git a/docs/examples/pilib/piNat.scala b/docs/examples/pilib/piNat.scala index 8f0b11e27e..ee9e5ba1af 100644 --- a/docs/examples/pilib/piNat.scala +++ b/docs/examples/pilib/piNat.scala @@ -1,38 +1,37 @@ package examples.pilib import scala.concurrent.pilib._ -//import pilib._; /** Church encoding of naturals in the Pi-calculus */ object piNat extends Application { /** Locations of Pi-calculus natural */ - class NatChan extends Chan[Triple[Chan[unit], Chan[NatChan], Chan[NatChan]]] + class NatChan extends Chan[Triple[Chan[Unit], Chan[NatChan], Chan[NatChan]]] /** Zero */ - def Z(l: NatChan): unit = choice ( + def Z(l: NatChan): Unit = choice ( l * { case Triple(z, sd, d) => z.write(()) } ) /** Successor of Double */ - def SD(n: NatChan, l: NatChan): unit = choice ( + def SD(n: NatChan, l: NatChan): Unit = choice ( l * { case Triple(z, sd, d) => sd.write(n) } ) /** Double */ - def D(n: NatChan, l: NatChan): unit = choice ( + def D(n: NatChan, l: NatChan): Unit = choice ( l * { case Triple(z, sd, d) => d.write(n) } ) /** Make "l" a location representing the natural "n" */ - def make(n: int, l: NatChan): unit = + def make(n: Int, l: NatChan): Unit = if (n == 0) Z(l) else if (n % 2 == 0) { val l1 = new NatChan; spawn < D(l1, l) >; make(n/2, l1) } else { val l1 = new NatChan; spawn < SD(l1, l) >; make(n/2, l1) } /** Consume the natural "m" and put it successor at location "n" */ - def Succ(m: NatChan, n: NatChan): unit = { - val z = new Chan[unit] + def Succ(m: NatChan, n: NatChan) { + val z = new Chan[Unit] val sd = new Chan[NatChan] val d = new Chan[NatChan] spawn < m.write(Triple(z, sd, d)) >; @@ -44,8 +43,8 @@ object piNat extends Application { } /** Consume the natural "l" and put two copies at locations "m" and "n" */ - def Copy(l: NatChan, m: NatChan, n: NatChan): unit = { - val z = new Chan[unit] + def Copy(l: NatChan, m: NatChan, n: NatChan) { + val z = new Chan[Unit] val sd = new Chan[NatChan] val d = new Chan[NatChan] spawn < l.write(Triple(z, sd, d)) >; @@ -61,8 +60,8 @@ object piNat extends Application { } /** Consume the natural at location "n" and return its value */ - def value(n: NatChan): int = { - val z = new Chan[unit] + def value(n: NatChan): Int = { + val z = new Chan[Unit] val sd = new Chan[NatChan] val d = new Chan[NatChan] spawn < n.write(Triple(z, sd, d)) >; @@ -84,7 +83,7 @@ object piNat extends Application { make(i, l) | Copy(l, l1, l2) | Succ(l2, l3) | - System.out.println("" + i + " = " + value(l1)) | - System.out.println("succ " + i + " = " + value(l3)) > + println("" + i + " = " + value(l1)) | + println("succ " + i + " = " + value(l3)) > } diff --git a/docs/examples/pilib/scheduler.scala b/docs/examples/pilib/scheduler.scala index 8946a5a0b2..9205ae3f0c 100644 --- a/docs/examples/pilib/scheduler.scala +++ b/docs/examples/pilib/scheduler.scala @@ -7,14 +7,14 @@ object scheduler { /** * Random number generator. */ - val random = new java.util.Random() + val random = new util.Random() //***************** Scheduler ******************// /** * A cell of the scheduler whose attached agent is allowed to start. */ - def A(a: Chan[unit], b: Chan[unit])(d: Chan[unit], c: Chan[unit]): unit = { + def A(a: Chan[Unit], b: Chan[Unit])(d: Chan[Unit], c: Chan[Unit]) { ///- ... complete here ... choice ( a * { x => C(a, b)(d, c) }) ///+ @@ -23,7 +23,7 @@ object scheduler { /** * A cell of the scheduler in another intermediate state. */ - def C(a: Chan[unit], b: Chan[unit])(d: Chan[unit], c: Chan[unit]): unit = { + def C(a: Chan[Unit], b: Chan[Unit])(d: Chan[Unit], c: Chan[Unit]) { ///- ... complete here ... choice (c * { x => B(a, b)(d, c) }) ///+ @@ -32,7 +32,7 @@ object scheduler { /** * A cell of the scheduler whose attached agent is allowed to finish. */ - def B(a: Chan[unit], b: Chan[unit])(d: Chan[unit], c: Chan[unit]): unit = { + def B(a: Chan[Unit], b: Chan[Unit])(d: Chan[Unit], c: Chan[Unit]) { ///- ... complete here ... // choice (b * { x => D(a, b)(d, c) }) // incorrect naive solution choice ( @@ -45,7 +45,7 @@ object scheduler { /** * A cell of the scheduler whose attached agent is not yet allowed to start. */ - def D(a: Chan[unit], b: Chan[unit])(d: Chan[unit], c: Chan[unit]): unit = { + def D(a: Chan[Unit], b: Chan[Unit])(d: Chan[Unit], c: Chan[Unit]) { ///- ... complete here ... choice (d(()) * A(a, b)(d, c)) ///+ @@ -53,16 +53,16 @@ object scheduler { //***************** Agents ******************// - def agent(i: Int)(a: Chan[unit], b: Chan[unit]): unit = { + def agent(i: Int)(a: Chan[Unit], b: Chan[Unit]) { // 50% chance that we sleep forever if (i == 0 && random.nextInt(10) < 5) { - a.attach(x => System.out.println("Start and sleeps ----> " + i)) + a.attach(x => println("Start and sleeps ----> " + i)) Thread.sleep(random.nextInt(1000)) a.write(()) } else { - a.attach(x => System.out.println("Start ----> " + i)) - b.attach(x => System.out.println("Stop -> " + i)) + a.attach(x => println("Start ----> " + i)) + b.attach(x => println("Stop -> " + i)) Thread.sleep(random.nextInt(1000)) a.write(()) Thread.sleep(random.nextInt(1000)) @@ -77,7 +77,7 @@ object scheduler { * Creates a scheduler for five agents (programs). */ - def main(args: Array[String]): unit = { + def main(args: Array[String]) { val agentNb = 5 val agents = List.range(0, agentNb) map agent scheduleAgents(agents) @@ -89,22 +89,22 @@ object scheduler { * A cell is modelled as a function that takes as parameters * input and output channels and which returns nothing. */ - type Cell = (Chan[unit], Chan[unit]) => unit + type Cell = (Chan[Unit], Chan[Unit]) => Unit /** * Creates a cell composed of two cells linked together. */ def join(cell1: Cell, cell2: Cell): Cell = - (l: Chan[unit], r: Chan[unit]) => { - val link = new Chan[unit]; + (l: Chan[Unit], r: Chan[Unit]) => { + val link = new Chan[Unit]; spawn < cell1(l, link) | cell2(link, r) > }; /** * Links the output of a cell to its input. */ - def close(cell: Cell): unit = { - val a = new Chan[unit] + def close(cell: Cell) { + val a = new Chan[Unit] cell(a, a) } @@ -117,25 +117,25 @@ object scheduler { /** * Creates a cell consisting of a chain of cells. */ - def makeRing(cells: List[Cell]): unit = + def makeRing(cells: List[Cell]): Unit = close(chain(cells)) /** * An agent is modelled as a function that takes as parameters channels to * signal that it has started or finished. */ - type Agent = (Chan[unit], Chan[unit]) => unit + type Agent = (Chan[Unit], Chan[Unit]) => Unit /** * Takes a list of agents and schedules them. */ - def scheduleAgents(agents: List[Agent]): unit = { + def scheduleAgents(agents: List[Agent]) { var firstAgent = true; val cells = agents map (ag => { - val a = new Chan[unit]; - val b = new Chan[unit]; + val a = new Chan[Unit]; + val b = new Chan[Unit]; spawn < ag(a, b) >; - (d: Chan[unit], c: Chan[unit]) => if (firstAgent) { + (d: Chan[Unit], c: Chan[Unit]) => if (firstAgent) { firstAgent = false; A(a, b)(d, c) } diff --git a/docs/examples/pilib/semaphore.scala b/docs/examples/pilib/semaphore.scala index 30e3c00975..ed224890e2 100644 --- a/docs/examples/pilib/semaphore.scala +++ b/docs/examples/pilib/semaphore.scala @@ -1,19 +1,19 @@ package examples.pilib +import scala.concurrent.pilib._ + /** Solution of exercise session 6 (first question). */ object semaphore { - import scala.concurrent.pilib._ - - class Signal extends Chan[unit] { + class Signal extends Chan[Unit] { def send = write(()) def receive = read } /** Interface. */ trait Semaphore { - def get: unit - def release: unit + def get: Unit + def release: Unit } /** First implementation. */ @@ -22,10 +22,10 @@ object semaphore { private val g = new Signal private val r = new Signal - def get: unit = g.send - def release: unit = r.send + def get: Unit = g.send + def release: Unit = r.send - private def Sched: unit = choice ( + private def Sched: Unit = choice ( g * (x => { r.receive; Sched }), r * (x => Sched) ) @@ -38,8 +38,8 @@ object semaphore { private val a = new Signal private val na = new Signal - def get: unit = { a.receive; spawn< na.send > } - def release: unit = choice ( + def get { a.receive; spawn< na.send > } + def release: Unit = choice ( a * (x => spawn< a.send >), na * (x => spawn< a.send >) ) @@ -47,24 +47,24 @@ object semaphore { } /** Test program. */ - def main(args: Array[String]): unit = { - val random = new java.util.Random() + def main(args: Array[String]) { + val random = new util.Random() val sem = new Sem2 - def mutex(p: => unit): unit = { sem.get; p; sem.release } + def mutex(p: => Unit) { sem.get; p; sem.release } spawn< { Thread.sleep(1 + random.nextInt(100)); mutex( { - System.out.println("a1"); + println("a1"); Thread.sleep(1 + random.nextInt(100)); - System.out.println("a2") + println("a2") } ) } | { Thread.sleep(1 + random.nextInt(100)); mutex( { - System.out.println("b1"); + println("b1"); Thread.sleep(1 + random.nextInt(100)); - System.out.println("b2") + println("b2") } ) } >; } diff --git a/docs/examples/pilib/twoPlaceBuffer.scala b/docs/examples/pilib/twoPlaceBuffer.scala index 020f3e4992..f0f278317a 100644 --- a/docs/examples/pilib/twoPlaceBuffer.scala +++ b/docs/examples/pilib/twoPlaceBuffer.scala @@ -8,18 +8,18 @@ object twoPlaceBuffer extends Application { /** * Specification. */ - def Spec[a](in: Chan[a], out: Chan[a]): Unit = { + def Spec[A](in: Chan[A], out: Chan[A]) { - def B0: unit = choice ( + def B0: Unit = choice ( in * (x => B1(x)) ) - def B1(x: a): unit = choice ( + def B1(x: A): Unit = choice ( out(x) * (B0), in * (y => B2(x, y)) ) - def B2(x: a, y: a): unit = choice ( + def B2(x: A, y: A): Unit = choice ( out(x) * (B1(y)) ) @@ -29,38 +29,38 @@ object twoPlaceBuffer extends Application { /** * Implementation using two one-place buffers. */ - def Impl[a](in: Chan[a], out: Chan[a]): unit = { + def Impl[A](in: Chan[A], out: Chan[A]) { ///- ... complete here ... // one-place buffer - def OnePlaceBuffer[a](in: Chan[a], out: Chan[a]): Unit = { - def B0: unit = choice ( in * (x => B1(x)) ) - def B1(x: a): unit = choice ( out(x) * (B0)) + def OnePlaceBuffer[A](in: Chan[A], out: Chan[A]) { + def B0: Unit = choice ( in * (x => B1(x)) ) + def B1(x: A): Unit = choice ( out(x) * (B0)) B0 } - val hidden = new Chan[a] + val hidden = new Chan[A] spawn < OnePlaceBuffer(in, hidden) | OnePlaceBuffer(hidden, out) > ///+ } - val random = new java.util.Random() + val random = new util.Random() - def Producer(n: Int, in: Chan[String]): Unit = { + def Producer(n: Int, in: Chan[String]) { Thread.sleep(random.nextInt(1000)) val msg = "" + n choice (in(msg) * {}) Producer(n + 1, in) } - def Consumer(out: Chan[String]): unit = { - Thread.sleep(random.nextInt(1000)); - choice (out * { msg => () }); + def Consumer(out: Chan[String]) { + Thread.sleep(random.nextInt(1000)) + choice (out * { msg => () }) Consumer(out) } val in = new Chan[String] - in.attach(s => System.out.println("put " + s)) + in.attach(s => println("put " + s)) val out = new Chan[String] - out.attach(s => System.out.println("get " + s)) + out.attach(s => println("get " + s)) //spawn < Producer(0, in) | Consumer(out) | Spec(in, out) > spawn < Producer(0, in) | Consumer(out) | Impl(in, out) > diff --git a/src/library/scala/collection/generic/Addable.scala b/src/library/scala/collection/generic/Addable.scala index 7b2fbdc487..f27dc8e257 100644 --- a/src/library/scala/collection/generic/Addable.scala +++ b/src/library/scala/collection/generic/Addable.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/AddingBuilder.scala b/src/library/scala/collection/generic/AddingBuilder.scala index da35889432..7963836922 100644 --- a/src/library/scala/collection/generic/AddingBuilder.scala +++ b/src/library/scala/collection/generic/AddingBuilder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index 479a857ee7..acbfc0fd0b 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -5,7 +5,7 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: Traversable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic trait BitSetFactory[Coll <: BitSet with BitSetTemplate[Coll]] { diff --git a/src/library/scala/collection/generic/BitSetTemplate.scala b/src/library/scala/collection/generic/BitSetTemplate.scala index 66b279cf37..66c8b27972 100644 --- a/src/library/scala/collection/generic/BitSetTemplate.scala +++ b/src/library/scala/collection/generic/BitSetTemplate.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic import BitSetTemplate._ diff --git a/src/library/scala/collection/generic/BufferTemplate.scala b/src/library/scala/collection/generic/BufferTemplate.scala index 65c6631fbd..ca14d586e6 100644 --- a/src/library/scala/collection/generic/BufferTemplate.scala +++ b/src/library/scala/collection/generic/BufferTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Buffer.scala 15799 2008-08-15 18:23:54Z odersky $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Builder.scala b/src/library/scala/collection/generic/Builder.scala index d88e3dd755..974018ce26 100644 --- a/src/library/scala/collection/generic/Builder.scala +++ b/src/library/scala/collection/generic/Builder.scala @@ -6,14 +6,14 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic /** The base trait of all builders. - * A builder lets one construct a collection incrementally, by adding elements - * to the builder with += and then converting to the required collection type with - * `result`. + * A builder lets one construct a collection incrementally, by adding + * elements to the builder with += and then converting to the required + * collection type with `result`. */ trait Builder[-Elem, +To] extends Growable[Elem] { @@ -26,7 +26,8 @@ trait Builder[-Elem, +To] extends Growable[Elem] { */ def clear() - /** Returns collection resulting from this builder. The buffer's contents are undefined afterwards. + /** Returns collection resulting from this builder. The buffer's contents + * are undefined afterwards. */ def result(): To @@ -35,8 +36,8 @@ trait Builder[-Elem, +To] extends Growable[Elem] { */ def sizeHint(size: Int) {} - /** Create a new builder which is the same as the current builder except that - * a given function is applied to the current builder's result. + /** Create a new builder which is the same as the current builder except + * that a given function is applied to the current builder's result. * @param f the function to apply to the builder's result */ def mapResult[NewTo](f: To => NewTo): Builder[Elem, NewTo] = diff --git a/src/library/scala/collection/generic/BuilderFactory.scala b/src/library/scala/collection/generic/BuilderFactory.scala index 2d2bf01f30..2834b38951 100644 --- a/src/library/scala/collection/generic/BuilderFactory.scala +++ b/src/library/scala/collection/generic/BuilderFactory.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Cloneable.scala b/src/library/scala/collection/generic/Cloneable.scala index 4c3cf13df5..9b84df0e2b 100644 --- a/src/library/scala/collection/generic/Cloneable.scala +++ b/src/library/scala/collection/generic/Cloneable.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: CloneableCollection.scala 16893 2009-01-13 13:09:22Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Companion.scala b/src/library/scala/collection/generic/Companion.scala index 21bd6ece3e..3ab7a4fa06 100644 --- a/src/library/scala/collection/generic/Companion.scala +++ b/src/library/scala/collection/generic/Companion.scala @@ -5,7 +5,10 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: Traversable.scala 15188 2008-05-24 15:01:02Z stepancheg $ + +// $Id$ + + package scala.collection.generic abstract class Companion[+CC[X] <: Traversable[X]] { @@ -14,7 +17,7 @@ abstract class Companion[+CC[X] <: Traversable[X]] { def newBuilder[A]: Builder[A, CC[A]] /** The empty iterable of type CC */ - def empty[A]: CC[A] = newBuilder[A].result + def empty[A]: CC[A] = newBuilder[A].result /** Creates an iterable of type CC with specified elements */ def apply[A](args: A*): CC[A] = { diff --git a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala index c86717f517..14686cdb90 100644 --- a/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala +++ b/src/library/scala/collection/generic/DoubleLinkedListTemplate.scala @@ -1,12 +1,12 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: DoubleLinkedList.scala 16893 2009-01-13 13:09:22Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index fdba3cbfaa..bbef2b7f29 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/ImmutableMapFactory.scala b/src/library/scala/collection/generic/ImmutableMapFactory.scala index 2472472eb8..f401f86603 100644 --- a/src/library/scala/collection/generic/ImmutableMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableMapFactory.scala @@ -1,6 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + package scala.collection.generic -/** A template for companion objects of immutable.Map and subclasses thereof. +/** A template for companion objects of <code>immutable.Map</code> and + * subclasses thereof. */ abstract class ImmutableMapFactory[CC[A, +B] <: immutable.Map[A, B] with ImmutableMapTemplate[A, B, CC[A, B]]] extends MapFactory[CC] { diff --git a/src/library/scala/collection/generic/ImmutableMapTemplate.scala b/src/library/scala/collection/generic/ImmutableMapTemplate.scala index 7a8c79ca41..d41571dcfc 100644 --- a/src/library/scala/collection/generic/ImmutableMapTemplate.scala +++ b/src/library/scala/collection/generic/ImmutableMapTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Map.scala 16884 2009-01-09 16:52:09Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index 1662abd901..1e36149f83 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of immutable.Map and subclasses thereof. diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 94284b505e..9d09e35132 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of mutable.Map and subclasses thereof. diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index 5593f1a4f5..a46e05ee70 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: IterableProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/IterableProxyTemplate.scala b/src/library/scala/collection/generic/IterableProxyTemplate.scala index 15a0b19f05..74911ec113 100644 --- a/src/library/scala/collection/generic/IterableProxyTemplate.scala +++ b/src/library/scala/collection/generic/IterableProxyTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: IterableProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala index fa7a2529fc..466fd32e9a 100644 --- a/src/library/scala/collection/generic/IterableTemplate.scala +++ b/src/library/scala/collection/generic/IterableTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/IterableView.scala b/src/library/scala/collection/generic/IterableView.scala index 18ca7b2494..841a19f49c 100644 --- a/src/library/scala/collection/generic/IterableView.scala +++ b/src/library/scala/collection/generic/IterableView.scala @@ -5,9 +5,12 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.collection.generic -import Math.MAX_INT import TraversableView.NoBuilder /** A base class for views of Iterables. diff --git a/src/library/scala/collection/generic/IterableViewTemplate.scala b/src/library/scala/collection/generic/IterableViewTemplate.scala index 950f8bb52a..9f6e703ff8 100644 --- a/src/library/scala/collection/generic/IterableViewTemplate.scala +++ b/src/library/scala/collection/generic/IterableViewTemplate.scala @@ -5,9 +5,12 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.collection.generic -import Math.MAX_INT import TraversableView.NoBuilder /** A base class for views of Iterables. diff --git a/src/library/scala/collection/generic/LazyBuilder.scala b/src/library/scala/collection/generic/LazyBuilder.scala index 9262a19169..8210225198 100644 --- a/src/library/scala/collection/generic/LazyBuilder.scala +++ b/src/library/scala/collection/generic/LazyBuilder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/LinearSequenceTemplate.scala b/src/library/scala/collection/generic/LinearSequenceTemplate.scala index 06dd14264f..285170f63d 100644 --- a/src/library/scala/collection/generic/LinearSequenceTemplate.scala +++ b/src/library/scala/collection/generic/LinearSequenceTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic @@ -19,8 +19,8 @@ import util.control.Breaks._ /** Class <code>Linear[A]</code> represents linear sequences of elements. * For such sequences `isEmpty`, `head` and `tail` are guaranteed to be * efficient constant time (or near so) operations. - * It does not add any methods to Sequence but overrides several - * methods with optimized implementations. + * It does not add any methods to <code>Sequence</code> but overrides + * several methods with optimized implementations. * * @author Martin Odersky * @author Matthias Zenger diff --git a/src/library/scala/collection/generic/LinkedListTemplate.scala b/src/library/scala/collection/generic/LinkedListTemplate.scala index e3de5031a9..62f33eeccb 100644 --- a/src/library/scala/collection/generic/LinkedListTemplate.scala +++ b/src/library/scala/collection/generic/LinkedListTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: SingleLinkedList.scala 16893 2009-01-13 13:09:22Z cunei $ +// $Id$ package scala.collection.generic @@ -79,7 +79,7 @@ trait LinkedListTemplate[A, This >: Null <: Sequence[A] with LinkedListTemplate[ } } - override def foreach[B](f: A => B): Unit = { + override def foreach[B](f: A => B) { var these = this while (these ne null) { f(these.elem); diff --git a/src/library/scala/collection/generic/MapBuilder.scala b/src/library/scala/collection/generic/MapBuilder.scala index 4f54447620..9d2249fc21 100644 --- a/src/library/scala/collection/generic/MapBuilder.scala +++ b/src/library/scala/collection/generic/MapBuilder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MapFactory.scala b/src/library/scala/collection/generic/MapFactory.scala index 067f22dbf1..32916933ac 100644 --- a/src/library/scala/collection/generic/MapFactory.scala +++ b/src/library/scala/collection/generic/MapFactory.scala @@ -1,6 +1,18 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic -/** A template for companion objects of mutable.Map and subclasses thereof. +/** A template for companion objects of <code>mutable.Map</code> and + * subclasses thereof. */ abstract class MapFactory[CC[A, B] <: Map[A, B] with MapTemplate[A, B, CC[A, B]]] { diff --git a/src/library/scala/collection/generic/MapTemplate.scala b/src/library/scala/collection/generic/MapTemplate.scala index 96fd1018f5..64a93aba07 100644 --- a/src/library/scala/collection/generic/MapTemplate.scala +++ b/src/library/scala/collection/generic/MapTemplate.scala @@ -6,26 +6,26 @@ ** |/ ** \* */ -// $Id: Map.scala 16884 2009-01-09 16:52:09Z cunei $ +// $Id$ package scala.collection.generic /** A generic template for maps from keys of type A to values of type B. - * To implement a concrete map, you need to provide implementations of the following methods: - * (where `This` is the type of the map in question): + * To implement a concrete map, you need to provide implementations of the + * following methods (where `This` is the type of the map in question):<pre> * * def get(key: A): Option[B] * def iterator: Iterator[(A, B)] * def + [B1 >: B](kv: (A, B1)): This - * def -(key: A): This + * def -(key: A): This</pre> * - * If you wish that methods like, take, drop, filter return the same kind of map, you should also - * override: + * If you wish that methods like, take, drop, filter return the same kind of + * map, you should also override:<pre> * - * def empty: This + * def empty: This</pre> * - * It is also good idea to override methods foreach and size for efficiency. + * It is also good idea to override methods foreach and size for efficiency. */ trait MapTemplate[A, +B, +This <: MapTemplate[A, B, This] with Map[A, B]] extends PartialFunction[A, B] diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index 7e33fc091f..c3ef54efcb 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of mutable.Map and subclasses thereof. diff --git a/src/library/scala/collection/generic/MutableMapTemplate.scala b/src/library/scala/collection/generic/MutableMapTemplate.scala index 8ca38afbe9..c5a4566e69 100644 --- a/src/library/scala/collection/generic/MutableMapTemplate.scala +++ b/src/library/scala/collection/generic/MutableMapTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Map.scala 16884 2009-01-09 16:52:09Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MutableMapTemplateBase.scala b/src/library/scala/collection/generic/MutableMapTemplateBase.scala index 2c5f39f76c..5486372f28 100755 --- a/src/library/scala/collection/generic/MutableMapTemplateBase.scala +++ b/src/library/scala/collection/generic/MutableMapTemplateBase.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Map.scala 16884 2009-01-09 16:52:09Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MutableSetTemplate.scala b/src/library/scala/collection/generic/MutableSetTemplate.scala index a266d7680d..f387b52de2 100644 --- a/src/library/scala/collection/generic/MutableSetTemplate.scala +++ b/src/library/scala/collection/generic/MutableSetTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Map.scala 16884 2009-01-09 16:52:09Z cunei $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MutableVectorTemplate.scala b/src/library/scala/collection/generic/MutableVectorTemplate.scala index a0cdfb0765..2067fb99c2 100644 --- a/src/library/scala/collection/generic/MutableVectorTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorTemplate.scala @@ -5,6 +5,10 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.collection.generic /** A subtrait of collection.Vector which represents sequences diff --git a/src/library/scala/collection/generic/MutableVectorView.scala b/src/library/scala/collection/generic/MutableVectorView.scala index ba91e9152c..3d8fab6dec 100644 --- a/src/library/scala/collection/generic/MutableVectorView.scala +++ b/src/library/scala/collection/generic/MutableVectorView.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala index e612111e8c..15bee72db3 100644 --- a/src/library/scala/collection/generic/MutableVectorViewTemplate.scala +++ b/src/library/scala/collection/generic/MutableVectorViewTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SequenceFactory.scala b/src/library/scala/collection/generic/SequenceFactory.scala index 3a2979dd70..3fcfe870cd 100644 --- a/src/library/scala/collection/generic/SequenceFactory.scala +++ b/src/library/scala/collection/generic/SequenceFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of Sequence and subclasses thereof. diff --git a/src/library/scala/collection/generic/SequenceForwarder.scala b/src/library/scala/collection/generic/SequenceForwarder.scala index 354509da13..40bc212718 100644 --- a/src/library/scala/collection/generic/SequenceForwarder.scala +++ b/src/library/scala/collection/generic/SequenceForwarder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: SeqProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SequenceProxyTemplate.scala b/src/library/scala/collection/generic/SequenceProxyTemplate.scala index f6fed763b5..753f6ba31d 100644 --- a/src/library/scala/collection/generic/SequenceProxyTemplate.scala +++ b/src/library/scala/collection/generic/SequenceProxyTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: IterableProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SequenceTemplate.scala b/src/library/scala/collection/generic/SequenceTemplate.scala index ade5f45dad..8e54e399eb 100644 --- a/src/library/scala/collection/generic/SequenceTemplate.scala +++ b/src/library/scala/collection/generic/SequenceTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic @@ -52,7 +52,7 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] * is O(length min len) instead of O(length). The method should be overwritten * if computing length is cheap. */ - def lengthCompare(len: Int): Int = { + def lengthCompare(len: Int): Int = { var i = 0 breakable { for (_ <- this) { @@ -181,7 +181,8 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] } /** Returns index of the first element satisying a predicate, or -1. */ - @deprecated("Use `indexWhere' instead") def findIndexOf(p: A => Boolean): Int = indexWhere(p) + @deprecated("Use `indexWhere' instead") + def findIndexOf(p: A => Boolean): Int = indexWhere(p) /** Returns the index of the first occurence of the specified * object in this iterable object. @@ -265,7 +266,8 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] */ def reverseIterator: Iterator[A] = reverse.iterator - @deprecated("use `reverseIterator' instead") def reversedElements = reverseIterator + @deprecated("use `reverseIterator' instead") + def reversedElements = reverseIterator /** * Checks whether the argument sequence is contained at the @@ -517,6 +519,7 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]] * <code>map</code>, and <code>flatMap</code> methods that build projections * of the collection. */ - @deprecated("use `view' instead") override def projection = view + @deprecated("use `view' instead") + override def projection = view } diff --git a/src/library/scala/collection/generic/SequenceView.scala b/src/library/scala/collection/generic/SequenceView.scala index f9c26093cf..25b015dd86 100644 --- a/src/library/scala/collection/generic/SequenceView.scala +++ b/src/library/scala/collection/generic/SequenceView.scala @@ -6,12 +6,11 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic -import Sequence.fill import TraversableView.NoBuilder /** A non-strict projection of an iterable. diff --git a/src/library/scala/collection/generic/SequenceViewTemplate.scala b/src/library/scala/collection/generic/SequenceViewTemplate.scala index b11696ebaf..cd67b81d26 100644 --- a/src/library/scala/collection/generic/SequenceViewTemplate.scala +++ b/src/library/scala/collection/generic/SequenceViewTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SetBuilder.scala b/src/library/scala/collection/generic/SetBuilder.scala index 73882781f4..1c4d3a18d9 100644 --- a/src/library/scala/collection/generic/SetBuilder.scala +++ b/src/library/scala/collection/generic/SetBuilder.scala @@ -6,14 +6,14 @@ ** |/ ** \* */ -// $Id: ListBuffer.scala 14378 2008-03-13 11:39:05Z dragos $ +// $Id$ package scala.collection.generic // import collection.immutable.{List, Nil, ::} -/** The canonical builder for collections that are addable, i.e. that support an efficient + method - * which adds an element to the collection. +/** The canonical builder for collections that are addable, i.e. that support + * an efficient + method which adds an element to the collection. * Collections are built from their empty element using this + method. * @param empty The empty element of the collection. */ diff --git a/src/library/scala/collection/generic/SetClass.scala b/src/library/scala/collection/generic/SetClass.scala index 0b38b7c91e..41b4477811 100644 --- a/src/library/scala/collection/generic/SetClass.scala +++ b/src/library/scala/collection/generic/SetClass.scala @@ -5,7 +5,10 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: Traversable.scala 15188 2008-05-24 15:01:02Z stepancheg $ + +// $Id$ + + package scala.collection.generic trait SetClass[A, +CC[X] <: Set[X]] extends TraversableClass[A, CC] { diff --git a/src/library/scala/collection/generic/SetFactory.scala b/src/library/scala/collection/generic/SetFactory.scala index 72774e659b..aeaf5edc2c 100644 --- a/src/library/scala/collection/generic/SetFactory.scala +++ b/src/library/scala/collection/generic/SetFactory.scala @@ -1,6 +1,18 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic -/** A template for companion objects of Map and subclasses thereof. +/** A template for companion objects of <code>Map</code> and subclasses + * thereof. */ abstract class SetFactory[CC[X] <: Set[X] with SetTemplate[X, CC[X]]] extends Companion[CC] { diff --git a/src/library/scala/collection/generic/SetTemplate.scala b/src/library/scala/collection/generic/SetTemplate.scala index 61b34108c5..e5a479454d 100644 --- a/src/library/scala/collection/generic/SetTemplate.scala +++ b/src/library/scala/collection/generic/SetTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index c47ad2235b..342e724e80 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index 5e9c8b070d..fb26919424 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sorted.scala 17537 2009-04-20 18:37:37Z odersky $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SortedMapFactory.scala b/src/library/scala/collection/generic/SortedMapFactory.scala index 938ce145f9..3c1355ac99 100644 --- a/src/library/scala/collection/generic/SortedMapFactory.scala +++ b/src/library/scala/collection/generic/SortedMapFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of mutable.Map and subclasses thereof. diff --git a/src/library/scala/collection/generic/SortedMapTemplate.scala b/src/library/scala/collection/generic/SortedMapTemplate.scala index 03b0c983de..7dd6fae30e 100644 --- a/src/library/scala/collection/generic/SortedMapTemplate.scala +++ b/src/library/scala/collection/generic/SortedMapTemplate.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2006-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: SortedMap.scala 16893 2009-01-13 13:09:22Z cunei $ +// $Id$ + + package scala.collection.generic /** A template for maps whose keys are sorted. diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index 3fdcea64fb..b113528653 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2006-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.collection.generic /** A template for companion objects of Set and subclasses thereof. diff --git a/src/library/scala/collection/generic/SortedSetTemplate.scala b/src/library/scala/collection/generic/SortedSetTemplate.scala index 4c1b5a9721..f7da860e25 100644 --- a/src/library/scala/collection/generic/SortedSetTemplate.scala +++ b/src/library/scala/collection/generic/SortedSetTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: SortedSet.scala 16893 2009-01-13 13:09:22Z cunei $ +// $Id$ // !!! todo: integrate in new collections library package scala.collection.generic diff --git a/src/library/scala/collection/generic/Subtractable.scala b/src/library/scala/collection/generic/Subtractable.scala index 8a0f3798c9..4b411d768d 100644 --- a/src/library/scala/collection/generic/Subtractable.scala +++ b/src/library/scala/collection/generic/Subtractable.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/TraversableClass.scala b/src/library/scala/collection/generic/TraversableClass.scala index e887bfc9b8..c107bddd0d 100644 --- a/src/library/scala/collection/generic/TraversableClass.scala +++ b/src/library/scala/collection/generic/TraversableClass.scala @@ -5,7 +5,10 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $Id: Traversable.scala 15188 2008-05-24 15:01:02Z stepancheg $ + +// $Id$ + + package scala.collection.generic trait TraversableClass[+A, +CC[X] <: Traversable[X]] { diff --git a/src/library/scala/collection/generic/TraversableFactory.scala b/src/library/scala/collection/generic/TraversableFactory.scala index 644af4595e..4b783370bd 100644 --- a/src/library/scala/collection/generic/TraversableFactory.scala +++ b/src/library/scala/collection/generic/TraversableFactory.scala @@ -1,4 +1,15 @@ - package scala.collection.generic +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2006-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.collection.generic /** A template for companion objects of Traversable and subclasses thereof. */ diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index 7ed718edcd..1ec60da2a3 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: IterableProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/TraversableProxyTemplate.scala b/src/library/scala/collection/generic/TraversableProxyTemplate.scala index ab358cbe66..dd32c685aa 100644 --- a/src/library/scala/collection/generic/TraversableProxyTemplate.scala +++ b/src/library/scala/collection/generic/TraversableProxyTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: IterableProxy.scala 15458 2008-06-28 20:23:22Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala index f7b6dcc740..64017b06aa 100644 --- a/src/library/scala/collection/generic/TraversableTemplate.scala +++ b/src/library/scala/collection/generic/TraversableTemplate.scala @@ -6,17 +6,20 @@ ** |/ ** \* */ -// $Id: Traversable.scala 15188 2008-05-24 15:01:02Z stepancheg $ +// $Id$ + + package scala.collection.generic // import immutable.{List, Stream, Nil} //!!! import mutable.{Buffer, ArrayBuffer, ListBuffer} /** A template trait for traversable collections. - * This is a base trait of all kinds of Scala collections. It implements the - * behavior common to all collections, in terms of a method `foreach` with signature: + * This is a base trait of all kinds of Scala collections. It implements + * the behavior common to all collections, in terms of a method + * <code>foreach</code> with signature:<pre> * - * def foreach[U](f: Elem => U): Unit + * def foreach[U](f: Elem => U): Unit</pre> * * Collection classes mixing in this trait provide a concrete * <code>foreach</code> method which traverses all the diff --git a/src/library/scala/collection/generic/TraversableView.scala b/src/library/scala/collection/generic/TraversableView.scala index 3c2efdc92f..282ff0fdc0 100644 --- a/src/library/scala/collection/generic/TraversableView.scala +++ b/src/library/scala/collection/generic/TraversableView.scala @@ -5,13 +5,17 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.collection.generic -import Math.MAX_INT import TraversableView.NoBuilder /** A base class for views of Traversable. * Every subclass has to implenment the foreach method + * * @author Martin Odersky * @version 2.8 */ diff --git a/src/library/scala/collection/generic/TraversableViewTemplate.scala b/src/library/scala/collection/generic/TraversableViewTemplate.scala index 29fa718ae5..49c49e513e 100644 --- a/src/library/scala/collection/generic/TraversableViewTemplate.scala +++ b/src/library/scala/collection/generic/TraversableViewTemplate.scala @@ -5,13 +5,18 @@ ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.collection.generic import Math.MAX_INT import TraversableView.NoBuilder -/** A base class for views of Traversable. +/** A base class for views of <code>Traversable</code>. * Every subclass has to implenment the foreach method + * * @author Martin Odersky * @version 2.8 */ diff --git a/src/library/scala/collection/generic/VectorTemplate.scala b/src/library/scala/collection/generic/VectorTemplate.scala index 549485ed40..a656072ed2 100644 --- a/src/library/scala/collection/generic/VectorTemplate.scala +++ b/src/library/scala/collection/generic/VectorTemplate.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Vector.scala 15437 2008-06-25 16:22:45Z stepancheg $ +// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/VectorView.scala b/src/library/scala/collection/generic/VectorView.scala index 703a6a7496..41d2c98a19 100644 --- a/src/library/scala/collection/generic/VectorView.scala +++ b/src/library/scala/collection/generic/VectorView.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ +// $Id$ package scala.collection.generic @@ -14,6 +14,7 @@ package scala.collection.generic import TraversableView.NoBuilder /** A non-strict projection of an iterable. + * * @author Sean McDirmid * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/generic/VectorViewTemplate.scala b/src/library/scala/collection/generic/VectorViewTemplate.scala index a7f4c5991f..f25c4a949e 100644 --- a/src/library/scala/collection/generic/VectorViewTemplate.scala +++ b/src/library/scala/collection/generic/VectorViewTemplate.scala @@ -14,6 +14,7 @@ package scala.collection.generic import TraversableView.NoBuilder /** A non-strict projection of an iterable. + * * @author Sean McDirmid * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/util/control/Breaks.scala b/src/library/scala/util/control/Breaks.scala index a6d6686c72..3315140b6b 100755 --- a/src/library/scala/util/control/Breaks.scala +++ b/src/library/scala/util/control/Breaks.scala @@ -1,15 +1,26 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.control /** An object that can be used for the break control abstraction. - * Example usage: + * Example usage:<pre> * - * import Breaks.{break, breakable} + * <b>import</b> Breaks.{break, breakable} * * breakable { - * for (...) { - * if (...) break + * <b>for</b> (...) { + * <b>if</b> (...) break * } - * } + * }</pre> * */ class Breaks { |