diff options
| author | michelou <michelou@epfl.ch> | 2005-08-26 12:26:10 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-08-26 12:26:10 +0000 |
| commit | bc6f997f0a06bf2c8b2e05d34623474a7f91a986 (patch) | |
| tree | cd15ad469f2c57dfcef828ba17ca74b75472c82e | |
| parent | a33babfcf15b3022e3850e48a2731317dd4ee027 (diff) | |
| download | scala-bc6f997f0a06bf2c8b2e05d34623474a7f91a986.tar.gz scala-bc6f997f0a06bf2c8b2e05d34623474a7f91a986.tar.bz2 scala-bc6f997f0a06bf2c8b2e05d34623474a7f91a986.zip | |
- removed CR/LF (Windows) characters.
44 files changed, 162 insertions, 127 deletions
diff --git a/sources/examples/Parsers.scala b/sources/examples/Parsers.scala index 5697868d76..6ec3bdb398 100644 --- a/sources/examples/Parsers.scala +++ b/sources/examples/Parsers.scala @@ -31,14 +31,14 @@ abstract class Parsers { } } - def ||| (def p: Parser[a]) = new Parser[a] { + def ||| (p: => Parser[a]) = new Parser[a] { def apply(in: inputType): Result = Parser.this.apply(in) match { case None => p(in) case s => s } } - def &&& [b](def p: Parser[b]): Parser[b] = + def &&& [b](p: => Parser[b]): Parser[b] = for (val _ <- this; val x <- p) yield x; } @@ -98,11 +98,6 @@ abstract class TokenParsers extends Parsers { } } - - - - - abstract class CharParsers extends Parsers { def any: Parser[char]; def chr(ch: char) = @@ -110,4 +105,3 @@ abstract class CharParsers extends Parsers { def chr(p: char => boolean) = for (val c <- any; p(c)) yield c; } -abstract class diff --git a/sources/examples/expressions/expressions-current.scala b/sources/examples/expressions/expressions-current.scala index 0e6ab57f7b..91e5df02ae 100644 --- a/sources/examples/expressions/expressions-current.scala +++ b/sources/examples/expressions/expressions-current.scala @@ -64,3 +64,4 @@ object Main { e2.visit(new l2.Show2(sref)); } } + diff --git a/sources/examples/monads/errorInterpreter.scala b/sources/examples/monads/errorInterpreter.scala index d797f01a4d..05dc979621 100644 --- a/sources/examples/monads/errorInterpreter.scala +++ b/sources/examples/monads/errorInterpreter.scala @@ -83,3 +83,4 @@ object errorInterpreter { System.out.println(test(term1)); } } + diff --git a/sources/examples/monads/simpleInterpreter.scala b/sources/examples/monads/simpleInterpreter.scala index 07da5f40ab..d728c620cf 100644 --- a/sources/examples/monads/simpleInterpreter.scala +++ b/sources/examples/monads/simpleInterpreter.scala @@ -72,3 +72,4 @@ object simpleInterpreter { System.out.println(test(term1)); } } + diff --git a/sources/examples/monads/stateInterpreter.scala b/sources/examples/monads/stateInterpreter.scala index 0878f4682d..593f2d9e3e 100644 --- a/sources/examples/monads/stateInterpreter.scala +++ b/sources/examples/monads/stateInterpreter.scala @@ -83,3 +83,4 @@ object stateInterpreter { System.out.println(test(term1)); } } + diff --git a/sources/examples/oneplacebuffer.scala b/sources/examples/oneplacebuffer.scala index 9a7d1d714d..eb3b3be905 100644 --- a/sources/examples/oneplacebuffer.scala +++ b/sources/examples/oneplacebuffer.scala @@ -44,3 +44,4 @@ object oneplacebuffer { } } + diff --git a/sources/examples/parsers1.scala b/sources/examples/parsers1.scala index 2ed0f4be4b..143f354049 100644 --- a/sources/examples/parsers1.scala +++ b/sources/examples/parsers1.scala @@ -14,7 +14,7 @@ object parsers1 { /*** p &&& q applies first p, and if that succeeds, then q */ - def &&& (def q: Parser) = new Parser { + def &&& (q: => Parser) = new Parser { def apply(in: inputType): Result = Parser.this.apply(in) match { case None => None case Some(in1) => q(in1) @@ -23,7 +23,7 @@ object parsers1 { /*** p ||| q applies first p, and, if that fails, then q. */ - def ||| (def q: Parser) = new Parser { + def ||| (q: => Parser) = new Parser { def apply(in: inputType): Result = Parser.this.apply(in) match { case None => q(in) case s => s diff --git a/sources/examples/pilib/piNat.scala b/sources/examples/pilib/piNat.scala index 2d34f90100..137c0e5e6a 100644 --- a/sources/examples/pilib/piNat.scala +++ b/sources/examples/pilib/piNat.scala @@ -89,3 +89,4 @@ object piNat with Application { >; } + diff --git a/sources/scala/List.scala b/sources/scala/List.scala index b4f80ddaf3..5128d93c30 100644 --- a/sources/scala/List.scala +++ b/sources/scala/List.scala @@ -908,3 +908,4 @@ final case class ::[+b](hd: b, tl: List[b]) extends List[b] { def head: b = hd; def tail: List[b] = tl; } + diff --git a/sources/scala/collection/immutable/BitSet.scala b/sources/scala/collection/immutable/BitSet.scala index c66f3cddd9..0db31f621f 100644 --- a/sources/scala/collection/immutable/BitSet.scala +++ b/sources/scala/collection/immutable/BitSet.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/sources/scala/collection/immutable/ListMap.scala b/sources/scala/collection/immutable/ListMap.scala index 8192eda7fd..b6c9989531 100644 --- a/sources/scala/collection/immutable/ListMap.scala +++ b/sources/scala/collection/immutable/ListMap.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -147,3 +147,4 @@ class ListMap[A, B] extends AnyRef with Map[A, B] { (key.hashCode() ^ value.hashCode()) + ListMap.this.hashCode(); } } + diff --git a/sources/scala/collection/immutable/ListSet.scala b/sources/scala/collection/immutable/ListSet.scala index 0fa95a06ce..305e54cb90 100644 --- a/sources/scala/collection/immutable/ListSet.scala +++ b/sources/scala/collection/immutable/ListSet.scala @@ -1,12 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + package scala.collection.immutable; diff --git a/sources/scala/collection/immutable/Map.scala b/sources/scala/collection/immutable/Map.scala index 494ea843fa..b737f48886 100644 --- a/sources/scala/collection/immutable/Map.scala +++ b/sources/scala/collection/immutable/Map.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -141,3 +141,4 @@ trait Map[A, B] extends AnyRef with scala.collection.Map[A, B] { def ->(value: B) = update(key, value); } } + diff --git a/sources/scala/collection/immutable/Queue.scala b/sources/scala/collection/immutable/Queue.scala index ca6ca63171..4621b129d7 100644 --- a/sources/scala/collection/immutable/Queue.scala +++ b/sources/scala/collection/immutable/Queue.scala @@ -172,3 +172,4 @@ class Queue[+A](elem: A*) extends Seq[A] { } } + diff --git a/sources/scala/collection/immutable/Set.scala b/sources/scala/collection/immutable/Set.scala index 16735fcab9..af3340e8f1 100644 --- a/sources/scala/collection/immutable/Set.scala +++ b/sources/scala/collection/immutable/Set.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -78,3 +78,4 @@ trait Set[A] extends AnyRef with scala.collection.Set[A] { } } + diff --git a/sources/scala/collection/immutable/Tree.scala b/sources/scala/collection/immutable/Tree.scala index 8e304ffbd8..aeb21a29f9 100644 --- a/sources/scala/collection/immutable/Tree.scala +++ b/sources/scala/collection/immutable/Tree.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -374,3 +374,4 @@ private case class GBNode[A <% Ordered[A],B](key: A, override def hashCode() = value.hashCode() + smaller.hashCode() + bigger.hashCode(); } + diff --git a/sources/scala/collection/immutable/TreeMap.scala b/sources/scala/collection/immutable/TreeMap.scala index b686d0afd2..12814b7a41 100644 --- a/sources/scala/collection/immutable/TreeMap.scala +++ b/sources/scala/collection/immutable/TreeMap.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -104,3 +104,4 @@ class TreeMap[A <% Ordered[A], B] extends Tree[A, Pair[A, B]] with Map[A, B] wit } }; } + diff --git a/sources/scala/collection/immutable/TreeSet.scala b/sources/scala/collection/immutable/TreeSet.scala index 1945386946..bb3099e007 100644 --- a/sources/scala/collection/immutable/TreeSet.scala +++ b/sources/scala/collection/immutable/TreeSet.scala @@ -1,12 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + package scala.collection.immutable; diff --git a/sources/scala/mobile/Code.scala b/sources/scala/mobile/Code.scala index 18cba743eb..1ce9997a3d 100644 --- a/sources/scala/mobile/Code.scala +++ b/sources/scala/mobile/Code.scala @@ -1,12 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + package scala.mobile; import java.lang.reflect.Constructor; @@ -230,3 +231,4 @@ class Code(clazz: java.lang.Class) { } } + diff --git a/sources/scala/runtime/BoxedAnyArray.scala b/sources/scala/runtime/BoxedAnyArray.scala index 4c3e1ca1dc..07b2313ce9 100755 --- a/sources/scala/runtime/BoxedAnyArray.scala +++ b/sources/scala/runtime/BoxedAnyArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; /** Arrays created by new Array[T](length) where T is a type variable @@ -146,3 +149,4 @@ final class BoxedAnyArray(val length: Int) extends BoxedArray { override def hashCode(): Int = hash; } + diff --git a/sources/scala/runtime/BoxedArray.scala b/sources/scala/runtime/BoxedArray.scala index 5f5c9e2a18..29b4ccf0e2 100755 --- a/sources/scala/runtime/BoxedArray.scala +++ b/sources/scala/runtime/BoxedArray.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -43,5 +43,3 @@ abstract class BoxedArray extends PartialFunction[Int, Object] with Seq[Object] def next: Object = { val i = index; index = i + 1; apply(i) } } } - - diff --git a/sources/scala/runtime/BoxedBoolean.java b/sources/scala/runtime/BoxedBoolean.java index 9f0ed53f30..242cee0619 100755 --- a/sources/scala/runtime/BoxedBoolean.java +++ b/sources/scala/runtime/BoxedBoolean.java @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; public final class BoxedBoolean { @@ -34,5 +37,3 @@ public final class BoxedBoolean { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedBooleanArray.scala b/sources/scala/runtime/BoxedBooleanArray.scala index 7ebc328fbb..f87f46b828 100755 --- a/sources/scala/runtime/BoxedBooleanArray.scala +++ b/sources/scala/runtime/BoxedBooleanArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedBooleanArray(val value: Array[Boolean]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedBooleanArray(val value: Array[Boolean]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedByte.java b/sources/scala/runtime/BoxedByte.java index adbba56d30..a93f95bd21 100755 --- a/sources/scala/runtime/BoxedByte.java +++ b/sources/scala/runtime/BoxedByte.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -46,5 +46,3 @@ public final class BoxedByte extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedByteArray.scala b/sources/scala/runtime/BoxedByteArray.scala index 34b4f919b0..bc1f29324e 100755 --- a/sources/scala/runtime/BoxedByteArray.scala +++ b/sources/scala/runtime/BoxedByteArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedByteArray(val value: Array[Byte]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedByteArray(val value: Array[Byte]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedChar.java b/sources/scala/runtime/BoxedChar.java index b38f06fa32..647c9cdee6 100755 --- a/sources/scala/runtime/BoxedChar.java +++ b/sources/scala/runtime/BoxedChar.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -47,5 +47,3 @@ public class BoxedChar extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedCharArray.scala b/sources/scala/runtime/BoxedCharArray.scala index 2a09ca43d3..fd16baede2 100755 --- a/sources/scala/runtime/BoxedCharArray.scala +++ b/sources/scala/runtime/BoxedCharArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedCharArray(val value: Array[Char]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedCharArray(val value: Array[Char]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedDouble.java b/sources/scala/runtime/BoxedDouble.java index 23abdb4485..02a4f4b98e 100755 --- a/sources/scala/runtime/BoxedDouble.java +++ b/sources/scala/runtime/BoxedDouble.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -38,5 +38,3 @@ public class BoxedDouble extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedDoubleArray.scala b/sources/scala/runtime/BoxedDoubleArray.scala index d55ffc3d5a..cf961ec4a3 100755 --- a/sources/scala/runtime/BoxedDoubleArray.scala +++ b/sources/scala/runtime/BoxedDoubleArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedDoubleArray(val value: Array[Double]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedDoubleArray(val value: Array[Double]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedFloat.java b/sources/scala/runtime/BoxedFloat.java index 48ec9f8626..02b9648fef 100755 --- a/sources/scala/runtime/BoxedFloat.java +++ b/sources/scala/runtime/BoxedFloat.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -37,5 +37,3 @@ public class BoxedFloat extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedFloatArray.scala b/sources/scala/runtime/BoxedFloatArray.scala index 95ef72a799..3594b851ef 100755 --- a/sources/scala/runtime/BoxedFloatArray.scala +++ b/sources/scala/runtime/BoxedFloatArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedFloatArray(val value: Array[Float]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedFloatArray(val value: Array[Float]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedInt.java b/sources/scala/runtime/BoxedInt.java index ba7116d3a1..e31bb78391 100755 --- a/sources/scala/runtime/BoxedInt.java +++ b/sources/scala/runtime/BoxedInt.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -47,5 +47,3 @@ public final class BoxedInt extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedIntArray.scala b/sources/scala/runtime/BoxedIntArray.scala index fcb6598839..ac9aa517ec 100755 --- a/sources/scala/runtime/BoxedIntArray.scala +++ b/sources/scala/runtime/BoxedIntArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedIntArray(val value: Array[Int]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedIntArray(val value: Array[Int]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedLong.java b/sources/scala/runtime/BoxedLong.java index 203cb5dfad..1e6c7656e6 100755 --- a/sources/scala/runtime/BoxedLong.java +++ b/sources/scala/runtime/BoxedLong.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -38,5 +38,3 @@ public class BoxedLong extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedLongArray.scala b/sources/scala/runtime/BoxedLongArray.scala index 20f4de6183..63a6217b35 100755 --- a/sources/scala/runtime/BoxedLongArray.scala +++ b/sources/scala/runtime/BoxedLongArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedLongArray(val value: Array[Long]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedLongArray(val value: Array[Long]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedNumber.java b/sources/scala/runtime/BoxedNumber.java index 471d52516d..a21abab2db 100755 --- a/sources/scala/runtime/BoxedNumber.java +++ b/sources/scala/runtime/BoxedNumber.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/sources/scala/runtime/BoxedObjectArray.scala b/sources/scala/runtime/BoxedObjectArray.scala index 65efbde4ab..e86578a252 100755 --- a/sources/scala/runtime/BoxedObjectArray.scala +++ b/sources/scala/runtime/BoxedObjectArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedObjectArray(val value: Array[Object]) extends BoxedArray { @@ -23,5 +26,3 @@ final class BoxedObjectArray(val value: Array[Object]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - - diff --git a/sources/scala/runtime/BoxedShort.java b/sources/scala/runtime/BoxedShort.java index 367a82550d..05b9a1975a 100755 --- a/sources/scala/runtime/BoxedShort.java +++ b/sources/scala/runtime/BoxedShort.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -47,5 +47,3 @@ public final class BoxedShort extends BoxedNumber { return String.valueOf(value); } } - - diff --git a/sources/scala/runtime/BoxedShortArray.scala b/sources/scala/runtime/BoxedShortArray.scala index d25505610e..f77f0193c8 100755 --- a/sources/scala/runtime/BoxedShortArray.scala +++ b/sources/scala/runtime/BoxedShortArray.scala @@ -1,10 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + package scala.runtime; final class BoxedShortArray(val value: Array[Short]) extends BoxedArray { @@ -26,4 +29,3 @@ final class BoxedShortArray(val value: Array[Short]) extends BoxedArray { override def hashCode(): Int = value.hashCode(); } - diff --git a/sources/scala/runtime/BoxedUnit.java b/sources/scala/runtime/BoxedUnit.java index ea9ccd9640..fdc680a7de 100755 --- a/sources/scala/runtime/BoxedUnit.java +++ b/sources/scala/runtime/BoxedUnit.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -25,5 +25,3 @@ public final class BoxedUnit { return "()"; } } - - diff --git a/sources/scala/runtime/MetaAttribute.cs b/sources/scala/runtime/MetaAttribute.cs index 72a44dd8ff..8a272e4ae8 100644 --- a/sources/scala/runtime/MetaAttribute.cs +++ b/sources/scala/runtime/MetaAttribute.cs @@ -1,24 +1,34 @@ -using System;
+/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ -namespace scala.runtime
-{
- /// <summary>
- /// Stores additional meta-information about classes and members.
- /// Used to augment type information in classes from the scala
- /// library written in Java.
- /// </summary>
-
- [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Field
- | AttributeTargets.Constructor | AttributeTargets.Method,
- AllowMultiple = false, Inherited = false)]
- public class MetaAttribute : Attribute
- {
- // keeps a textual representation of the pico-style attributes
- // used in some classes of the runtime library
- public readonly string meta;
- public MetaAttribute(string meta)
- {
- this.meta = meta;
- }
- }
-}
\ No newline at end of file +// $Id$ + +using System; + +namespace scala.runtime +{ + /// <summary> + /// Stores additional meta-information about classes and members. + /// Used to augment type information in classes from the scala + /// library written in Java. + /// </summary> + + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Field + | AttributeTargets.Constructor | AttributeTargets.Method, + AllowMultiple = false, Inherited = false)] + public class MetaAttribute : Attribute + { + // keeps a textual representation of the pico-style attributes + // used in some classes of the runtime library + public readonly string meta; + public MetaAttribute(string meta) + { + this.meta = meta; + } + } +} diff --git a/sources/scala/runtime/RunTime.java b/sources/scala/runtime/RunTime.java index b5b8e98fb7..30b22819ec 100644 --- a/sources/scala/runtime/RunTime.java +++ b/sources/scala/runtime/RunTime.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/sources/scala/runtime/ScalaRunTime.scala b/sources/scala/runtime/ScalaRunTime.scala index d18a8c14ff..fbd205efd7 100644 --- a/sources/scala/runtime/ScalaRunTime.scala +++ b/sources/scala/runtime/ScalaRunTime.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/sources/scala/runtime/SymtabAttribute.cs b/sources/scala/runtime/SymtabAttribute.cs index 23fc8faabd..57ade32fa0 100644 --- a/sources/scala/runtime/SymtabAttribute.cs +++ b/sources/scala/runtime/SymtabAttribute.cs @@ -1,30 +1,40 @@ -using System;
+/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ -namespace scala.runtime
-{
- /// <summary>
- /// Stores the symbol table for every top-level Scala class.
- /// </summary>
-
- [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
- public class SymtabAttribute : Attribute
- {
- // stores scalac symbol table
- public readonly byte[] symtab;
-
- // indicates if the type should be considered by the compiler;
- // used for synthetic classes introduced by the Scala compiler
- public readonly bool shouldLoadClass;
-
- public SymtabAttribute(byte[] symtab)
- {
- this.symtab = symtab;
- this.shouldLoadClass = true;
- }
-
- public SymtabAttribute() {
- this.symtab = new byte[0];
- this.shouldLoadClass = false;
- }
- }
-}
+// $Id$ + +using System; + +namespace scala.runtime +{ + /// <summary> + /// Stores the symbol table for every top-level Scala class. + /// </summary> + + [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public class SymtabAttribute : Attribute + { + // stores scalac symbol table + public readonly byte[] symtab; + + // indicates if the type should be considered by the compiler; + // used for synthetic classes introduced by the Scala compiler + public readonly bool shouldLoadClass; + + public SymtabAttribute(byte[] symtab) + { + this.symtab = symtab; + this.shouldLoadClass = true; + } + + public SymtabAttribute() { + this.symtab = new byte[0]; + this.shouldLoadClass = false; + } + } +} |