diff options
Diffstat (limited to 'src/library')
526 files changed, 722 insertions, 1037 deletions
diff --git a/src/library/scala/Annotation.scala b/src/library/scala/Annotation.scala index 466983c481..8c75e15a79 100644 --- a/src/library/scala/Annotation.scala +++ b/src/library/scala/Annotation.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Application.scala b/src/library/scala/Application.scala index fdb122f5bf..efc64191ae 100644 --- a/src/library/scala/Application.scala +++ b/src/library/scala/Application.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index c9d929b88c..9712990d73 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Cell.scala b/src/library/scala/Cell.scala index e4fb77bd77..0e054d5a4f 100644 --- a/src/library/scala/Cell.scala +++ b/src/library/scala/Cell.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/ClassfileAnnotation.scala b/src/library/scala/ClassfileAnnotation.scala index c6a207da41..b762d71a97 100644 --- a/src/library/scala/ClassfileAnnotation.scala +++ b/src/library/scala/ClassfileAnnotation.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala index fc33fa07ef..0f2a76cbc5 100644 --- a/src/library/scala/Console.scala +++ b/src/library/scala/Console.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/CountedIterator.scala b/src/library/scala/CountedIterator.scala index 17899d53e8..3aff6f2f9b 100644 --- a/src/library/scala/CountedIterator.scala +++ b/src/library/scala/CountedIterator.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Either.scala b/src/library/scala/Either.scala index 8d9438b749..cbfbee1f35 100644 --- a/src/library/scala/Either.scala +++ b/src/library/scala/Either.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 3c8f5cf0bd..5d1a0997ed 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala @@ -231,7 +230,7 @@ abstract class Enumeration(initial: Int, names: String*) { thisenum => case that: thisenum.Value => compare(that) == 0 case _ => false } - override def hashCode: Int = id.hashCode + override def hashCode: Int = id.## /** this enumeration value as an <code>Int</code> bit mask. * @throws IllegalArgumentException if <code>id</code> is greater than 31 diff --git a/src/library/scala/Equals.scala b/src/library/scala/Equals.scala index e48d909804..2bb2c56834 100644 --- a/src/library/scala/Equals.scala +++ b/src/library/scala/Equals.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Function.scala b/src/library/scala/Function.scala index 6ef137aa2b..d2f79bb270 100644 --- a/src/library/scala/Function.scala +++ b/src/library/scala/Function.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Function0.scala b/src/library/scala/Function0.scala index a946c3ad13..c6f81064b6 100644 --- a/src/library/scala/Function0.scala +++ b/src/library/scala/Function0.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with fancy comment) diff --git a/src/library/scala/Function1.scala b/src/library/scala/Function1.scala index 418bb4bdbf..a6a6fa2828 100644 --- a/src/library/scala/Function1.scala +++ b/src/library/scala/Function1.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with fancy comment) (with extra methods) diff --git a/src/library/scala/Function10.scala b/src/library/scala/Function10.scala index 9435d65dd7..c009fb5c48 100644 --- a/src/library/scala/Function10.scala +++ b/src/library/scala/Function10.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function11.scala b/src/library/scala/Function11.scala index 1d0e3cd1e5..3c3c79db3a 100644 --- a/src/library/scala/Function11.scala +++ b/src/library/scala/Function11.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function12.scala b/src/library/scala/Function12.scala index 4ca33acdb0..3cb2d4bb6f 100644 --- a/src/library/scala/Function12.scala +++ b/src/library/scala/Function12.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function13.scala b/src/library/scala/Function13.scala index d128d396da..5ec61d86fc 100644 --- a/src/library/scala/Function13.scala +++ b/src/library/scala/Function13.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function14.scala b/src/library/scala/Function14.scala index d9adef9374..8624464f48 100644 --- a/src/library/scala/Function14.scala +++ b/src/library/scala/Function14.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function15.scala b/src/library/scala/Function15.scala index dbe1cf870a..beeaa0b55e 100644 --- a/src/library/scala/Function15.scala +++ b/src/library/scala/Function15.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function16.scala b/src/library/scala/Function16.scala index 72f8eff82b..43ffcee0f3 100644 --- a/src/library/scala/Function16.scala +++ b/src/library/scala/Function16.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function17.scala b/src/library/scala/Function17.scala index 523a35c70d..1bd5532f7d 100644 --- a/src/library/scala/Function17.scala +++ b/src/library/scala/Function17.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function18.scala b/src/library/scala/Function18.scala index df68bafee7..31641d9496 100644 --- a/src/library/scala/Function18.scala +++ b/src/library/scala/Function18.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function19.scala b/src/library/scala/Function19.scala index 609aeaa1fe..92d855666e 100644 --- a/src/library/scala/Function19.scala +++ b/src/library/scala/Function19.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function2.scala b/src/library/scala/Function2.scala index b8cbe19881..334cc530bc 100644 --- a/src/library/scala/Function2.scala +++ b/src/library/scala/Function2.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with fancy comment) (with extra methods) diff --git a/src/library/scala/Function20.scala b/src/library/scala/Function20.scala index f84649d4d5..f3ddc31474 100644 --- a/src/library/scala/Function20.scala +++ b/src/library/scala/Function20.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function21.scala b/src/library/scala/Function21.scala index ef8095aebd..dcb500732f 100644 --- a/src/library/scala/Function21.scala +++ b/src/library/scala/Function21.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function22.scala b/src/library/scala/Function22.scala index a3347e996f..9e3f3c9f8f 100644 --- a/src/library/scala/Function22.scala +++ b/src/library/scala/Function22.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function3.scala b/src/library/scala/Function3.scala index 5f1c289853..2afc6acd4c 100644 --- a/src/library/scala/Function3.scala +++ b/src/library/scala/Function3.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function4.scala b/src/library/scala/Function4.scala index 664b75fb40..c0708d8c06 100644 --- a/src/library/scala/Function4.scala +++ b/src/library/scala/Function4.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function5.scala b/src/library/scala/Function5.scala index 94aba5eb9c..0c318f6317 100644 --- a/src/library/scala/Function5.scala +++ b/src/library/scala/Function5.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function6.scala b/src/library/scala/Function6.scala index 297f3e074e..0e77fbd2ce 100644 --- a/src/library/scala/Function6.scala +++ b/src/library/scala/Function6.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function7.scala b/src/library/scala/Function7.scala index bc053f7838..4cfdf1962a 100644 --- a/src/library/scala/Function7.scala +++ b/src/library/scala/Function7.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function8.scala b/src/library/scala/Function8.scala index d645a8d695..92d7f217fd 100644 --- a/src/library/scala/Function8.scala +++ b/src/library/scala/Function8.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Function9.scala b/src/library/scala/Function9.scala index e220537708..0223ac57f7 100644 --- a/src/library/scala/Function9.scala +++ b/src/library/scala/Function9.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Immutable.scala b/src/library/scala/Immutable.scala index bc0a6100f6..56511df29a 100644 --- a/src/library/scala/Immutable.scala +++ b/src/library/scala/Immutable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/LowPriorityImplicits.scala b/src/library/scala/LowPriorityImplicits.scala index 899dbe27d7..6fdf977dd4 100644 --- a/src/library/scala/LowPriorityImplicits.scala +++ b/src/library/scala/LowPriorityImplicits.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala @@ -49,6 +48,7 @@ class LowPriorityImplicits { } /** Can go away after next newstarr */ + /** Caution - not yet. pos/t1459, pos/t2569, jvm/t1342 all fail without the next line. */ def wrapArray[T <: AnyRef](xs: Array[T]): WrappedArray[T] = new WrappedArray.ofRef[T](xs) def wrapArray(xs: Array[Int]): WrappedArray[Int] = new WrappedArray.ofInt(xs) def wrapArray(xs: Array[Double]): WrappedArray[Double] = new WrappedArray.ofDouble(xs) diff --git a/src/library/scala/MatchError.scala b/src/library/scala/MatchError.scala index da065686f3..31783da4d3 100644 --- a/src/library/scala/MatchError.scala +++ b/src/library/scala/MatchError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Math.scala b/src/library/scala/Math.scala index 3c11958053..69a3985871 100644 --- a/src/library/scala/Math.scala +++ b/src/library/scala/Math.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/MathCommon.scala b/src/library/scala/MathCommon.scala index 9b4727b7c7..a72fc0e4ee 100644 --- a/src/library/scala/MathCommon.scala +++ b/src/library/scala/MathCommon.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Mutable.scala b/src/library/scala/Mutable.scala index be46764f0f..92db95261f 100644 --- a/src/library/scala/Mutable.scala +++ b/src/library/scala/Mutable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/NotDefinedError.scala b/src/library/scala/NotDefinedError.scala index a47613fb9a..3694f28c02 100644 --- a/src/library/scala/NotDefinedError.scala +++ b/src/library/scala/NotDefinedError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/NotNull.scala b/src/library/scala/NotNull.scala index d5f14459ff..8e4a29f06e 100644 --- a/src/library/scala/NotNull.scala +++ b/src/library/scala/NotNull.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala index f2da220775..8992024353 100644 --- a/src/library/scala/Option.scala +++ b/src/library/scala/Option.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/PartialFunction.scala b/src/library/scala/PartialFunction.scala index f450596e57..41c2ac70e7 100644 --- a/src/library/scala/PartialFunction.scala +++ b/src/library/scala/PartialFunction.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 2037705bab..502fe4a935 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Product.scala b/src/library/scala/Product.scala index a0503cfe4c..b7dd6cf728 100644 --- a/src/library/scala/Product.scala +++ b/src/library/scala/Product.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala @@ -29,21 +28,6 @@ trait Product extends Equals { */ def productElement(n: Int): Any - // !!! This will be disabled pending reimplementation, but it can't be removed - // until starr forgets about it. - - /** Returns the name of the field at the given index from the definition - * of the class. - * - * @param n the index of the element name to return - * @throws NoSuchElementException if the name data is unavailable for any reason - * @throws IndexOutOfBoundsException if the index is out of range - * @return a String representing the field name - */ - def productElementName(n: Int): String = - // the method implementation is synthetic - if it is not generated we always throw. - throw new NoSuchElementException() - /** return k for a product <code>A(x_1,...,x_k)</code> */ def productArity: Int diff --git a/src/library/scala/Product1.scala b/src/library/scala/Product1.scala index 2e57b85104..f90d720c33 100644 --- a/src/library/scala/Product1.scala +++ b/src/library/scala/Product1.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product10.scala b/src/library/scala/Product10.scala index 7452e242ea..3cdcaf190c 100644 --- a/src/library/scala/Product10.scala +++ b/src/library/scala/Product10.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product11.scala b/src/library/scala/Product11.scala index e105393934..20004258dc 100644 --- a/src/library/scala/Product11.scala +++ b/src/library/scala/Product11.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product12.scala b/src/library/scala/Product12.scala index bf2b9437ec..0f069a2973 100644 --- a/src/library/scala/Product12.scala +++ b/src/library/scala/Product12.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product13.scala b/src/library/scala/Product13.scala index 2278f96dd9..5abae53eae 100644 --- a/src/library/scala/Product13.scala +++ b/src/library/scala/Product13.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product14.scala b/src/library/scala/Product14.scala index e194d36822..818d80ae04 100644 --- a/src/library/scala/Product14.scala +++ b/src/library/scala/Product14.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product15.scala b/src/library/scala/Product15.scala index a2bc70b6ce..e36985614d 100644 --- a/src/library/scala/Product15.scala +++ b/src/library/scala/Product15.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product16.scala b/src/library/scala/Product16.scala index 5ee44729ec..6881b33227 100644 --- a/src/library/scala/Product16.scala +++ b/src/library/scala/Product16.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product17.scala b/src/library/scala/Product17.scala index c1146b18cf..727c90c0fc 100644 --- a/src/library/scala/Product17.scala +++ b/src/library/scala/Product17.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product18.scala b/src/library/scala/Product18.scala index 40ddcdd7d6..4f05b54a08 100644 --- a/src/library/scala/Product18.scala +++ b/src/library/scala/Product18.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product19.scala b/src/library/scala/Product19.scala index 1b1edf6498..ada6f9e950 100644 --- a/src/library/scala/Product19.scala +++ b/src/library/scala/Product19.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product2.scala b/src/library/scala/Product2.scala index 0430341f78..9811a7b110 100644 --- a/src/library/scala/Product2.scala +++ b/src/library/scala/Product2.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product20.scala b/src/library/scala/Product20.scala index 497d7a6796..9b6bb09892 100644 --- a/src/library/scala/Product20.scala +++ b/src/library/scala/Product20.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product21.scala b/src/library/scala/Product21.scala index 5fd0d269f8..bf834c2571 100644 --- a/src/library/scala/Product21.scala +++ b/src/library/scala/Product21.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product22.scala b/src/library/scala/Product22.scala index 998ced16aa..1b32785ec1 100644 --- a/src/library/scala/Product22.scala +++ b/src/library/scala/Product22.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product3.scala b/src/library/scala/Product3.scala index d54b179806..f366782268 100644 --- a/src/library/scala/Product3.scala +++ b/src/library/scala/Product3.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product4.scala b/src/library/scala/Product4.scala index c24b013124..dbd96da077 100644 --- a/src/library/scala/Product4.scala +++ b/src/library/scala/Product4.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product5.scala b/src/library/scala/Product5.scala index de73d2b797..9a34d38722 100644 --- a/src/library/scala/Product5.scala +++ b/src/library/scala/Product5.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala index 41b9fac951..50eb0a4532 100644 --- a/src/library/scala/Product6.scala +++ b/src/library/scala/Product6.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product7.scala b/src/library/scala/Product7.scala index 8137978f2b..c7b7919687 100644 --- a/src/library/scala/Product7.scala +++ b/src/library/scala/Product7.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product8.scala b/src/library/scala/Product8.scala index c23b50a330..e1afb0d007 100644 --- a/src/library/scala/Product8.scala +++ b/src/library/scala/Product8.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Product9.scala b/src/library/scala/Product9.scala index 09a7b210c3..0f904c6e3d 100644 --- a/src/library/scala/Product9.scala +++ b/src/library/scala/Product9.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Proxy.scala b/src/library/scala/Proxy.scala index fa5c0016ad..feac5904a5 100644 --- a/src/library/scala/Proxy.scala +++ b/src/library/scala/Proxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala @@ -22,7 +21,7 @@ package scala */ trait Proxy { def self: Any - override def hashCode: Int = self.hashCode + override def hashCode: Int = self.## override def equals(that: Any): Boolean = if(that == null) false else that equals self diff --git a/src/library/scala/Responder.scala b/src/library/scala/Responder.scala index c3c42bc757..f86f883894 100644 --- a/src/library/scala/Responder.scala +++ b/src/library/scala/Responder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala index 0f1d1a6eb7..fe6778792f 100644 --- a/src/library/scala/ScalaObject.scala +++ b/src/library/scala/ScalaObject.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/SerialVersionUID.scala b/src/library/scala/SerialVersionUID.scala index e5ea23726b..0a2e29c934 100644 --- a/src/library/scala/SerialVersionUID.scala +++ b/src/library/scala/SerialVersionUID.scala @@ -6,7 +6,6 @@ ** |/ ** */ -// $Id$ package scala diff --git a/src/library/scala/StaticAnnotation.scala b/src/library/scala/StaticAnnotation.scala index 9e0cab393e..a1c3828173 100644 --- a/src/library/scala/StaticAnnotation.scala +++ b/src/library/scala/StaticAnnotation.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Symbol.scala b/src/library/scala/Symbol.scala index 0c347b07b9..9463a186b6 100644 --- a/src/library/scala/Symbol.scala +++ b/src/library/scala/Symbol.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/Tuple1.scala b/src/library/scala/Tuple1.scala index 2fef979510..74de5bf688 100644 --- a/src/library/scala/Tuple1.scala +++ b/src/library/scala/Tuple1.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple10.scala b/src/library/scala/Tuple10.scala index 18f9dd6766..5fc0e9fec3 100644 --- a/src/library/scala/Tuple10.scala +++ b/src/library/scala/Tuple10.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple11.scala b/src/library/scala/Tuple11.scala index 94880ce240..c27cddfcc4 100644 --- a/src/library/scala/Tuple11.scala +++ b/src/library/scala/Tuple11.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple12.scala b/src/library/scala/Tuple12.scala index fa0c1128d9..0d78fd7e46 100644 --- a/src/library/scala/Tuple12.scala +++ b/src/library/scala/Tuple12.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple13.scala b/src/library/scala/Tuple13.scala index c858a42d29..955a8e914a 100644 --- a/src/library/scala/Tuple13.scala +++ b/src/library/scala/Tuple13.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple14.scala b/src/library/scala/Tuple14.scala index cdeecb36f9..524166896f 100644 --- a/src/library/scala/Tuple14.scala +++ b/src/library/scala/Tuple14.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple15.scala b/src/library/scala/Tuple15.scala index 316edff038..2b88e353bd 100644 --- a/src/library/scala/Tuple15.scala +++ b/src/library/scala/Tuple15.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple16.scala b/src/library/scala/Tuple16.scala index 3ad584da11..ace0d731c0 100644 --- a/src/library/scala/Tuple16.scala +++ b/src/library/scala/Tuple16.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple17.scala b/src/library/scala/Tuple17.scala index 176022e4cc..a2e77aa9cb 100644 --- a/src/library/scala/Tuple17.scala +++ b/src/library/scala/Tuple17.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple18.scala b/src/library/scala/Tuple18.scala index 96a9736e14..58835c861f 100644 --- a/src/library/scala/Tuple18.scala +++ b/src/library/scala/Tuple18.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple19.scala b/src/library/scala/Tuple19.scala index 428103ef14..abb4f248ec 100644 --- a/src/library/scala/Tuple19.scala +++ b/src/library/scala/Tuple19.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala index fb685096a3..39d8f6bb1d 100644 --- a/src/library/scala/Tuple2.scala +++ b/src/library/scala/Tuple2.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Tuple20.scala b/src/library/scala/Tuple20.scala index bbfdaf3d8e..683c04de69 100644 --- a/src/library/scala/Tuple20.scala +++ b/src/library/scala/Tuple20.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple21.scala b/src/library/scala/Tuple21.scala index ecb02f6558..6f20fca435 100644 --- a/src/library/scala/Tuple21.scala +++ b/src/library/scala/Tuple21.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple22.scala b/src/library/scala/Tuple22.scala index 31d46b7bf2..b8a8a624d1 100644 --- a/src/library/scala/Tuple22.scala +++ b/src/library/scala/Tuple22.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple3.scala b/src/library/scala/Tuple3.scala index ced364f29d..1621d94968 100644 --- a/src/library/scala/Tuple3.scala +++ b/src/library/scala/Tuple3.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 (with extra methods) diff --git a/src/library/scala/Tuple4.scala b/src/library/scala/Tuple4.scala index 388e289647..79fc125502 100644 --- a/src/library/scala/Tuple4.scala +++ b/src/library/scala/Tuple4.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple5.scala b/src/library/scala/Tuple5.scala index b2fb4d23a3..b441fd8961 100644 --- a/src/library/scala/Tuple5.scala +++ b/src/library/scala/Tuple5.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple6.scala b/src/library/scala/Tuple6.scala index 2849e7222d..0e2d0e277e 100644 --- a/src/library/scala/Tuple6.scala +++ b/src/library/scala/Tuple6.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple7.scala b/src/library/scala/Tuple7.scala index c19232eeb2..9f62c1900a 100644 --- a/src/library/scala/Tuple7.scala +++ b/src/library/scala/Tuple7.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple8.scala b/src/library/scala/Tuple8.scala index a6d02c5030..9891797aa4 100644 --- a/src/library/scala/Tuple8.scala +++ b/src/library/scala/Tuple8.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/Tuple9.scala b/src/library/scala/Tuple9.scala index 9349695f42..28a39be444 100644 --- a/src/library/scala/Tuple9.scala +++ b/src/library/scala/Tuple9.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/TypeConstraint.scala b/src/library/scala/TypeConstraint.scala index c1e77c77f1..1cb7e55823 100644 --- a/src/library/scala/TypeConstraint.scala +++ b/src/library/scala/TypeConstraint.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/UninitializedError.scala b/src/library/scala/UninitializedError.scala index 9c2c31d99f..f130c7c0c4 100644 --- a/src/library/scala/UninitializedError.scala +++ b/src/library/scala/UninitializedError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/UninitializedFieldError.scala b/src/library/scala/UninitializedFieldError.scala index 2b805e0b2c..1d6799ec6f 100644 --- a/src/library/scala/UninitializedFieldError.scala +++ b/src/library/scala/UninitializedFieldError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/cloneable.scala b/src/library/scala/cloneable.scala index 1827fec024..9becd3f231 100644 --- a/src/library/scala/cloneable.scala +++ b/src/library/scala/cloneable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala index e362271f70..9a56b47e93 100644 --- a/src/library/scala/collection/BitSet.scala +++ b/src/library/scala/collection/BitSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/BitSetLike.scala b/src/library/scala/collection/BitSetLike.scala index b4e9682d88..0202c81513 100644 --- a/src/library/scala/collection/BitSetLike.scala +++ b/src/library/scala/collection/BitSetLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/BufferedIterator.scala b/src/library/scala/collection/BufferedIterator.scala index a86380b2a1..ab56d9377f 100644 --- a/src/library/scala/collection/BufferedIterator.scala +++ b/src/library/scala/collection/BufferedIterator.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/DefaultMap.scala b/src/library/scala/collection/DefaultMap.scala index 4ac4ad66c5..046e96d9b6 100644 --- a/src/library/scala/collection/DefaultMap.scala +++ b/src/library/scala/collection/DefaultMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/IndexedSeq.scala b/src/library/scala/collection/IndexedSeq.scala index 78165cb242..8c2eef65cd 100644 --- a/src/library/scala/collection/IndexedSeq.scala +++ b/src/library/scala/collection/IndexedSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/IndexedSeqLike.scala b/src/library/scala/collection/IndexedSeqLike.scala index 7bfad167c6..1ad1da715d 100644 --- a/src/library/scala/collection/IndexedSeqLike.scala +++ b/src/library/scala/collection/IndexedSeqLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -69,14 +68,14 @@ trait IndexedSeqLike[+A, +Repr] extends SeqLike[A, Repr] { self => * '''Note:''' `drop` is overridden to enable fast searching in the middle of indexed sequences. */ override def drop(n: Int): Iterator[A] = - if (n > 0) new Elements(start + n, end) else this + if (n > 0) new Elements(i + n, end) else this /** $super * '''Note:''' `take` is overridden to be symmetric to `drop`. */ override def take(n: Int): Iterator[A] = if (n <= 0) Iterator.empty.buffered - else if (start + n < end) new Elements(start, start + n) + else if (i + n < end) new Elements(i, i + n) else this } diff --git a/src/library/scala/collection/IndexedSeqOptimized.scala b/src/library/scala/collection/IndexedSeqOptimized.scala index 9702297a57..6360de33f1 100755 --- a/src/library/scala/collection/IndexedSeqOptimized.scala +++ b/src/library/scala/collection/IndexedSeqOptimized.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: IndexedSeqLike.scala 20129 2009-12-14 17:12:17Z odersky $ package scala.collection diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index 2baacec9f9..a25dd3df0a 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/IterableLike.scala b/src/library/scala/collection/IterableLike.scala index 06909961ce..ca149809b3 100644 --- a/src/library/scala/collection/IterableLike.scala +++ b/src/library/scala/collection/IterableLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection import generic._ diff --git a/src/library/scala/collection/IterableProxy.scala b/src/library/scala/collection/IterableProxy.scala index 23c2b40931..0827590856 100644 --- a/src/library/scala/collection/IterableProxy.scala +++ b/src/library/scala/collection/IterableProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/IterableProxyLike.scala b/src/library/scala/collection/IterableProxyLike.scala index fe148339b0..6193d30cba 100644 --- a/src/library/scala/collection/IterableProxyLike.scala +++ b/src/library/scala/collection/IterableProxyLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -16,9 +15,8 @@ import mutable.Buffer // Methods could be printed by cat IterableLike.scala | egrep '^ (override )?def' - -/** This trait implements a proxy for iterable objects. It forwards - * all calls to a different iterable object +/** This trait implements a proxy for Iterable objects. It forwards + * all calls to a different Iterable object. * * @author Martin Odersky * @version 2.8 @@ -26,8 +24,7 @@ import mutable.Buffer */ trait IterableProxyLike[+A, +Repr <: IterableLike[A, Repr] with Iterable[A]] extends IterableLike[A, Repr] - with TraversableProxyLike[A, Repr] -{ + with TraversableProxyLike[A, Repr] { override def iterator: Iterator[A] = self.iterator override def grouped(size: Int): Iterator[Repr] = self.grouped(size) override def sliding[B >: A](size: Int): Iterator[Repr] = self.sliding(size) diff --git a/src/library/scala/collection/IterableView.scala b/src/library/scala/collection/IterableView.scala index a6078bcdc8..faeb56c886 100644 --- a/src/library/scala/collection/IterableView.scala +++ b/src/library/scala/collection/IterableView.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/IterableViewLike.scala b/src/library/scala/collection/IterableViewLike.scala index 49fcee842c..77d3ac770b 100644 --- a/src/library/scala/collection/IterableViewLike.scala +++ b/src/library/scala/collection/IterableViewLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala index 5eca806933..daa6a59f3b 100644 --- a/src/library/scala/collection/Iterator.scala +++ b/src/library/scala/collection/Iterator.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -828,7 +827,7 @@ trait Iterator[+A] extends TraversableOnce[A] { // if 0 elements are requested, or if the number of newly obtained // elements is less than the gap between sequences, we are done. def deliver(howMany: Int) = { - (howMany > 0 && len > gap) && { + (howMany > 0 && (isFirst || len > gap)) && { if (!isFirst) buffer trimStart (step min prevSize) diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala index 20f44b7f21..c1a39e0332 100644 --- a/src/library/scala/collection/JavaConversions.scala +++ b/src/library/scala/collection/JavaConversions.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -24,9 +23,8 @@ package scala.collection * <li><code>scala.collection.Iterator</code> <=> <code>java.util.{ Iterator, Enumeration }</code></li> * <li><code>scala.collection.mutable.Buffer</code> <=> <code>java.util.List</code></li> * <li><code>scala.collection.mutable.Set</code> <=> <code>java.util.Set</code></li> - * <li><code>scala.collection.mutable.Map</code> <=> <code>java.util.Map</code></li> + * <li><code>scala.collection.mutable.Map</code> <=> <code>java.util.{ Map, Dictionary }</code></li> * <li><code>scala.collection.mutable.ConcurrentMap</code> <=> <code>java.util.concurrent.ConcurrentMap</code></li> - * <li><code>java.util.Properties</code></li> => <code>scala.collection.mutable.Map[String, String]</code></li> * </ul> * <p> * In all cases, converting from a source type to a target type and back @@ -40,24 +38,22 @@ package scala.collection * <b>val</b> sl2 : scala.collection.mutable.Buffer[Int] = jl * assert(sl eq sl2)g</pre> * <p> - * Note that no conversion is provided from <code>scala.collection.immutable.List</code> - * to <code>java.util.List</code>. Instead it is convertible to an immutable - * <code>java.util.Collection</code> which provides size and interaction - * capabilities, but not access by index as would be provided by - * <code>java.util.List</code>.<br/> - * This is intentional: in combination the implementation of - * <code>scala.collection.immutable.List</code> and the typical usage - * patterns of <code>java.util.List</code> would perform extremely poorly. + * In addition, the following one way conversions are provided: * </p> + * <ul> + * <li><code>scala.collection.Seq => <code>java.util.List }</code></li> + * <li><code>scala.collection.mutable.Seq => <code>java.util.List</code></li> + * <li><code>scala.collection.Set</code> => <code>java.util.Set</code></li> + * <li><code>scala.collection.Map</code> => <code>java.util.Map</code></li> + * </ul> * * @author Miles Sabin + * @author Martin Odersky * @since 2.8 */ object JavaConversions { import java.{ lang => jl, util => ju } import java.util.{ concurrent => juc } - import scala.collection.{ generic, immutable, mutable, Traversable } - import scala.reflect.ClassManifest // Scala => Java @@ -74,7 +70,7 @@ object JavaConversions { * @param i The <code>Iterator</code> to be converted. * @return A Java <code>Iterator</code> view of the argument. */ - implicit def asIterator[A](i : Iterator[A]) = i match { + implicit def asIterator[A](i : Iterator[A]): ju.Iterator[A] = i match { case JIteratorWrapper(wrapped) => wrapped case _ => IteratorWrapper(i) } @@ -92,7 +88,7 @@ object JavaConversions { * @param i The <code>Iterator</code> to be converted. * @return A Java <code>Enumeration</code> view of the argument. */ - implicit def asEnumeration[A](i : Iterator[A]) = i match { + implicit def asEnumeration[A](i : Iterator[A]): ju.Enumeration[A] = i match { case JEnumerationWrapper(wrapped) => wrapped case _ => IteratorWrapper(i) } @@ -110,7 +106,7 @@ object JavaConversions { * @param i The <code>Iterable</code> to be converted. * @return A Java <code>Iterable</code> view of the argument. */ - implicit def asIterable[A](i : Iterable[A]) = i match { + implicit def asIterable[A](i : Iterable[A]): jl.Iterable[A] = i match { case JIterableWrapper(wrapped) => wrapped case _ => IterableWrapper(i) } @@ -126,7 +122,7 @@ object JavaConversions { * @param i The <code>SizedIterable</code> to be converted. * @return A Java <code>Collection</code> view of the argument. */ - implicit def asCollection[A](i : Iterable[A]) = i match { + implicit def asCollection[A](i : Iterable[A]): ju.Collection[A] = i match { case JCollectionWrapper(wrapped) => wrapped case _ => new IterableWrapper(i) } @@ -144,12 +140,49 @@ object JavaConversions { * @param b The <code>Buffer</code> to be converted. * @return A Java <code>List</code> view of the argument. */ - implicit def asList[A](b : mutable.Buffer[A]) : ju.List[A] = b match { + implicit def asList[A](b : mutable.Buffer[A]): ju.List[A] = b match { case JListWrapper(wrapped) => wrapped case _ => new MutableBufferWrapper(b) } /** + * Implicitly converts a Scala mutable <code>Seq</code> to a Java <code>List</code>. + * The returned Java <code>List</code> is backed by the provided Scala + * <code>Seq</code> and any side-effects of using it via the Java interface will + * be visible via the Scala interface and vice versa. + * <p> + * If the Scala <code>Seq</code> was previously obtained from an implicit or + * explicit call of <code>asSeq(java.util.List)</code> then the original + * Java <code>List</code> will be returned. + * + * @param b The <code>Seq</code> to be converted. + * @return A Java <code>List</code> view of the argument. + */ + implicit def asList[A](b : mutable.Seq[A]): ju.List[A] = b match { + case JListWrapper(wrapped) => wrapped + case _ => new MutableSeqWrapper(b) + } + + /** + * Implicitly converts a Scala <code>Seq</code> to a Java <code>List</code>. + * The returned Java <code>List</code> is backed by the provided Scala + * <code>Seq</code> and any side-effects of using it via the Java interface will + * be visible via the Scala interface and vice versa. + * <p> + * If the Scala <code>Seq</code> was previously obtained from an implicit or + * explicit call of <code>asSeq(java.util.List)</code> then the original + * Java <code>List</code> will be returned. + * + * @param b The <code>Seq</code> to be converted. + * @return A Java <code>List</co * +de> view of the argument. + */ + implicit def asList[A](b : Seq[A]): ju.List[A] = b match { + case JListWrapper(wrapped) => wrapped + case _ => new SeqWrapper(b) + } + + /** * Implicitly converts a Scala mutable <code>Set</code> to a Java <code>Set</code>. * The returned Java <code>Set</code> is backed by the provided Scala * <code>Set</code> and any side-effects of using it via the Java interface will @@ -162,9 +195,27 @@ object JavaConversions { * @param s The <code>Set</code> to be converted. * @return A Java <code>Set</code> view of the argument. */ - implicit def asSet[A](s : mutable.Set[A])(implicit m : ClassManifest[A]) : ju.Set[A] = s match { + implicit def asSet[A](s : mutable.Set[A]): ju.Set[A] = s match { + case JSetWrapper(wrapped) => wrapped + case _ => new MutableSetWrapper(s) + } + + /** + * Implicitly converts a Scala <code>Set</code> to a Java <code>Set</code>. + * The returned Java <code>Set</code> is backed by the provided Scala + * <code>Set</code> and any side-effects of using it via the Java interface will + * be visible via the Scala interface and vice versa. + * <p> + * If the Scala <code>Set</code> was previously obtained from an implicit or + * explicit call of <code>asSet(java.util.Set)</code> then the original + * Java <code>Set</code> will be returned. + * + * @param s The <code>Set</code> to be converted. + * @return A Java <code>Set</code> view of the argument. + */ + implicit def asSet[A](s: Set[A]): ju.Set[A] = s match { case JSetWrapper(wrapped) => wrapped - case _ => new MutableSetWrapper(s)(m) + case _ => new SetWrapper(s) } /** @@ -180,10 +231,61 @@ object JavaConversions { * @param m The <code>Map</code> to be converted. * @return A Java <code>Map</code> view of the argument. */ - implicit def asMap[A, B](m : mutable.Map[A, B])(implicit ma : ClassManifest[A]) : ju.Map[A, B] = m match { + implicit def asMap[A, B](m : mutable.Map[A, B]): ju.Map[A, B] = m match { + //case JConcurrentMapWrapper(wrapped) => wrapped + case JMapWrapper(wrapped) => wrapped + case _ => new MutableMapWrapper(m) + } + + /** + * Implicitly converts a Scala mutable <code>Map</code> to a Java <code>Dictionary</code>. + * The returned Java <code>Dictionary</code> is backed by the provided Scala + * <code>Dictionary</code> and any side-effects of using it via the Java interface will + * be visible via the Scala interface and vice versa. + * <p> + * If the Scala <code>Dictionary</code> was previously obtained from an implicit or + * explicit call of <code>asMap(java.util.Dictionary)</code> then the original + * Java <code>Dictionary</code> will be returned. + * + * @param m The <code>Map</code> to be converted. + * @return A Java <code>Dictionary</code> view of the argument. + */ + implicit def asDictionary[A, B](m : mutable.Map[A, B]): ju.Dictionary[A, B] = m match { + //case JConcurrentMapWrapper(wrapped) => wrapped + case JDictionaryWrapper(wrapped) => wrapped + case _ => new DictionaryWrapper(m) + } + + /** + * Implicitly converts a Java <code>Properties</code> to a Scala mutable <code>Map[String, String]</code>. + * The returned Scala <code>Map[String, String]</code> is backed by the provided Java + * <code>Properties</code> and any side-effects of using it via the Scala interface will + * be visible via the Java interface and vice versa. + * + * @param m The <code>Properties</code> to be converted. + * @return A Scala mutable <code>Map[String, String]</code> view of the argument. + */ + implicit def asMap(p: ju.Properties): mutable.Map[String, String] = p match { + case _ => new JPropertiesWrapper(p) + } + + /** + * Implicitly converts a Scala <code>Map</code> to a Java <code>Map</code>. + * The returned Java <code>Map</code> is backed by the provided Scala + * <code>Map</code> and any side-effects of using it via the Java interface will + * be visible via the Scala interface and vice versa. + * <p> + * If the Scala <code>Map</code> was previously obtained from an implicit or + * explicit call of <code>asMap(java.util.Map)</code> then the original + * Java <code>Map</code> will be returned. + * + * @param m The <code>Map</code> to be converted. + * @return A Java <code>Map</code> view of the argument. + */ + implicit def asMap[A, B](m : Map[A, B]): ju.Map[A, B] = m match { //case JConcurrentMapWrapper(wrapped) => wrapped case JMapWrapper(wrapped) => wrapped - case _ => new MutableMapWrapper(m)(ma) + case _ => new MapWrapper(m) } /** @@ -196,10 +298,9 @@ object JavaConversions { * explicit call of <code>asConcurrentMap(java.util.concurrect.ConcurrentMap)</code> then the original * Java <code>ConcurrentMap</code> will be returned. */ - implicit def asConcurrentMap[A, B](m: mutable.ConcurrentMap[A, B]) - (implicit ma: ClassManifest[A], mb: ClassManifest[B]): juc.ConcurrentMap[A, B] = m match { + implicit def asConcurrentMap[A, B](m: mutable.ConcurrentMap[A, B]): juc.ConcurrentMap[A, B] = m match { case JConcurrentMapWrapper(wrapped) => wrapped - case _ => new ConcurrentMapWrapper(m)(ma, mb) + case _ => new ConcurrentMapWrapper(m) } // Java => Scala @@ -217,7 +318,7 @@ object JavaConversions { * @param i The <code>Iterator</code> to be converted. * @return A Scala <code>Iterator</code> view of the argument. */ - implicit def asIterator[A](i : ju.Iterator[A]) = i match { + implicit def asIterator[A](i : ju.Iterator[A]): Iterator[A] = i match { case IteratorWrapper(wrapped) => wrapped case _ => JIteratorWrapper(i) } @@ -235,7 +336,7 @@ object JavaConversions { * @param i The <code>Enumeration</code> to be converted. * @return A Scala <code>Iterator</code> view of the argument. */ - implicit def asIterator[A](i : ju.Enumeration[A]) = i match { + implicit def asIterator[A](i : ju.Enumeration[A]): Iterator[A] = i match { case IteratorWrapper(wrapped) => wrapped case _ => JEnumerationWrapper(i) } @@ -253,7 +354,7 @@ object JavaConversions { * @param i The <code>Iterable</code> to be converted. * @return A Scala <code>Iterable</code> view of the argument. */ - implicit def asIterable[A](i : jl.Iterable[A]) = i match { + implicit def asIterable[A](i : jl.Iterable[A]): Iterable[A] = i match { case IterableWrapper(wrapped) => wrapped case _ => JIterableWrapper(i) } @@ -268,7 +369,7 @@ object JavaConversions { * @param i The <code>Collection</code> to be converted. * @return A Scala <code>SizedIterable</code> view of the argument. */ - implicit def asIterable[A](i : ju.Collection[A]) = i match { + implicit def asIterable[A](i : ju.Collection[A]): Iterable[A] = i match { case IterableWrapper(wrapped) => wrapped case _ => JCollectionWrapper(i) } @@ -286,7 +387,7 @@ object JavaConversions { * @param l The <code>List</code> to be converted. * @return A Scala mutable <code>Buffer</code> view of the argument. */ - implicit def asBuffer[A](l : ju.List[A]) = l match { + implicit def asBuffer[A](l : ju.List[A]): mutable.Buffer[A] = l match { case MutableBufferWrapper(wrapped) => wrapped case _ =>new JListWrapper(l) } @@ -299,12 +400,12 @@ object JavaConversions { * <p> * If the Java <code>Set</code> was previously obtained from an implicit or * explicit call of <code>asSet(scala.collection.mutable.Set)</code> then the original - * Scala <code>Set</code> will be returned. + * ScalaThe reported problems have to do with dependent method types, which is currently an experimental feature in Scala and is still under development. We emphasize that these problems are related to type-inference and, as stated in the paper, it is possible to run and type-check the programs with additional annotations. <code>Set</code> will be returned. * * @param s The <code>Set</code> to be converted. * @return A Scala mutable <code>Set</code> view of the argument. */ - implicit def asSet[A](s : ju.Set[A]) = s match { + implicit def asSet[A](s : ju.Set[A]): mutable.Set[A] = s match { case MutableSetWrapper(wrapped) => wrapped case _ =>new JSetWrapper(s) } @@ -322,7 +423,7 @@ object JavaConversions { * @param m The <code>Map</code> to be converted. * @return A Scala mutable <code>Map</code> view of the argument. */ - implicit def asMap[A, B](m : ju.Map[A, B]) = m match { + implicit def asMap[A, B](m : ju.Map[A, B]): mutable.Map[A, B] = m match { //case ConcurrentMapWrapper(wrapped) => wrapped case MutableMapWrapper(wrapped) => wrapped case _ => new JMapWrapper(m) @@ -341,22 +442,23 @@ object JavaConversions { * @param m The <code>ConcurrentMap</code> to be converted. * @return A Scala mutable <code>ConcurrrentMap</code> view of the argument. */ - implicit def asConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]) = m match { - case ConcurrentMapWrapper(wrapped) => wrapped + implicit def asConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]): mutable.ConcurrentMap[A, B] = m match { + case cmw: ConcurrentMapWrapper[a, b] => cmw.underlying case _ => new JConcurrentMapWrapper(m) } /** - * Implicitly converts a Java <code>Properties</code> to a Scala mutable <code>Map[String, String]</code>. + * Implicitly converts a Java <code>Dictionary</code> to a Scala mutable <code>Map[String, String]</code>. * The returned Scala <code>Map[String, String]</code> is backed by the provided Java - * <code>Properties</code> and any side-effects of using it via the Scala interface will + * <code>Dictionary</code> and any side-effects of using it via the Scala interface will * be visible via the Java interface and vice versa. * - * @param m The <code>Properties</code> to be converted. + * @param m The <code>Dictionary</code> to be converted. * @return A Scala mutable <code>Map[String, String]</code> view of the argument. */ - implicit def asMap(p: ju.Properties): mutable.Map[String, String] = p match { - case _ => new JPropertiesWrapper(p) + implicit def asMap[A, B](p: ju.Dictionary[A, B]): mutable.Map[A, B] = p match { + case DictionaryWrapper(wrapped) => wrapped + case _ => new JDictionaryWrapper(p) } // Private implementations ... @@ -397,6 +499,17 @@ object JavaConversions { def newBuilder[B] = new mutable.ArrayBuffer[B] } + case class SeqWrapper[A](underlying : Seq[A]) extends ju.AbstractList[A] { + def size = underlying.length + def get(i : Int) = underlying(i) + } + + case class MutableSeqWrapper[A](underlying : mutable.Seq[A]) extends ju.AbstractList[A] { + def size = underlying.length + def get(i : Int) = underlying(i) + override def set(i : Int, elem: A) = { val p = underlying(i) ; underlying(i) = elem ; p } + } + case class MutableBufferWrapper[A](underlying : mutable.Buffer[A]) extends ju.AbstractList[A] { def size = underlying.length def get(i : Int) = underlying(i) @@ -419,29 +532,36 @@ object JavaConversions { def result = this } - case class MutableSetWrapper[A](underlying : mutable.Set[A])(m : ClassManifest[A]) extends ju.AbstractSet[A] { + class SetWrapper[A](underlying: Set[A]) extends ju.AbstractSet[A] { self => def size = underlying.size - override def add(elem: A) = { val sz = underlying.size ; underlying += elem ; sz < underlying.size } - override def remove(elem : AnyRef) = { - m.erasure.isInstance(elem) && { - val sz = underlying.size - underlying -= elem.asInstanceOf[A] - sz > underlying.size - } - } def iterator = new ju.Iterator[A] { val ui = underlying.iterator var prev : Option[A] = None - def hasNext = ui.hasNext def next = { val e = ui.next ; prev = Some(e) ; e } def remove = prev match { - case Some(e) => self.remove(e.asInstanceOf[AnyRef]) ; prev = None + case Some(e) => + self match { + case ms: mutable.Set[a] => + ms.remove(e.asInstanceOf[a]) + prev = None + case _ => + throw new UnsupportedOperationException("remove") + } case _ => throw new IllegalStateException("next must be called at least once before remove") } } + } + case class MutableSetWrapper[A](underlying : mutable.Set[A]) extends SetWrapper[A](underlying) { + override def add(elem: A) = { val sz = underlying.size ; underlying += elem ; sz < underlying.size } + override def remove(elem : AnyRef) = try { + underlying.remove(elem.asInstanceOf[A]) + } catch { + case ex: ClassCastException => false + } + override def clear() = underlying.clear() } case class JSetWrapper[A](underlying : ju.Set[A]) extends mutable.Set[A] with mutable.SetLike[A, JSetWrapper[A]] { @@ -456,35 +576,24 @@ object JavaConversions { override def add(elem: A): Boolean = underlying.add(elem) override def remove(elem: A): Boolean = underlying.remove(elem) - - override def clear = underlying.clear + override def clear() = underlying.clear() override def empty = JSetWrapper(new ju.HashSet[A]) } - abstract class MutableMapWrapperLike[A, B](underlying: mutable.Map[A, B])(m: ClassManifest[A]) - extends ju.AbstractMap[A, B] { - self => + class MapWrapper[A, B](underlying: Map[A, B]) extends ju.AbstractMap[A, B] { self => override def size = underlying.size - override def put(k : A, v : B) = underlying.put(k, v) match { - case Some(v1) => v1 - case None => null.asInstanceOf[B] - } - - override def remove(k : AnyRef) = { - if (!m.erasure.isInstance(k)) - null.asInstanceOf[B] - else { - val k1 = k.asInstanceOf[A] - underlying.get(k1) match { - case Some(v) => underlying -= k1 ; v - case None => null.asInstanceOf[B] - } + override def get(key: AnyRef): B = try { + underlying get key.asInstanceOf[A] match { + case None => null.asInstanceOf[B] + case Some(v) => v } + } catch { + case ex: ClassCastException => null.asInstanceOf[B] } - override def entrySet : ju.Set[ju.Map.Entry[A, B]] = new ju.AbstractSet[ju.Map.Entry[A, B]] { + override def entrySet: ju.Set[ju.Map.Entry[A, B]] = new ju.AbstractSet[ju.Map.Entry[A, B]] { def size = self.size def iterator = new ju.Iterator[ju.Map.Entry[A, B]] { @@ -508,15 +617,40 @@ object JavaConversions { } def remove = prev match { - case Some(k) => val v = self.remove(k.asInstanceOf[AnyRef]) ; prev = None ; v - case _ => throw new IllegalStateException("next must be called at least once before remove") + case Some(k) => + self match { + case mm: mutable.Map[a, _] => + val v = mm.remove(k.asInstanceOf[a]) + prev = None + v + case _ => + throw new UnsupportedOperationException("remove") + } + case _ => + throw new IllegalStateException("next must be called at least once before remove") } } } } - case class MutableMapWrapper[A, B](underlying : mutable.Map[A, B])(m : ClassManifest[A]) - extends MutableMapWrapperLike[A, B](underlying)(m) + case class MutableMapWrapper[A, B](underlying: mutable.Map[A, B]) + extends MapWrapper[A, B](underlying) { + override def put(k : A, v : B) = underlying.put(k, v) match { + case Some(v1) => v1 + case None => null.asInstanceOf[B] + } + + override def remove(k : AnyRef): B = try { + underlying.remove(k.asInstanceOf[A]) match { + case None => null.asInstanceOf[B] + case Some(v) => v + } + } catch { + case ex: ClassCastException => null.asInstanceOf[B] + } + + override def clear() = underlying.clear() + } trait JMapWrapperLike[A, B, +Repr <: mutable.MapLike[A, B, Repr] with mutable.Map[A, B]] extends mutable.Map[A, B] with mutable.MapLike[A, B, Repr] { @@ -555,7 +689,7 @@ object JavaConversions { def next = { val e = ui.next ; (e.getKey, e.getValue) } } - override def clear = underlying.clear + override def clear() = underlying.clear() override def empty: Repr = null.asInstanceOf[Repr] } @@ -565,36 +699,19 @@ object JavaConversions { override def empty = JMapWrapper(new ju.HashMap[A, B]) } - case class ConcurrentMapWrapper[A, B](underlying: mutable.ConcurrentMap[A, B]) - (m: ClassManifest[A], mv: ClassManifest[B]) - extends MutableMapWrapperLike[A, B](underlying)(m) with juc.ConcurrentMap[A, B] { - self => - - override def remove(k : AnyRef) = { - if (!m.erasure.isInstance(k)) - null.asInstanceOf[B] - else { - val k1 = k.asInstanceOf[A] - underlying.remove(k1) match { - case Some(v) => v - case None => null.asInstanceOf[B] - } - } - } + class ConcurrentMapWrapper[A, B](override val underlying: mutable.ConcurrentMap[A, B]) + extends MutableMapWrapper[A, B](underlying) with juc.ConcurrentMap[A, B] { def putIfAbsent(k: A, v: B) = underlying.putIfAbsent(k, v) match { case Some(v) => v case None => null.asInstanceOf[B] } - def remove(k: AnyRef, v: AnyRef) = { - if (!m.erasure.isInstance(k) || !mv.erasure.isInstance(v)) + def remove(k: AnyRef, v: AnyRef) = try { + underlying.remove(k.asInstanceOf[A], v.asInstanceOf[B]) + } catch { + case ex: ClassCastException => false - else { - val k1 = k.asInstanceOf[A] - val v1 = v.asInstanceOf[B] - underlying.remove(k1, v1) - } } def replace(k: A, v: B): B = underlying.replace(k, v) match { @@ -603,7 +720,6 @@ object JavaConversions { } def replace(k: A, oldval: B, newval: B) = underlying.replace(k, oldval, newval) - } case class JConcurrentMapWrapper[A, B](val underlying: juc.ConcurrentMap[A, B]) @@ -629,7 +745,64 @@ object JavaConversions { } def replace(k: A, oldvalue: B, newvalue: B): Boolean = underlying.replace(k, oldvalue, newvalue) + } + case class DictionaryWrapper[A, B](underlying: mutable.Map[A, B]) + extends ju.Dictionary[A, B] { + def size: Int = underlying.size + def isEmpty: Boolean = underlying.isEmpty + def keys: ju.Enumeration[A] = asEnumeration(underlying.keysIterator) + def elements: ju.Enumeration[B] = asEnumeration(underlying.valuesIterator) + def get(key: AnyRef) = try { + underlying.get(key.asInstanceOf[A]) match { + case None => null.asInstanceOf[B] + case Some(v) => v + } + } catch { + case ex: ClassCastException => null.asInstanceOf[B] + } + def put(key: A, value: B): B = underlying.put(key, value) match { + case Some(v) => v + case None => null.asInstanceOf[B] + } + override def remove(key: AnyRef) = try { + underlying.remove(key.asInstanceOf[A]) match { + case None => null.asInstanceOf[B] + case Some(v) => v + } + } catch { + case ex: ClassCastException => null.asInstanceOf[B] + } + } + + case class JDictionaryWrapper[A, B](underlying: ju.Dictionary[A, B]) + extends mutable.Map[A, B] { + + override def size: Int = underlying.size + + def get(k : A) = { + val v = underlying.get(k) + if (v != null) Some(v) else None + } + + def +=(kv: (A, B)): this.type = { underlying.put(kv._1, kv._2); this } + def -=(key: A): this.type = { underlying.remove(key); this } + + override def put(k : A, v : B): Option[B] = { + val r = underlying.put(k, v) + if (r != null) Some(r) else None + } + + override def update(k : A, v : B) { underlying.put(k, v) } + + override def remove(k : A): Option[B] = { + val r = underlying.remove(k) + if (r != null) Some(r) else None + } + + def iterator = asIterator(underlying.keys) map (k => (k, underlying get k)) + + override def clear() = underlying.clear() } case class JPropertiesWrapper(underlying: ju.Properties) @@ -665,7 +838,7 @@ object JavaConversions { def next = { val e = ui.next ; (e.getKey.asInstanceOf[String], e.getValue.asInstanceOf[String]) } } - override def clear = underlying.clear + override def clear() = underlying.clear() override def empty = JPropertiesWrapper(new ju.Properties) @@ -675,9 +848,5 @@ object JavaConversions { def setProperty(key: String, value: String) = underlying.setProperty(key, value) } - } - - - diff --git a/src/library/scala/collection/LinearSeq.scala b/src/library/scala/collection/LinearSeq.scala index ba0eb6a22d..1cd130eeb2 100644 --- a/src/library/scala/collection/LinearSeq.scala +++ b/src/library/scala/collection/LinearSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/LinearSeqLike.scala b/src/library/scala/collection/LinearSeqLike.scala index 208cbcdd50..c2c4996f47 100644 --- a/src/library/scala/collection/LinearSeqLike.scala +++ b/src/library/scala/collection/LinearSeqLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/LinearSeqOptimized.scala b/src/library/scala/collection/LinearSeqOptimized.scala index 2add28d7c3..abe8e2fa62 100755 --- a/src/library/scala/collection/LinearSeqOptimized.scala +++ b/src/library/scala/collection/LinearSeqOptimized.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: LinearSeqOptimized.scala 20608 2010-01-20 00:28:09Z extempore $ package scala.collection diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala index 0722d55f03..b48acd0c4e 100644 --- a/src/library/scala/collection/Map.scala +++ b/src/library/scala/collection/Map.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala index 9bca2f09a0..fdaee64fd5 100644 --- a/src/library/scala/collection/MapLike.scala +++ b/src/library/scala/collection/MapLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -330,7 +329,7 @@ self => override /*PartialFunction*/ def toString = super[IterableLike].toString - override def hashCode() = this map (_.hashCode) sum + override def hashCode() = this map (_.##) sum /** Compares two maps structurally; i.e. checks if all mappings * contained in this map are also contained in the other map, diff --git a/src/library/scala/collection/MapProxy.scala b/src/library/scala/collection/MapProxy.scala index 9dce47846d..1cc7d81de4 100644 --- a/src/library/scala/collection/MapProxy.scala +++ b/src/library/scala/collection/MapProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/MapProxyLike.scala b/src/library/scala/collection/MapProxyLike.scala index f269a368dd..7ef1eb68ef 100644 --- a/src/library/scala/collection/MapProxyLike.scala +++ b/src/library/scala/collection/MapProxyLike.scala @@ -12,8 +12,8 @@ import generic._ // Methods could be printed by cat MapLike.scala | egrep '^ (override )?def' -/** This trait implements a proxy for iterable objects. It forwards - * all calls to a different iterable object +/** This trait implements a proxy for Map objects. It forwards + * all calls to a different Map object. * * @author Martin Odersky * @version 2.8 @@ -23,12 +23,10 @@ trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]] extends MapLike[A, B, This] with IterableProxyLike[(A, B), This] { - // def empty: This - // def + [B1 >: B] (kv: (A, B1)): Map[A, B1] - // def - (key: A): This - override def get(key: A): Option[B] = self.get(key) override def iterator: Iterator[(A, B)] = self.iterator + override def + [B1 >: B] (kv: (A, B1)): Map[A, B1] = self.+(kv) + override def - (key: A): This = self.-(key) override def isEmpty: Boolean = self.isEmpty override def getOrElse[B1 >: B](key: A, default: => B1): B1 = self.getOrElse(key, default) override def apply(key: A): B = self.apply(key) @@ -42,11 +40,10 @@ trait MapProxyLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]] override def default(key: A): B = self.default(key) override def filterKeys(p: A => Boolean) = self.filterKeys(p) override def mapValues[C](f: B => C) = self.mapValues(f) - - // override def updated [B1 >: B](key: A, value: B1) = self + ((key, value)) - // override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = self.+(elem1, elem2, elems: _*) - // override def ++[B1 >: B](elems: Traversable[(A, B1)]) = self.++(elems) - // override def ++[B1 >: B](iter: Iterator[(A, B1)]) = self.++(iter) + override def updated [B1 >: B](key: A, value: B1): Map[A, B1] = self.updated(key, value) + override def + [B1 >: B] (kv1: (A, B1), kv2: (A, B1), kvs: (A, B1) *): Map[A, B1] = self.+(kv1, kv2, kvs: _*) + override def ++[B1 >: B](xs: TraversableOnce[(A, B1)]): Map[A, B1] = self.++(xs) + override def filterNot(p: ((A, B)) => Boolean) = self filterNot p override def addString(b: StringBuilder, start: String, sep: String, end: String): StringBuilder = self.addString(b, start, sep, end) diff --git a/src/library/scala/collection/Seq.scala b/src/library/scala/collection/Seq.scala index f6b89b67b8..2e8a1af99a 100644 --- a/src/library/scala/collection/Seq.scala +++ b/src/library/scala/collection/Seq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala index 2774536886..8770de9c36 100644 --- a/src/library/scala/collection/SeqLike.scala +++ b/src/library/scala/collection/SeqLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -509,7 +508,7 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self => * @return the last index such that the elements of this $coll starting a this index * match the elements of sequence `that`, or `-1` of no such subsequence exists. */ - def lastIndexOfSlice[B >: A](that: Seq[B]): Int = lastIndexOfSlice(that, that.length) + def lastIndexOfSlice[B >: A](that: Seq[B]): Int = lastIndexOfSlice(that, length) /** Finds last index before or at a given end index where this $coll contains a given sequence as a slice. * @param that the sequence to test @@ -858,7 +857,7 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self => /** Hashcodes for $Coll produce a value from the hashcodes of all the * elements of the $coll. */ - override def hashCode() = (Seq.hashSeed /: this)(_ * 41 + _.hashCode) + override def hashCode() = (Seq.hashSeed /: this)(_ * 41 + _.##) override def equals(that: Any): Boolean = that match { case that: Seq[_] => (that canEqual this) && (this sameElements that) diff --git a/src/library/scala/collection/SeqProxy.scala b/src/library/scala/collection/SeqProxy.scala index 07657b8680..392ed15d79 100644 --- a/src/library/scala/collection/SeqProxy.scala +++ b/src/library/scala/collection/SeqProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SeqProxyLike.scala b/src/library/scala/collection/SeqProxyLike.scala index 24ee0b430a..c3095c8516 100644 --- a/src/library/scala/collection/SeqProxyLike.scala +++ b/src/library/scala/collection/SeqProxyLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -24,6 +23,8 @@ import generic._ * @since 2.8 */ trait SeqProxyLike[+A, +Repr <: SeqLike[A, Repr] with Seq[A]] extends SeqLike[A, Repr] with IterableProxyLike[A, Repr] { + override def size = self.size + override def toSeq: Seq[A] = self.toSeq override def length: Int = self.length override def apply(idx: Int): A = self.apply(idx) override def lengthCompare(len: Int): Int = self.lengthCompare(len) diff --git a/src/library/scala/collection/SeqView.scala b/src/library/scala/collection/SeqView.scala index 68819e899d..8198abfeab 100644 --- a/src/library/scala/collection/SeqView.scala +++ b/src/library/scala/collection/SeqView.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SeqViewLike.scala b/src/library/scala/collection/SeqViewLike.scala index 6f1f29f536..3231720bb3 100644 --- a/src/library/scala/collection/SeqViewLike.scala +++ b/src/library/scala/collection/SeqViewLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala index f1c1e43731..61cfd7e27d 100644 --- a/src/library/scala/collection/Set.scala +++ b/src/library/scala/collection/Set.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SetLike.scala b/src/library/scala/collection/SetLike.scala index 5a16b975df..2e9a1ec2a2 100644 --- a/src/library/scala/collection/SetLike.scala +++ b/src/library/scala/collection/SetLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SetProxy.scala b/src/library/scala/collection/SetProxy.scala index cf465b6ca5..03ea4fbbb3 100644 --- a/src/library/scala/collection/SetProxy.scala +++ b/src/library/scala/collection/SetProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SetProxyLike.scala b/src/library/scala/collection/SetProxyLike.scala index 76d2c31b99..cf7f3b845c 100644 --- a/src/library/scala/collection/SetProxyLike.scala +++ b/src/library/scala/collection/SetProxyLike.scala @@ -21,10 +21,11 @@ import generic._ */ trait SetProxyLike[A, +This <: SetLike[A, This] with Set[A]] extends SetLike[A, This] with IterableProxyLike[A, This] { + def empty: This // def empty: This - // def + (elem: A): This - // def - (elem: A): This override def contains(elem: A): Boolean = self.contains(elem) + override def + (elem: A) = self.+(elem) + override def - (elem: A) = self.-(elem) override def isEmpty: Boolean = self.isEmpty override def apply(elem: A): Boolean = self.apply(elem) override def intersect(that: Set[A]) = self.intersect(that) diff --git a/src/library/scala/collection/SortedMap.scala b/src/library/scala/collection/SortedMap.scala index 7b0d35220e..e30ad37924 100644 --- a/src/library/scala/collection/SortedMap.scala +++ b/src/library/scala/collection/SortedMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection import generic._ diff --git a/src/library/scala/collection/SortedMapLike.scala b/src/library/scala/collection/SortedMapLike.scala index 78db25f318..a5386802b6 100644 --- a/src/library/scala/collection/SortedMapLike.scala +++ b/src/library/scala/collection/SortedMapLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/SortedSet.scala b/src/library/scala/collection/SortedSet.scala index 9b6fdc8c55..2d59d12f0d 100644 --- a/src/library/scala/collection/SortedSet.scala +++ b/src/library/scala/collection/SortedSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection import generic._ diff --git a/src/library/scala/collection/SortedSetLike.scala b/src/library/scala/collection/SortedSetLike.scala index 4c1d4651f8..4542925a21 100644 --- a/src/library/scala/collection/SortedSetLike.scala +++ b/src/library/scala/collection/SortedSetLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection import generic._ diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala index b3383ba802..dcea1a8c2f 100644 --- a/src/library/scala/collection/Traversable.scala +++ b/src/library/scala/collection/Traversable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala index fd6c000827..50259a1ee8 100644 --- a/src/library/scala/collection/TraversableLike.scala +++ b/src/library/scala/collection/TraversableLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -339,7 +338,7 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] with Traversable } bldr += elem } - m mapValues (_.result) + m map { case (k, b) => (k, b.result) } } /** Tests whether a predicate holds for all elements of this $coll. diff --git a/src/library/scala/collection/TraversableOnce.scala b/src/library/scala/collection/TraversableOnce.scala index 54efa62ef3..3984264168 100644 --- a/src/library/scala/collection/TraversableOnce.scala +++ b/src/library/scala/collection/TraversableOnce.scala @@ -408,7 +408,13 @@ trait TraversableOnce[+A] { * $willNotTerminateInf * @return an indexed sequence containing all elements of this $coll. */ - def toIndexedSeq[B >: A]: mutable.IndexedSeq[B] = new ArrayBuffer[B] ++= self + def toIndexedSeq[B >: A]: immutable.IndexedSeq[B] = immutable.IndexedSeq() ++ self + + /** Converts this $coll to a mutable buffer. + * $willNotTerminateInf + * @return a buffer containing all elements of this $coll. + */ + def toBuffer[B >: A]: mutable.Buffer[B] = new ArrayBuffer[B] ++= self /** Converts this $coll to a stream. * $willNotTerminateInf diff --git a/src/library/scala/collection/TraversableProxy.scala b/src/library/scala/collection/TraversableProxy.scala index dd450dccac..4a26c88129 100644 --- a/src/library/scala/collection/TraversableProxy.scala +++ b/src/library/scala/collection/TraversableProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/TraversableProxyLike.scala b/src/library/scala/collection/TraversableProxyLike.scala index 7b4bf99d04..05c4c44f12 100644 --- a/src/library/scala/collection/TraversableProxyLike.scala +++ b/src/library/scala/collection/TraversableProxyLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -16,9 +15,8 @@ import mutable.{Buffer, StringBuilder} // Methods could be printed by cat TraversableLike.scala | egrep '^ (override )?def' - -/** This trait implements a proxy for traversable objects. It forwards - * all calls to a different traversable object. +/** This trait implements a proxy for Traversable objects. It forwards + * all calls to a different Traversable object. * * @author Martin Odersky * @version 2.8 @@ -79,10 +77,13 @@ trait TraversableProxyLike[+A, +Repr <: TraversableLike[A, Repr] with Traversabl override def toList: List[A] = self.toList override def toIterable: Iterable[A] = self.toIterable override def toSeq: Seq[A] = self.toSeq - override def toIndexedSeq[B >: A]: mutable.IndexedSeq[B] = self.toIndexedSeq + override def toIndexedSeq[B >: A] = self.toIndexedSeq + override def toBuffer[B >: A] = self.toBuffer override def toStream: Stream[A] = self.toStream override def toSet[B >: A]: immutable.Set[B] = self.toSet override def toMap[T, U](implicit ev: A <:< (T, U)): immutable.Map[T, U] = self.toMap(ev) + override def toTraversable: Traversable[A] = self.toTraversable + override def toIterator: Iterator[A] = self.toIterator override def mkString(start: String, sep: String, end: String): String = self.mkString(start, sep, end) override def mkString(sep: String): String = self.mkString(sep) override def mkString: String = self.mkString @@ -92,17 +93,6 @@ trait TraversableProxyLike[+A, +Repr <: TraversableLike[A, Repr] with Traversabl override def stringPrefix : String = self.stringPrefix override def view = self.view override def view(from: Int, until: Int): TraversableView[A, Repr] = self.view(from, until) + // This appears difficult to override due to the type of WithFilter. + // override def withFilter(p: A => Boolean): WithFilter = self.withFilter(p) } - -/** Martin to Paul: I'm not sure what the purpose of this class is? I assume it was to make - * sure that TraversableProxyLike has all Traversable methods, but it fails at that - * -private class TraversableProxyLikeConfirmation[+A, +Repr <: TraversableLike[A, Repr] with Traversable[A]] - extends TraversableProxyLike[A, Traversable[A]] - with interfaces.TraversableMethods[A, Traversable[A]] -{ - def self: Repr = repr.asInstanceOf[Repr] - protected[this] def newBuilder = scala.collection.Traversable.newBuilder[A] - // : Builder[A, Repr] -} -*/ diff --git a/src/library/scala/collection/TraversableView.scala b/src/library/scala/collection/TraversableView.scala index 6d7fa70968..9c4f7d8a5d 100644 --- a/src/library/scala/collection/TraversableView.scala +++ b/src/library/scala/collection/TraversableView.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/TraversableViewLike.scala b/src/library/scala/collection/TraversableViewLike.scala index 96fc55497d..ae3f6c0e93 100644 --- a/src/library/scala/collection/TraversableViewLike.scala +++ b/src/library/scala/collection/TraversableViewLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/Addable.scala b/src/library/scala/collection/generic/Addable.scala index ecbd8301b6..8411022404 100644 --- a/src/library/scala/collection/generic/Addable.scala +++ b/src/library/scala/collection/generic/Addable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index 08cf7bd0e0..0d89464f71 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/CanBuildFrom.scala b/src/library/scala/collection/generic/CanBuildFrom.scala index 4136b88cf5..79e352690e 100644 --- a/src/library/scala/collection/generic/CanBuildFrom.scala +++ b/src/library/scala/collection/generic/CanBuildFrom.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/GenericCompanion.scala b/src/library/scala/collection/generic/GenericCompanion.scala index 2a87f8d913..4552867a9f 100644 --- a/src/library/scala/collection/generic/GenericCompanion.scala +++ b/src/library/scala/collection/generic/GenericCompanion.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/GenericSetTemplate.scala b/src/library/scala/collection/generic/GenericSetTemplate.scala index 72dd464851..c381fb84df 100644 --- a/src/library/scala/collection/generic/GenericSetTemplate.scala +++ b/src/library/scala/collection/generic/GenericSetTemplate.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/GenericTraversableTemplate.scala b/src/library/scala/collection/generic/GenericTraversableTemplate.scala index 263e1902a0..54f4a07c10 100644 --- a/src/library/scala/collection/generic/GenericTraversableTemplate.scala +++ b/src/library/scala/collection/generic/GenericTraversableTemplate.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index 80f933a901..3cc0421845 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/ImmutableMapFactory.scala b/src/library/scala/collection/generic/ImmutableMapFactory.scala index 512014ba09..c0d0b1ea8b 100644 --- a/src/library/scala/collection/generic/ImmutableMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableMapFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index d30f57f0ce..790a881468 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 684e7c41f1..e60bf82857 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index f4aef2fcbb..8075fabc01 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/MapFactory.scala b/src/library/scala/collection/generic/MapFactory.scala index 163c289e23..916024e476 100644 --- a/src/library/scala/collection/generic/MapFactory.scala +++ b/src/library/scala/collection/generic/MapFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/MutableMapFactory.scala b/src/library/scala/collection/generic/MutableMapFactory.scala index 76ffc9faeb..a24f41754a 100644 --- a/src/library/scala/collection/generic/MutableMapFactory.scala +++ b/src/library/scala/collection/generic/MutableMapFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/SeqFactory.scala b/src/library/scala/collection/generic/SeqFactory.scala index 1bbe0128da..80515b4e2f 100644 --- a/src/library/scala/collection/generic/SeqFactory.scala +++ b/src/library/scala/collection/generic/SeqFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/SeqForwarder.scala b/src/library/scala/collection/generic/SeqForwarder.scala index e5dbe4b79d..203a1a9459 100644 --- a/src/library/scala/collection/generic/SeqForwarder.scala +++ b/src/library/scala/collection/generic/SeqForwarder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection.generic diff --git a/src/library/scala/collection/generic/SetFactory.scala b/src/library/scala/collection/generic/SetFactory.scala index d43664bd39..2c7554dc5a 100644 --- a/src/library/scala/collection/generic/SetFactory.scala +++ b/src/library/scala/collection/generic/SetFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index cf970e1232..ddd12c05bc 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/Sorted.scala b/src/library/scala/collection/generic/Sorted.scala index aa95c76a88..447df4fe72 100644 --- a/src/library/scala/collection/generic/Sorted.scala +++ b/src/library/scala/collection/generic/Sorted.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/SortedMapFactory.scala b/src/library/scala/collection/generic/SortedMapFactory.scala index 1a11ab69e8..1e960bf52d 100644 --- a/src/library/scala/collection/generic/SortedMapFactory.scala +++ b/src/library/scala/collection/generic/SortedMapFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/SortedSetFactory.scala b/src/library/scala/collection/generic/SortedSetFactory.scala index c9c6ef9b5e..9144cc8fb7 100644 --- a/src/library/scala/collection/generic/SortedSetFactory.scala +++ b/src/library/scala/collection/generic/SortedSetFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/Subtractable.scala b/src/library/scala/collection/generic/Subtractable.scala index b2051d2773..23b01376d1 100644 --- a/src/library/scala/collection/generic/Subtractable.scala +++ b/src/library/scala/collection/generic/Subtractable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/TraversableFactory.scala b/src/library/scala/collection/generic/TraversableFactory.scala index ffc4f16466..d8541d2714 100644 --- a/src/library/scala/collection/generic/TraversableFactory.scala +++ b/src/library/scala/collection/generic/TraversableFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package generic diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index dcba86f3d7..3995a5258b 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection.generic @@ -75,7 +74,8 @@ trait TraversableForwarder[+A] extends Traversable[A] { override def toList: List[A] = underlying.toList override def toIterable: Iterable[A] = underlying.toIterable override def toSeq: Seq[A] = underlying.toSeq - override def toIndexedSeq[B >: A]: mutable.IndexedSeq[B] = underlying.toIndexedSeq + override def toIndexedSeq[B >: A] = underlying.toIndexedSeq + override def toBuffer[B >: A] = underlying.toBuffer override def toStream: Stream[A] = underlying.toStream override def toSet[B >: A]: immutable.Set[B] = underlying.toSet override def toMap[T, U](implicit ev: A <:< (T, U)): immutable.Map[T, U] = underlying.toMap(ev) diff --git a/src/library/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala index 8fa23c3ddf..e7fd5c7f0f 100644 --- a/src/library/scala/collection/immutable/BitSet.scala +++ b/src/library/scala/collection/immutable/BitSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/DefaultMap.scala b/src/library/scala/collection/immutable/DefaultMap.scala index 4f36679119..02b469a467 100755 --- a/src/library/scala/collection/immutable/DefaultMap.scala +++ b/src/library/scala/collection/immutable/DefaultMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: DefaultMap.scala 20028 2009-12-07 11:49:19Z cunei $ package scala.collection diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index b82e50ec06..01ef597d24 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -59,7 +58,7 @@ class HashMap[A, +B] extends Map[A,B] with MapLike[A, B, HashMap[A, B]] { def - (key: A): HashMap[A, B] = removed0(key, computeHash(key), 0) - protected def elemHashCode(key: A) = if (key == null) 0 else key.hashCode() + protected def elemHashCode(key: A) = if (key == null) 0 else key.## protected final def improve(hcode: Int) = { var h: Int = hcode + ~(hcode << 9) diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala index 481b1c3204..08e64d6709 100644 --- a/src/library/scala/collection/immutable/HashSet.scala +++ b/src/library/scala/collection/immutable/HashSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -56,7 +55,7 @@ class HashSet[A] extends Set[A] def - (e: A): HashSet[A] = removed0(e, computeHash(e), 0) - protected def elemHashCode(key: A) = if (key == null) 0 else key.hashCode() + protected def elemHashCode(key: A) = if (key == null) 0 else key.## protected final def improve(hcode: Int) = { var h: Int = hcode + ~(hcode << 9) diff --git a/src/library/scala/collection/immutable/IndexedSeq.scala b/src/library/scala/collection/immutable/IndexedSeq.scala index d3223fd106..3db217a5f3 100644 --- a/src/library/scala/collection/immutable/IndexedSeq.scala +++ b/src/library/scala/collection/immutable/IndexedSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package immutable diff --git a/src/library/scala/collection/immutable/IntMap.scala b/src/library/scala/collection/immutable/IntMap.scala index 90dfa541e3..ba5cd896ac 100644 --- a/src/library/scala/collection/immutable/IntMap.scala +++ b/src/library/scala/collection/immutable/IntMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala index e0ef5ffcc1..fa710d3bfb 100644 --- a/src/library/scala/collection/immutable/Iterable.scala +++ b/src/library/scala/collection/immutable/Iterable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/LinearSeq.scala b/src/library/scala/collection/immutable/LinearSeq.scala index 180844ce79..5858a6ce68 100644 --- a/src/library/scala/collection/immutable/LinearSeq.scala +++ b/src/library/scala/collection/immutable/LinearSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index f9937f6925..26d5948f2c 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala index a88c3a52d5..6721d5bbf0 100644 --- a/src/library/scala/collection/immutable/ListMap.scala +++ b/src/library/scala/collection/immutable/ListMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala index 979fdff552..4268e742b0 100644 --- a/src/library/scala/collection/immutable/ListSet.scala +++ b/src/library/scala/collection/immutable/ListSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index 74cf4a1715..c65fb170cc 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/MapLike.scala b/src/library/scala/collection/immutable/MapLike.scala index 367ffadd43..bbad195687 100644 --- a/src/library/scala/collection/immutable/MapLike.scala +++ b/src/library/scala/collection/immutable/MapLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/MapProxy.scala b/src/library/scala/collection/immutable/MapProxy.scala index a511c6d145..fa0b097070 100644 --- a/src/library/scala/collection/immutable/MapProxy.scala +++ b/src/library/scala/collection/immutable/MapProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -23,8 +22,7 @@ package immutable * @version 2.0, 31/12/2006 * @since 2.8 */ -trait MapProxy[A, +B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] -{ +trait MapProxy[A, +B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] { override def repr = this private def newProxy[B1 >: B](newSelf: Map[A, B1]): MapProxy[A, B1] = new MapProxy[A, B1] { val self = newSelf } @@ -32,11 +30,10 @@ trait MapProxy[A, +B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] override def empty = newProxy(self.empty) override def updated [B1 >: B](key: A, value: B1) = newProxy(self.updated(key, value)) - override def + [B1 >: B](kv: (A, B1)): Map[A, B1] = newProxy(self + kv) - override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = - newProxy(self.+(elem1, elem2, elems: _*)) - override def -(key: A) = newProxy(self - key) + override def + [B1 >: B](kv: (A, B1)): Map[A, B1] = newProxy(self + kv) + override def + [B1 >: B](elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = newProxy(self.+(elem1, elem2, elems: _*)) + override def ++[B1 >: B](xs: TraversableOnce[(A, B1)]) = newProxy(self ++ xs) override def filterKeys(p: A => Boolean) = self.filterKeys(p) override def mapValues[C](f: B => C) = self.mapValues(f) diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala index 67115f7184..db44e9ffa0 100644 --- a/src/library/scala/collection/immutable/NumericRange.scala +++ b/src/library/scala/collection/immutable/NumericRange.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: NumericRange.scala 18987 2009-10-08 18:31:44Z odersky $ package scala.collection package immutable diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala index 2a1b3c110c..9cb1040f95 100644 --- a/src/library/scala/collection/immutable/PagedSeq.scala +++ b/src/library/scala/collection/immutable/PagedSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala index 7ffceb6be8..f5cfd83643 100644 --- a/src/library/scala/collection/immutable/Queue.scala +++ b/src/library/scala/collection/immutable/Queue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Range.scala b/src/library/scala/collection/immutable/Range.scala index 0f20b1ea04..cef043555f 100644 --- a/src/library/scala/collection/immutable/Range.scala +++ b/src/library/scala/collection/immutable/Range.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: Range.scala 18987 2009-10-08 18:31:44Z odersky $ package scala.collection.immutable diff --git a/src/library/scala/collection/immutable/RedBlack.scala b/src/library/scala/collection/immutable/RedBlack.scala index 98a7d67d48..ecd7a65889 100644 --- a/src/library/scala/collection/immutable/RedBlack.scala +++ b/src/library/scala/collection/immutable/RedBlack.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Seq.scala b/src/library/scala/collection/immutable/Seq.scala index 7e41ff7b94..18d3b9b263 100644 --- a/src/library/scala/collection/immutable/Seq.scala +++ b/src/library/scala/collection/immutable/Seq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala index 745b0034e8..30f0d86139 100644 --- a/src/library/scala/collection/immutable/Set.scala +++ b/src/library/scala/collection/immutable/Set.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/SetProxy.scala b/src/library/scala/collection/immutable/SetProxy.scala index d45b2059ff..3c285b2c81 100644 --- a/src/library/scala/collection/immutable/SetProxy.scala +++ b/src/library/scala/collection/immutable/SetProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -22,8 +21,7 @@ package immutable * * @since 2.8 */ -trait SetProxy[A] extends Set[A] with SetProxyLike[A, Set[A]] -{ +trait SetProxy[A] extends Set[A] with SetProxyLike[A, Set[A]] { override def repr = this private def newProxy[B >: A](newSelf: Set[B]): SetProxy[B] = new SetProxy[B] { val self = newSelf } diff --git a/src/library/scala/collection/immutable/SortedMap.scala b/src/library/scala/collection/immutable/SortedMap.scala index 243636e107..2f0749c37a 100644 --- a/src/library/scala/collection/immutable/SortedMap.scala +++ b/src/library/scala/collection/immutable/SortedMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/SortedSet.scala b/src/library/scala/collection/immutable/SortedSet.scala index 6c9433c30c..d0168b7b22 100644 --- a/src/library/scala/collection/immutable/SortedSet.scala +++ b/src/library/scala/collection/immutable/SortedSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Stack.scala b/src/library/scala/collection/immutable/Stack.scala index c90ab379af..58a37a8136 100644 --- a/src/library/scala/collection/immutable/Stack.scala +++ b/src/library/scala/collection/immutable/Stack.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index fbda0b918b..7e363a7e96 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala index f12ddebd08..0c327195a4 100644 --- a/src/library/scala/collection/immutable/StringLike.scala +++ b/src/library/scala/collection/immutable/StringLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/StringOps.scala b/src/library/scala/collection/immutable/StringOps.scala index 2bdbf672cd..8a27a4ad4b 100644 --- a/src/library/scala/collection/immutable/StringOps.scala +++ b/src/library/scala/collection/immutable/StringOps.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala index 8fdb5c7568..bab1a71a97 100644 --- a/src/library/scala/collection/immutable/Traversable.scala +++ b/src/library/scala/collection/immutable/Traversable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/TreeHashMap.scala b/src/library/scala/collection/immutable/TreeHashMap.scala index d991df196f..a7de5bf8d1 100644 --- a/src/library/scala/collection/immutable/TreeHashMap.scala +++ b/src/library/scala/collection/immutable/TreeHashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package immutable @@ -55,7 +54,7 @@ class TreeHashMap[Key, +Value] private (private val underlying : IntMap[AssocMap def empty[V] = TreeHashMap.empty[Key, V] private def hash(key : Key) = { - var h = key.hashCode; + var h = key.## h ^= ((h >>> 20) ^ (h >>> 12)); h ^ (h >>> 7) ^ (h >>> 4); } diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index 61cfe2e13b..07212f8f5c 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 18c65dd373..9eee10f165 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index 6defe66d6f..9faab71158 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package immutable diff --git a/src/library/scala/collection/immutable/WrappedString.scala b/src/library/scala/collection/immutable/WrappedString.scala index 011774e10d..8fe3a2bc5c 100644 --- a/src/library/scala/collection/immutable/WrappedString.scala +++ b/src/library/scala/collection/immutable/WrappedString.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/interfaces/TraversableMethods.scala b/src/library/scala/collection/interfaces/TraversableMethods.scala index 7ec878b3d3..d381b1dc24 100644 --- a/src/library/scala/collection/interfaces/TraversableMethods.scala +++ b/src/library/scala/collection/interfaces/TraversableMethods.scala @@ -41,7 +41,8 @@ trait TraversableMethods[+A, +This <: TraversableLike[A, This] with Traversable[ def toSeq: Seq[A] def toSet[B >: A]: immutable.Set[B] def toStream: Stream[A] - def toIndexedSeq[B >: A]: mutable.IndexedSeq[B] + def toIndexedSeq[B >: A]: immutable.IndexedSeq[B] + def toBuffer[B >: A]: mutable.Buffer[B] // strings def addString(b: StringBuilder): StringBuilder diff --git a/src/library/scala/collection/mutable/AddingBuilder.scala b/src/library/scala/collection/mutable/AddingBuilder.scala index 54137b6a26..5dbf4813bf 100644 --- a/src/library/scala/collection/mutable/AddingBuilder.scala +++ b/src/library/scala/collection/mutable/AddingBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala index ae656d4e09..6412a21531 100644 --- a/src/library/scala/collection/mutable/ArrayBuffer.scala +++ b/src/library/scala/collection/mutable/ArrayBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ArrayBuilder.scala b/src/library/scala/collection/mutable/ArrayBuilder.scala index 0ddd089852..5199fb9051 100644 --- a/src/library/scala/collection/mutable/ArrayBuilder.scala +++ b/src/library/scala/collection/mutable/ArrayBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ArrayLike.scala b/src/library/scala/collection/mutable/ArrayLike.scala index 15cafa6ee7..ceb1377620 100644 --- a/src/library/scala/collection/mutable/ArrayLike.scala +++ b/src/library/scala/collection/mutable/ArrayLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala index 971709ed67..d7072c0661 100644 --- a/src/library/scala/collection/mutable/ArrayOps.scala +++ b/src/library/scala/collection/mutable/ArrayOps.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ArraySeq.scala b/src/library/scala/collection/mutable/ArraySeq.scala index d59cf684b2..1a287ed4cc 100644 --- a/src/library/scala/collection/mutable/ArraySeq.scala +++ b/src/library/scala/collection/mutable/ArraySeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ArrayStack.scala b/src/library/scala/collection/mutable/ArrayStack.scala index 0c6dc7a0e1..fdabead34a 100644 --- a/src/library/scala/collection/mutable/ArrayStack.scala +++ b/src/library/scala/collection/mutable/ArrayStack.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala index da3e95fce7..41977e51a9 100644 --- a/src/library/scala/collection/mutable/BitSet.scala +++ b/src/library/scala/collection/mutable/BitSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala index fbc52ae322..48d877233e 100644 --- a/src/library/scala/collection/mutable/Buffer.scala +++ b/src/library/scala/collection/mutable/Buffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/BufferLike.scala b/src/library/scala/collection/mutable/BufferLike.scala index 15e96b2019..80a8824a3b 100644 --- a/src/library/scala/collection/mutable/BufferLike.scala +++ b/src/library/scala/collection/mutable/BufferLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -54,6 +53,10 @@ import annotation.migration * @define Add Append * @define willNotTerminateInf * @define mayNotTerminateInf + * @define compatMutate + * Note that for backward compatibility reasons, this method + * mutates the collection in place, unlike similar but + * undeprecated methods throughout the collections hierarchy. */ @cloneable trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] @@ -233,17 +236,36 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] } } + + /** This method prepends elements to the buffer and + * returns the same buffer. + * + * $compatMutate + * You are strongly recommended to use `++=:` instead. + * + * @param xs elements to prepend + * @return this buffer + */ @deprecated("use ++=: instead") - final def ++:(iter: Traversable[A]): This = ++=:(iter) + final def ++:(xs: Traversable[A]): This = ++=:(xs) + /** This method prepends elements to the buffer and + * returns the same buffer. + * + * $compatMutate + * You are strongly recommended to use `+=:` instead. + * + * @param xs elements to prepend + * @return this buffer + */ @deprecated("use `+=:' instead") final def +:(elem: A): This = +=:(elem) /** Adds a single element to this collection and returns - * the collection itself. Note that for backward compatibility - * reasons, this method mutates the collection in place, unlike - * similar but undeprecated methods throughout the collections - * hierarchy. You are strongly recommended to use '+=' instead. + * the collection itself. + * + * $compatMutate + * You are strongly recommended to use '+=' instead. * * @param elem the element to add. */ @@ -252,11 +274,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] def + (elem: A): This = { +=(elem); repr } /** Adds two or more elements to this collection and returns - * the collection itself. Note that for backward compatibility - * reasons, this method mutates the collection in place, unlike - * all similar methods throughout the collections hierarchy. - * similar but undeprecated methods throughout the collections - * hierarchy. You are strongly recommended to use '++=' instead. + * the collection itself. + * + * $compatMutate + * You are strongly recommended to use '++=' instead. * * @param elem1 the first element to add. * @param elem2 the second element to add. @@ -269,10 +290,11 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] repr } - /** Adds a number of elements provided by a traversable object and returns - * either the collection itself. + /** Creates a new collection containing both the elements of this collection and the provided + * traversable object. * * @param xs the traversable object. + * @return a new collection consisting of all the elements of this collection and `xs`. */ @migration(2, 8, "As of 2.8, ++ always creates a new collection, even on Buffers.\n"+ @@ -280,10 +302,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] ) def ++(xs: TraversableOnce[A]): This = clone() ++= xs - /** Removes a single element from this collection and returns - * the collection itself. + /** Creates a new collection with all the elements of this collection except `elem`. * * @param elem the element to remove. + * @return a new collection consisting of all the elements of this collection except `elem`. */ @migration(2, 8, "As of 2.8, - always creates a new collection, even on Buffers.\n"+ @@ -291,12 +313,14 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] ) override def -(elem: A): This = clone() -= elem - /** Removes two or more elements from this collection and returns - * the collection itself. + /** Creates a new collection with all the elements of this collection except the two + * or more specified elements. * * @param elem1 the first element to remove. * @param elem2 the second element to remove. * @param elems the remaining elements to remove. + * @return a new collection consisting of all the elements of this collection except + * `elem1`, `elem2` and those in `elems`. */ @migration(2, 8, "As of 2.8, - always creates a new collection, even on Buffers.\n"+ @@ -304,10 +328,12 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] ) override def -(elem1: A, elem2: A, elems: A*): This = clone() -= elem1 -= elem2 --= elems - /** Removes a number of elements provided by a Traversable object and returns - * the collection itself. + /** Creates a new collection with all the elements of this collection except those + * provided by the specified traversable object. * - * @param iter the Traversable object. + * @param xs the traversable object. + * @return a new collection with all the elements of this collection except + * those in `xs` */ @migration(2, 8, "As of 2.8, -- always creates a new collection, even on Buffers.\n"+ diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala index 983572452b..7adbb8ee3f 100644 --- a/src/library/scala/collection/mutable/BufferProxy.scala +++ b/src/library/scala/collection/mutable/BufferProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Builder.scala b/src/library/scala/collection/mutable/Builder.scala index 0c8bb79f83..701e39e36f 100644 --- a/src/library/scala/collection/mutable/Builder.scala +++ b/src/library/scala/collection/mutable/Builder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/Cloneable.scala b/src/library/scala/collection/mutable/Cloneable.scala index 099c6a68b4..b77172ae16 100644 --- a/src/library/scala/collection/mutable/Cloneable.scala +++ b/src/library/scala/collection/mutable/Cloneable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/CloneableCollection.scala b/src/library/scala/collection/mutable/CloneableCollection.scala index a88d85965f..625b849821 100644 --- a/src/library/scala/collection/mutable/CloneableCollection.scala +++ b/src/library/scala/collection/mutable/CloneableCollection.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/DefaultEntry.scala b/src/library/scala/collection/mutable/DefaultEntry.scala index 553fb3c678..5144f4f590 100644 --- a/src/library/scala/collection/mutable/DefaultEntry.scala +++ b/src/library/scala/collection/mutable/DefaultEntry.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala index d22b20e10c..226a09697a 100644 --- a/src/library/scala/collection/mutable/DefaultMapModel.scala +++ b/src/library/scala/collection/mutable/DefaultMapModel.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala index d8b8278c74..e702301703 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedList.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedList.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/DoubleLinkedListLike.scala b/src/library/scala/collection/mutable/DoubleLinkedListLike.scala index b908a1802b..9112ade5af 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedListLike.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedListLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala index 05eafbc811..d46c59173b 100644 --- a/src/library/scala/collection/mutable/FlatHashTable.scala +++ b/src/library/scala/collection/mutable/FlatHashTable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala index 215e0323b3..1d605fe444 100644 --- a/src/library/scala/collection/mutable/HashMap.scala +++ b/src/library/scala/collection/mutable/HashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala index 41f9a17dd6..ebfeaa29ad 100644 --- a/src/library/scala/collection/mutable/HashSet.scala +++ b/src/library/scala/collection/mutable/HashSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala index 04b5e5e3a1..b924a38dde 100644 --- a/src/library/scala/collection/mutable/HashTable.scala +++ b/src/library/scala/collection/mutable/HashTable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -229,7 +228,7 @@ trait HashTable[A] { protected def elemEquals(key1: A, key2: A): Boolean = (key1 == key2) - protected def elemHashCode(key: A) = if (key == null) 0 else key.hashCode() + protected def elemHashCode(key: A) = if (key == null) 0 else key.## protected final def improve(hcode: Int) = { var h: Int = hcode + ~(hcode << 9) diff --git a/src/library/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala index ffa3d6481a..d480c4342b 100644 --- a/src/library/scala/collection/mutable/History.scala +++ b/src/library/scala/collection/mutable/History.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala index c2b7cfd2b8..24f11e105f 100644 --- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala +++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala index a56f65e379..4560d01d4d 100644 --- a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala +++ b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/IndexedSeq.scala b/src/library/scala/collection/mutable/IndexedSeq.scala index 06a6230c6b..13788671c2 100644 --- a/src/library/scala/collection/mutable/IndexedSeq.scala +++ b/src/library/scala/collection/mutable/IndexedSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/IndexedSeqLike.scala b/src/library/scala/collection/mutable/IndexedSeqLike.scala index 5e932effe0..f08353ef3d 100644 --- a/src/library/scala/collection/mutable/IndexedSeqLike.scala +++ b/src/library/scala/collection/mutable/IndexedSeqLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/IndexedSeqOptimized.scala b/src/library/scala/collection/mutable/IndexedSeqOptimized.scala index 134cc2a8ea..293588af7d 100755 --- a/src/library/scala/collection/mutable/IndexedSeqOptimized.scala +++ b/src/library/scala/collection/mutable/IndexedSeqOptimized.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: IndexedSeqLike.scala 20129 2009-12-14 17:12:17Z odersky $ package scala.collection diff --git a/src/library/scala/collection/mutable/IndexedSeqView.scala b/src/library/scala/collection/mutable/IndexedSeqView.scala index 8d72ac2c49..966a537bf1 100644 --- a/src/library/scala/collection/mutable/IndexedSeqView.scala +++ b/src/library/scala/collection/mutable/IndexedSeqView.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/LazyBuilder.scala b/src/library/scala/collection/mutable/LazyBuilder.scala index 91cf8f2ad9..db6ca19f2b 100644 --- a/src/library/scala/collection/mutable/LazyBuilder.scala +++ b/src/library/scala/collection/mutable/LazyBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/LinearSeq.scala b/src/library/scala/collection/mutable/LinearSeq.scala index 7567504890..08a8c8282c 100644 --- a/src/library/scala/collection/mutable/LinearSeq.scala +++ b/src/library/scala/collection/mutable/LinearSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/LinkedEntry.scala b/src/library/scala/collection/mutable/LinkedEntry.scala index 5d591058e8..667d45b637 100644 --- a/src/library/scala/collection/mutable/LinkedEntry.scala +++ b/src/library/scala/collection/mutable/LinkedEntry.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index 97961ccd9c..be6442561c 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala index e91b03048d..922ff25276 100644 --- a/src/library/scala/collection/mutable/LinkedHashSet.scala +++ b/src/library/scala/collection/mutable/LinkedHashSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable @@ -69,7 +68,7 @@ class LinkedHashSet[A] extends Set[A] clearTable() } - override def iterator = ordered.iterator + override def iterator: Iterator[A] = ordered.iterator override def foreach[U](f: A => U) = ordered foreach f diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala index a72acf1438..538e2f1ba5 100644 --- a/src/library/scala/collection/mutable/LinkedList.scala +++ b/src/library/scala/collection/mutable/LinkedList.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/LinkedListLike.scala b/src/library/scala/collection/mutable/LinkedListLike.scala index 4f1a878e02..ca904e0a24 100644 --- a/src/library/scala/collection/mutable/LinkedListLike.scala +++ b/src/library/scala/collection/mutable/LinkedListLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index 7ebbf7b4da..415096ed89 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala index 09b0c6459b..3aa6f9c753 100644 --- a/src/library/scala/collection/mutable/ListMap.scala +++ b/src/library/scala/collection/mutable/ListMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala index 6c42bad0e9..287069d04b 100644 --- a/src/library/scala/collection/mutable/Map.scala +++ b/src/library/scala/collection/mutable/Map.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/MapBuilder.scala b/src/library/scala/collection/mutable/MapBuilder.scala index 75fb48abd6..4e5b6d1ef7 100644 --- a/src/library/scala/collection/mutable/MapBuilder.scala +++ b/src/library/scala/collection/mutable/MapBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/MapLike.scala b/src/library/scala/collection/mutable/MapLike.scala index f9c0f7232c..11677aca43 100644 --- a/src/library/scala/collection/mutable/MapLike.scala +++ b/src/library/scala/collection/mutable/MapLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -80,9 +79,13 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] */ override def updated[B1 >: B](key: A, value: B1): Map[A, B1] = this + ((key, value)) - /** Add a new key/value mapping and return the map itself. + /** Creates a new map containing a new key/value mapping and all the key/value mappings + * of this map. + * + * Mapping `kv` will override existing mappings from this map with the same key. * * @param kv the key/value mapping to be added + * @return a new map containing mappings of this map and the mapping `kv`. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To add an element as a\n"+ @@ -90,12 +93,15 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] ) def + [B1 >: B] (kv: (A, B1)): Map[A, B1] = clone().asInstanceOf[Map[A, B1]] += kv - /** Adds two or more key/value mappings and return the map itself. - * with the added elements. + /** Creates a new map containing two or more key/value mappings and all the key/value + * mappings of this map. + * + * Specified mappings will override existing mappings from this map with the same keys. * * @param elem1 the first element to add. * @param elem2 the second element to add. * @param elems the remaining elements to add. + * @return a new map containing mappings of this map and two or more specified mappings. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To add an element as a\n"+ @@ -104,12 +110,13 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] override def + [B1 >: B] (elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *): Map[A, B1] = clone().asInstanceOf[Map[A, B1]] += elem1 += elem2 ++= elems - /** Adds a number of elements provided by a traversable object - * via its `iterator` method and returns - * either the collection itself (if it is mutable), or a new collection - * with the added elements. + /** Creates a new map containing the key/value mappings provided by the specified traversable object + * and all the key/value mappings of this map. * - * @param iter the traversable object. + * Note that existing mappings from this map with the same key as those in `xs` will be overriden. + * + * @param xs the traversable object. + * @return a new map containing mappings of this map and those provided by `xs`. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To add the elements as a\n"+ @@ -136,8 +143,11 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] */ def -= (key: A): this.type - /** Delete a key from this map if it is present and return the map itself. + /** Creates a new map with all the key/value mappings of this map except the key/value mapping + * with the specified key. + * * @param key the key to be removed + * @return a new map with all the mappings of this map except that with a key `key`. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To remove an element as a\n"+ @@ -205,12 +215,14 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] */ def result: This = repr - /** Removes two or more elements from this collection and returns - * the collection itself. + /** Creates a new map with all the key/value mappings of this map except mappings with keys + * equal to any of the two or more specified keys. * * @param elem1 the first element to remove. * @param elem2 the second element to remove. * @param elems the remaining elements to remove. + * @return a new map containing all the mappings of this map except mappings + * with a key equal to `elem1`, `elem2` or any of `elems`. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To remove an element as a\n"+ @@ -219,10 +231,12 @@ trait MapLike[A, B, +This <: MapLike[A, B, This] with Map[A, B]] override def -(elem1: A, elem2: A, elems: A*): This = clone() -= elem1 -= elem2 --= elems - /** Removes a number of elements provided by a Traversable object and returns - * the collection itself. + /** Creates a new map with all the key/value mappings of this map except mappings with keys + * equal to any of those provided by the specified traversable object. * - * @param iter the Traversable object. + * @param xs the traversable object. + * @return a new map with all the key/value mappings of this map except mappings + * with a key equal to a key from `xs`. */ @migration(2, 8, "As of 2.8, this operation creates a new map. To remove the elements as a\n"+ diff --git a/src/library/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala index 7fbb016a57..c39d14b52e 100644 --- a/src/library/scala/collection/mutable/MapProxy.scala +++ b/src/library/scala/collection/mutable/MapProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -23,17 +22,17 @@ package mutable * @version 2.0, 31/12/2006 * @since 1 */ -trait MapProxy[A, B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] -{ +trait MapProxy[A, B] extends Map[A, B] with MapProxyLike[A, B, Map[A, B]] { private def newProxy[B1 >: B](newSelf: Map[A, B1]): MapProxy[A, B1] = new MapProxy[A, B1] { val self = newSelf } override def repr = this override def empty: MapProxy[A, B] = new MapProxy[A, B] { val self = MapProxy.this.self.empty } + override def updated [B1 >: B](key: A, value: B1) = newProxy(self.updated(key, value)) override def + [B1 >: B] (kv: (A, B1)): Map[A, B1] = newProxy(self + kv) override def + [B1 >: B] (elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *) = newProxy(self.+(elem1, elem2, elems: _*)) - + override def ++[B1 >: B](xs: TraversableOnce[(A, B1)]) = newProxy(self ++ xs) override def -(key: A) = newProxy(self - key) override def += (kv: (A, B)) = { self += kv ; this } diff --git a/src/library/scala/collection/mutable/MultiMap.scala b/src/library/scala/collection/mutable/MultiMap.scala index 39c51ef5ad..2f547b2c51 100644 --- a/src/library/scala/collection/mutable/MultiMap.scala +++ b/src/library/scala/collection/mutable/MultiMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala index 4b6d727c34..65c973c9ec 100644 --- a/src/library/scala/collection/mutable/MutableList.scala +++ b/src/library/scala/collection/mutable/MutableList.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -56,6 +55,13 @@ class MutableList[A] extends LinearSeq[A] tl } + /** Prepends a single element to this list. This operation takes constant + * time. + * @param elem the element to prepend. + * @return this $coll. + */ + def +=: (elem: A): this.type = { prependElem(elem); this } + /** Returns the length of this list. */ override def length: Int = len diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala index 8881e78ebc..3552e1262d 100644 --- a/src/library/scala/collection/mutable/ObservableBuffer.scala +++ b/src/library/scala/collection/mutable/ObservableBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala index 0cde1b2288..fdc5addd53 100644 --- a/src/library/scala/collection/mutable/ObservableMap.scala +++ b/src/library/scala/collection/mutable/ObservableMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala index 1f2f1789f9..e71156cdb7 100644 --- a/src/library/scala/collection/mutable/ObservableSet.scala +++ b/src/library/scala/collection/mutable/ObservableSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/OpenHashMap.scala b/src/library/scala/collection/mutable/OpenHashMap.scala index 4ecfe0e762..b10b88049e 100644 --- a/src/library/scala/collection/mutable/OpenHashMap.scala +++ b/src/library/scala/collection/mutable/OpenHashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -92,7 +91,7 @@ extends Map[Key, Value] /** Returns a mangled hash code of the provided key. */ protected def hashOf(key : Key) = { - var h = key.hashCode; + var h = key.## h ^= ((h >>> 20) ^ (h >>> 12)); h ^ (h >>> 7) ^ (h >>> 4); } diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala index 37e1b0ccae..acdfc03597 100644 --- a/src/library/scala/collection/mutable/PriorityQueue.scala +++ b/src/library/scala/collection/mutable/PriorityQueue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala index f99755128f..f1b25ab18f 100644 --- a/src/library/scala/collection/mutable/PriorityQueueProxy.scala +++ b/src/library/scala/collection/mutable/PriorityQueueProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/Publisher.scala b/src/library/scala/collection/mutable/Publisher.scala index f91864f974..2b89130368 100644 --- a/src/library/scala/collection/mutable/Publisher.scala +++ b/src/library/scala/collection/mutable/Publisher.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala index 3132e2f422..ae6c60d1d0 100644 --- a/src/library/scala/collection/mutable/Queue.scala +++ b/src/library/scala/collection/mutable/Queue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala index 6adb3d490b..9d93933695 100644 --- a/src/library/scala/collection/mutable/QueueProxy.scala +++ b/src/library/scala/collection/mutable/QueueProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala index 96d24136cf..96ac7800ab 100644 --- a/src/library/scala/collection/mutable/ResizableArray.scala +++ b/src/library/scala/collection/mutable/ResizableArray.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/RevertibleHistory.scala b/src/library/scala/collection/mutable/RevertibleHistory.scala index b16577486a..87b4efa5f2 100644 --- a/src/library/scala/collection/mutable/RevertibleHistory.scala +++ b/src/library/scala/collection/mutable/RevertibleHistory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Seq.scala b/src/library/scala/collection/mutable/Seq.scala index 679cc24389..eff387353e 100644 --- a/src/library/scala/collection/mutable/Seq.scala +++ b/src/library/scala/collection/mutable/Seq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala index bebf66157a..066eecc034 100644 --- a/src/library/scala/collection/mutable/Set.scala +++ b/src/library/scala/collection/mutable/Set.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SetBuilder.scala b/src/library/scala/collection/mutable/SetBuilder.scala index b8903372bd..6cab092d06 100644 --- a/src/library/scala/collection/mutable/SetBuilder.scala +++ b/src/library/scala/collection/mutable/SetBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/SetLike.scala b/src/library/scala/collection/mutable/SetLike.scala index 9dbfaf6d5e..78e82eb06b 100644 --- a/src/library/scala/collection/mutable/SetLike.scala +++ b/src/library/scala/collection/mutable/SetLike.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection @@ -47,6 +46,10 @@ import scala.annotation.migration * }}} * It is also good idea to override methods `foreach` and * `size` for efficiency. + * @define addDuplicates + * Note that duplicates (elements for which `equals` yields true) will be + * removed, but it is not specified whether it will be an element of this + * set or a newly added element. * @define coll mutable set * @define Coll mutable.Set */ @@ -132,10 +135,12 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] */ def result: This = repr - /** Adds a single element to this collection and returns - * the collection itself. + /** Creates a new set consisting of all the elements of this set and `elem`. + * + * $addDuplicates * * @param elem the element to add. + * @return a new set consisting of elements of this set and `elem`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To add an element as a\n"+ @@ -143,12 +148,16 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] ) override def + (elem: A): This = clone() += elem - /** Adds two or more elements to this collection and returns - * the collection itself. + /** Creates a new set consisting of all the elements of this set and two or more + * specified elements. + * + * $addDuplicates * * @param elem1 the first element to add. * @param elem2 the second element to add. * @param elems the remaining elements to add. + * @return a new set consisting of all the elements of this set, `elem1`, + * `elem2` and those in `elems`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To add the elements as a\n"+ @@ -157,10 +166,13 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] override def + (elem1: A, elem2: A, elems: A*): This = clone() += elem1 += elem2 ++= elems - /** Adds a number of elements provided by a traversable object and returns - * either the collection itself. + /** Creates a new set consisting of all the elements of this set and those + * provided by the specified traversable object. + * + * $addDuplicates * - * @param iter the iterable object. + * @param xs the traversable object. + * @return a new set cconsisting of elements of this set and those in `xs`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To add the elements as a\n"+ @@ -168,10 +180,10 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] ) override def ++(xs: TraversableOnce[A]): This = clone() ++= xs - /** Removes a single element from this collection and returns - * the collection itself. + /** Creates a new set consisting of all the elements of this set except `elem`. * * @param elem the element to remove. + * @return a new set consisting of all the elements of this set except `elem`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To remove the element as a\n"+ @@ -179,12 +191,14 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] ) override def -(elem: A): This = clone() -= elem - /** Removes two or more elements from this collection and returns - * the collection itself. + /** Creates a new set consisting of all the elements of this set except the two + * or more specified elements. * * @param elem1 the first element to remove. * @param elem2 the second element to remove. * @param elems the remaining elements to remove. + * @return a new set consisting of all the elements of this set except + * `elem1`, `elem2` and `elems`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To remove the elements as a\n"+ @@ -193,10 +207,12 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]] override def -(elem1: A, elem2: A, elems: A*): This = clone() -= elem1 -= elem2 --= elems - /** Removes a number of elements provided by a Traversable object and returns - * the collection itself. + /** Creates a new set consisting of all the elements of this set except those + * provided by the specified traversable object. * - * @param iter the Traversable object. + * @param xs the traversable object. + * @return a new set consisting of all the elements of this set except + * elements from `xs`. */ @migration(2, 8, "As of 2.8, this operation creates a new set. To remove the elements as a\n"+ diff --git a/src/library/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala index 85a4dfdcbc..b1a6c48ffd 100644 --- a/src/library/scala/collection/mutable/SetProxy.scala +++ b/src/library/scala/collection/mutable/SetProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable @@ -20,8 +19,7 @@ package mutable * @version 1.1, 09/05/2004 * @since 1 */ -trait SetProxy[A] extends Set[A] with SetProxyLike[A, Set[A]] -{ +trait SetProxy[A] extends Set[A] with SetProxyLike[A, Set[A]] { override def repr = this override def empty = new SetProxy[A] { val self = SetProxy.this.self.empty } override def + (elem: A) = { self += elem ; this } diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala index 72e2f928c8..e678f7fa5c 100644 --- a/src/library/scala/collection/mutable/Stack.scala +++ b/src/library/scala/collection/mutable/Stack.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala index 740afdfd7d..b0af178382 100644 --- a/src/library/scala/collection/mutable/StackProxy.scala +++ b/src/library/scala/collection/mutable/StackProxy.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/StringBuilder.scala b/src/library/scala/collection/mutable/StringBuilder.scala index 9673e59486..8bf1aca6b4 100644 --- a/src/library/scala/collection/mutable/StringBuilder.scala +++ b/src/library/scala/collection/mutable/StringBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Subscriber.scala b/src/library/scala/collection/mutable/Subscriber.scala index 8992b7dddf..a89745b107 100644 --- a/src/library/scala/collection/mutable/Subscriber.scala +++ b/src/library/scala/collection/mutable/Subscriber.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala index 7bdbd5e520..817657af53 100644 --- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala +++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala index 08c370ce90..bf294e548e 100644 --- a/src/library/scala/collection/mutable/SynchronizedMap.scala +++ b/src/library/scala/collection/mutable/SynchronizedMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala index bc70e35993..41eb1823ae 100644 --- a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala +++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala index 7a0f9f5f6f..95939dd8f2 100644 --- a/src/library/scala/collection/mutable/SynchronizedQueue.scala +++ b/src/library/scala/collection/mutable/SynchronizedQueue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala index 904da541c2..bd5e42a57c 100644 --- a/src/library/scala/collection/mutable/SynchronizedSet.scala +++ b/src/library/scala/collection/mutable/SynchronizedSet.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection package mutable diff --git a/src/library/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala index 9109d2ef5d..bb8558ec36 100644 --- a/src/library/scala/collection/mutable/SynchronizedStack.scala +++ b/src/library/scala/collection/mutable/SynchronizedStack.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Traversable.scala b/src/library/scala/collection/mutable/Traversable.scala index 871e3a825d..ea49dd68a7 100644 --- a/src/library/scala/collection/mutable/Traversable.scala +++ b/src/library/scala/collection/mutable/Traversable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/Undoable.scala b/src/library/scala/collection/mutable/Undoable.scala index 45d3121bd3..1a7f67acab 100644 --- a/src/library/scala/collection/mutable/Undoable.scala +++ b/src/library/scala/collection/mutable/Undoable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/WeakHashMap.scala b/src/library/scala/collection/mutable/WeakHashMap.scala index 929c3f8fed..75bc317f4a 100644 --- a/src/library/scala/collection/mutable/WeakHashMap.scala +++ b/src/library/scala/collection/mutable/WeakHashMap.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/WrappedArray.scala b/src/library/scala/collection/mutable/WrappedArray.scala index b9e803d8dc..6aea49ec9d 100644 --- a/src/library/scala/collection/mutable/WrappedArray.scala +++ b/src/library/scala/collection/mutable/WrappedArray.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala index 012a0be862..625f2d831f 100644 --- a/src/library/scala/collection/mutable/WrappedArrayBuilder.scala +++ b/src/library/scala/collection/mutable/WrappedArrayBuilder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/script/Location.scala b/src/library/scala/collection/script/Location.scala index e7c2955b83..55ee613877 100644 --- a/src/library/scala/collection/script/Location.scala +++ b/src/library/scala/collection/script/Location.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/script/Message.scala b/src/library/scala/collection/script/Message.scala index 4c1c2e9f70..bf813a4d38 100644 --- a/src/library/scala/collection/script/Message.scala +++ b/src/library/scala/collection/script/Message.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/collection/script/Scriptable.scala b/src/library/scala/collection/script/Scriptable.scala index a4332b19fc..ccee3c43a9 100644 --- a/src/library/scala/collection/script/Scriptable.scala +++ b/src/library/scala/collection/script/Scriptable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.collection diff --git a/src/library/scala/compat/Platform.scala b/src/library/scala/compat/Platform.scala index 7580d2cc0e..b6d7de2c56 100644 --- a/src/library/scala/compat/Platform.scala +++ b/src/library/scala/compat/Platform.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.compat diff --git a/src/library/scala/concurrent/Channel.scala b/src/library/scala/concurrent/Channel.scala index 147deac53e..865d0187f6 100644 --- a/src/library/scala/concurrent/Channel.scala +++ b/src/library/scala/concurrent/Channel.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/DelayedLazyVal.scala b/src/library/scala/concurrent/DelayedLazyVal.scala index 7c5d43e70c..fbf799a6a6 100644 --- a/src/library/scala/concurrent/DelayedLazyVal.scala +++ b/src/library/scala/concurrent/DelayedLazyVal.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/JavaConversions.scala b/src/library/scala/concurrent/JavaConversions.scala index 1a4d61c4fb..c6cff19c28 100644 --- a/src/library/scala/concurrent/JavaConversions.scala +++ b/src/library/scala/concurrent/JavaConversions.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/Lock.scala b/src/library/scala/concurrent/Lock.scala index 584ce7d187..678d6fe307 100644 --- a/src/library/scala/concurrent/Lock.scala +++ b/src/library/scala/concurrent/Lock.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/MailBox.scala b/src/library/scala/concurrent/MailBox.scala index c23bbf1c80..7d2b2761d5 100644 --- a/src/library/scala/concurrent/MailBox.scala +++ b/src/library/scala/concurrent/MailBox.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/ManagedBlocker.scala b/src/library/scala/concurrent/ManagedBlocker.scala index dfda9ae487..68781a893c 100644 --- a/src/library/scala/concurrent/ManagedBlocker.scala +++ b/src/library/scala/concurrent/ManagedBlocker.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/SyncChannel.scala b/src/library/scala/concurrent/SyncChannel.scala index a1579afb6a..1c025bcfc3 100644 --- a/src/library/scala/concurrent/SyncChannel.scala +++ b/src/library/scala/concurrent/SyncChannel.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala index 621bbe6803..46dc415e1f 100644 --- a/src/library/scala/concurrent/SyncVar.scala +++ b/src/library/scala/concurrent/SyncVar.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/TIMEOUT.scala b/src/library/scala/concurrent/TIMEOUT.scala index e6e9ce781f..cd2d861305 100644 --- a/src/library/scala/concurrent/TIMEOUT.scala +++ b/src/library/scala/concurrent/TIMEOUT.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/TaskRunner.scala b/src/library/scala/concurrent/TaskRunner.scala index f7d3002b83..b8791cf249 100644 --- a/src/library/scala/concurrent/TaskRunner.scala +++ b/src/library/scala/concurrent/TaskRunner.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/TaskRunners.scala b/src/library/scala/concurrent/TaskRunners.scala index 04d915bcd8..4936240f2f 100644 --- a/src/library/scala/concurrent/TaskRunners.scala +++ b/src/library/scala/concurrent/TaskRunners.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/ThreadPoolRunner.scala b/src/library/scala/concurrent/ThreadPoolRunner.scala index 9ad33f4c6c..74f376e87e 100644 --- a/src/library/scala/concurrent/ThreadPoolRunner.scala +++ b/src/library/scala/concurrent/ThreadPoolRunner.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/ThreadRunner.scala b/src/library/scala/concurrent/ThreadRunner.scala index 5cfc076699..2eb05840f4 100644 --- a/src/library/scala/concurrent/ThreadRunner.scala +++ b/src/library/scala/concurrent/ThreadRunner.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/ops.scala b/src/library/scala/concurrent/ops.scala index 49be1b882c..72e292d88c 100644 --- a/src/library/scala/concurrent/ops.scala +++ b/src/library/scala/concurrent/ops.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala index b9f1617d6c..dab9db98ff 100644 --- a/src/library/scala/concurrent/pilib.scala +++ b/src/library/scala/concurrent/pilib.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.concurrent diff --git a/src/library/scala/deprecated.scala b/src/library/scala/deprecated.scala index 79abe6a0ee..50a6601d00 100644 --- a/src/library/scala/deprecated.scala +++ b/src/library/scala/deprecated.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/inline.scala b/src/library/scala/inline.scala index 119f56ea93..1e91be2b17 100644 --- a/src/library/scala/inline.scala +++ b/src/library/scala/inline.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/io/BufferedSource.scala b/src/library/scala/io/BufferedSource.scala index 6b7afd0955..b4e0389e12 100644 --- a/src/library/scala/io/BufferedSource.scala +++ b/src/library/scala/io/BufferedSource.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/io/BytePickle.scala b/src/library/scala/io/BytePickle.scala index 77f66bbc49..3a51f2e0b8 100644 --- a/src/library/scala/io/BytePickle.scala +++ b/src/library/scala/io/BytePickle.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/io/Codec.scala b/src/library/scala/io/Codec.scala index 660a1553a4..2b74c67134 100644 --- a/src/library/scala/io/Codec.scala +++ b/src/library/scala/io/Codec.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/io/Position.scala b/src/library/scala/io/Position.scala index 0e5d4ffb7f..b0aaf228f2 100644 --- a/src/library/scala/io/Position.scala +++ b/src/library/scala/io/Position.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/io/Source.scala b/src/library/scala/io/Source.scala index e88bfd0bf1..5b279d720c 100644 --- a/src/library/scala/io/Source.scala +++ b/src/library/scala/io/Source.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/io/UTF8Codec.scala b/src/library/scala/io/UTF8Codec.scala index 1a9d0f50ce..41563a9d44 100644 --- a/src/library/scala/io/UTF8Codec.scala +++ b/src/library/scala/io/UTF8Codec.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.io diff --git a/src/library/scala/math/BigDecimal.scala b/src/library/scala/math/BigDecimal.scala index 67604e8b78..e1d44862e4 100644 --- a/src/library/scala/math/BigDecimal.scala +++ b/src/library/scala/math/BigDecimal.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math @@ -14,6 +13,8 @@ import java.{ lang => jl } import java.math.{ MathContext, BigDecimal => BigDec } import scala.collection.immutable.NumericRange +import annotation.migration + /** * @author Stephane Micheloud * @version 1.0 @@ -172,14 +173,15 @@ extends ScalaNumber with ScalaNumericConversions */ override def hashCode(): Int = if (isWhole) unifiedPrimitiveHashcode - else doubleValue.hashCode() + else doubleValue.## /** Compares this BigDecimal with the specified value for equality. */ override def equals (that: Any): Boolean = that match { - case that: BigDecimal => this equals that - case that: BigInt => this.toBigIntExact exists (that equals _) - case x => (this <= BigDecimal.MaxLong && this >= BigDecimal.MinLong) && unifiedPrimitiveEquals(x) + case that: BigDecimal => this equals that + case that: BigInt => this.toBigIntExact exists (that equals _) + case _: Float | _: Double => unifiedPrimitiveEquals(that) + case x => isWhole && this <= BigDecimal.MaxLong && this >= BigDecimal.MinLong && unifiedPrimitiveEquals(x) } protected[math] def isWhole = (this remainder 1) == BigDecimal(0) @@ -250,6 +252,10 @@ extends ScalaNumber with ScalaNumericConversions */ def remainder (that: BigDecimal): BigDecimal = this.bigDecimal.remainder(that.bigDecimal, mc) + /** Remainder after dividing this by that. + */ + def % (that: BigDecimal): BigDecimal = this.remainder(that) + /** Returns a BigDecimal whose value is this ** n. */ def pow (n: Int): BigDecimal = this.bigDecimal.pow(n, mc) diff --git a/src/library/scala/math/BigInt.scala b/src/library/scala/math/BigInt.scala index f0988f2934..79b377bc6c 100644 --- a/src/library/scala/math/BigInt.scala +++ b/src/library/scala/math/BigInt.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math @@ -117,7 +116,7 @@ class BigInt(val bigInteger: BigInteger) extends ScalaNumber with ScalaNumericCo /** Returns the hash code for this BigInt. */ override def hashCode(): Int = if (this >= BigInt.MinLong && this <= BigInt.MaxLong) unifiedPrimitiveHashcode - else bigInteger.hashCode + else bigInteger.## /** Compares this BigInt with the specified value for equality. */ diff --git a/src/library/scala/math/Equiv.scala b/src/library/scala/math/Equiv.scala index ee1e19fe50..a45b51af49 100644 --- a/src/library/scala/math/Equiv.scala +++ b/src/library/scala/math/Equiv.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/Fractional.scala b/src/library/scala/math/Fractional.scala index 7c888624d5..2205aded7f 100644 --- a/src/library/scala/math/Fractional.scala +++ b/src/library/scala/math/Fractional.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/Integral.scala b/src/library/scala/math/Integral.scala index 206e82c201..2914c9005b 100644 --- a/src/library/scala/math/Integral.scala +++ b/src/library/scala/math/Integral.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/Numeric.scala b/src/library/scala/math/Numeric.scala index 65f213a08e..673461132f 100644 --- a/src/library/scala/math/Numeric.scala +++ b/src/library/scala/math/Numeric.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/Ordered.scala b/src/library/scala/math/Ordered.scala index 5de733966e..30246c7b16 100644 --- a/src/library/scala/math/Ordered.scala +++ b/src/library/scala/math/Ordered.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/Ordering.scala b/src/library/scala/math/Ordering.scala index 04c2d96aba..4527e18338 100644 --- a/src/library/scala/math/Ordering.scala +++ b/src/library/scala/math/Ordering.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/PartialOrdering.scala b/src/library/scala/math/PartialOrdering.scala index 94a54b68e1..e40a3d29ad 100644 --- a/src/library/scala/math/PartialOrdering.scala +++ b/src/library/scala/math/PartialOrdering.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/PartiallyOrdered.scala b/src/library/scala/math/PartiallyOrdered.scala index d31497ad3b..2e863ec088 100644 --- a/src/library/scala/math/PartiallyOrdered.scala +++ b/src/library/scala/math/PartiallyOrdered.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.math diff --git a/src/library/scala/math/ScalaNumber.java b/src/library/scala/math/ScalaNumber.java index 8b0fcbd7ec..4aa920496c 100644 --- a/src/library/scala/math/ScalaNumber.java +++ b/src/library/scala/math/ScalaNumber.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: ScalaNumber.java 19428 2009-11-06 23:59:26Z extempore $ package scala.math; diff --git a/src/library/scala/math/ScalaNumericConversions.scala b/src/library/scala/math/ScalaNumericConversions.scala index 2e754c2584..34698ea39f 100644 --- a/src/library/scala/math/ScalaNumericConversions.scala +++ b/src/library/scala/math/ScalaNumericConversions.scala @@ -30,7 +30,7 @@ trait ScalaNumericConversions extends ScalaNumber { protected def unifiedPrimitiveHashcode() = { val lv = toLong if (lv >= Int.MinValue && lv <= Int.MaxValue) lv.toInt - else lv.hashCode + else lv.## } /** Should only be called after all known non-primitive diff --git a/src/library/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala index 81e608d97b..fb43de27ab 100644 --- a/src/library/scala/mobile/Code.scala +++ b/src/library/scala/mobile/Code.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.mobile diff --git a/src/library/scala/mobile/Location.scala b/src/library/scala/mobile/Location.scala index 36d5920553..4b5f13111d 100644 --- a/src/library/scala/mobile/Location.scala +++ b/src/library/scala/mobile/Location.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.mobile diff --git a/src/library/scala/native.scala b/src/library/scala/native.scala index 8aeffe1632..8f5f3e8319 100644 --- a/src/library/scala/native.scala +++ b/src/library/scala/native.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/noinline.scala b/src/library/scala/noinline.scala index b966f5b890..18270e7bc5 100644 --- a/src/library/scala/noinline.scala +++ b/src/library/scala/noinline.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala index 9f31623bdf..b92d420391 100644 --- a/src/library/scala/package.scala +++ b/src/library/scala/package.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package object scala { diff --git a/src/library/scala/ref/PhantomReference.scala b/src/library/scala/ref/PhantomReference.scala index 73746a948f..0ae2bc229c 100644 --- a/src/library/scala/ref/PhantomReference.scala +++ b/src/library/scala/ref/PhantomReference.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/ref/Reference.scala b/src/library/scala/ref/Reference.scala index 3ff77ef39c..64a0dc9ab0 100644 --- a/src/library/scala/ref/Reference.scala +++ b/src/library/scala/ref/Reference.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/ref/ReferenceQueue.scala b/src/library/scala/ref/ReferenceQueue.scala index 5ef74bbc95..d019005b70 100644 --- a/src/library/scala/ref/ReferenceQueue.scala +++ b/src/library/scala/ref/ReferenceQueue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/ref/ReferenceWrapper.scala b/src/library/scala/ref/ReferenceWrapper.scala index 5661737053..d112dcdd9d 100644 --- a/src/library/scala/ref/ReferenceWrapper.scala +++ b/src/library/scala/ref/ReferenceWrapper.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/ref/SoftReference.scala b/src/library/scala/ref/SoftReference.scala index 1026a85023..a9beb5cc16 100644 --- a/src/library/scala/ref/SoftReference.scala +++ b/src/library/scala/ref/SoftReference.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/ref/WeakReference.scala b/src/library/scala/ref/WeakReference.scala index e6386d9f24..6fb03a314b 100644 --- a/src/library/scala/ref/WeakReference.scala +++ b/src/library/scala/ref/WeakReference.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.ref diff --git a/src/library/scala/reflect/BeanDescription.scala b/src/library/scala/reflect/BeanDescription.scala index d32f486bc1..74ce8f2d37 100644 --- a/src/library/scala/reflect/BeanDescription.scala +++ b/src/library/scala/reflect/BeanDescription.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/BeanDisplayName.scala b/src/library/scala/reflect/BeanDisplayName.scala index e3364f3644..414905ae93 100644 --- a/src/library/scala/reflect/BeanDisplayName.scala +++ b/src/library/scala/reflect/BeanDisplayName.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/BeanInfo.scala b/src/library/scala/reflect/BeanInfo.scala index 1677519f59..5153263f6f 100644 --- a/src/library/scala/reflect/BeanInfo.scala +++ b/src/library/scala/reflect/BeanInfo.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/BeanInfoSkip.scala b/src/library/scala/reflect/BeanInfoSkip.scala index ac02c4005a..f480f6c7b5 100644 --- a/src/library/scala/reflect/BeanInfoSkip.scala +++ b/src/library/scala/reflect/BeanInfoSkip.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/BeanProperty.scala b/src/library/scala/reflect/BeanProperty.scala index 17f40cfca1..d784774882 100644 --- a/src/library/scala/reflect/BeanProperty.scala +++ b/src/library/scala/reflect/BeanProperty.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/BooleanBeanProperty.scala b/src/library/scala/reflect/BooleanBeanProperty.scala index eebdb98d9f..f90f11f7cb 100644 --- a/src/library/scala/reflect/BooleanBeanProperty.scala +++ b/src/library/scala/reflect/BooleanBeanProperty.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/ClassManifest.scala b/src/library/scala/reflect/ClassManifest.scala index ded013a4b5..0337ed6aed 100644 --- a/src/library/scala/reflect/ClassManifest.scala +++ b/src/library/scala/reflect/ClassManifest.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect @@ -86,7 +85,7 @@ trait ClassManifest[T] extends OptManifest[T] with Equals { case m: ClassManifest[_] if m canEqual this => this.erasure == m.erasure case _ => false } - override def hashCode = this.erasure.hashCode + override def hashCode = this.erasure.## protected def arrayClass[T](tp: Predef.Class[_]): Predef.Class[Array[T]] = java.lang.reflect.Array.newInstance(tp, 0).getClass.asInstanceOf[Predef.Class[Array[T]]] diff --git a/src/library/scala/reflect/Code.scala b/src/library/scala/reflect/Code.scala index 61138f2495..36537ba447 100644 --- a/src/library/scala/reflect/Code.scala +++ b/src/library/scala/reflect/Code.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/Manifest.scala b/src/library/scala/reflect/Manifest.scala index d718011ff9..6faa99c4c8 100644 --- a/src/library/scala/reflect/Manifest.scala +++ b/src/library/scala/reflect/Manifest.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect @@ -41,7 +40,7 @@ trait Manifest[T] extends ClassManifest[T] with Equals { case m: Manifest[_] if m canEqual this => (this <:< m) && (m <:< this) case _ => false } - override def hashCode = this.erasure.hashCode + override def hashCode = this.erasure.## } @serializable diff --git a/src/library/scala/reflect/NameTransformer.scala b/src/library/scala/reflect/NameTransformer.scala index 0629c3a2f8..31c789e33f 100755 --- a/src/library/scala/reflect/NameTransformer.scala +++ b/src/library/scala/reflect/NameTransformer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id: NameTransformer.scala 20028 2009-12-07 11:49:19Z cunei $ package scala.reflect diff --git a/src/library/scala/reflect/NoManifest.scala b/src/library/scala/reflect/NoManifest.scala index 29e485a914..d0497d4244 100644 --- a/src/library/scala/reflect/NoManifest.scala +++ b/src/library/scala/reflect/NoManifest.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/OptManifest.scala b/src/library/scala/reflect/OptManifest.scala index e82aa000bd..f3ccef5af0 100644 --- a/src/library/scala/reflect/OptManifest.scala +++ b/src/library/scala/reflect/OptManifest.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/Print.scala b/src/library/scala/reflect/Print.scala index f15a9583ba..adf3860f88 100644 --- a/src/library/scala/reflect/Print.scala +++ b/src/library/scala/reflect/Print.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/ScalaBeanInfo.scala b/src/library/scala/reflect/ScalaBeanInfo.scala index 89b85d0269..0ac47b6253 100644 --- a/src/library/scala/reflect/ScalaBeanInfo.scala +++ b/src/library/scala/reflect/ScalaBeanInfo.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/Symbol.scala b/src/library/scala/reflect/Symbol.scala index 733aa7bf2c..74960f3d1a 100644 --- a/src/library/scala/reflect/Symbol.scala +++ b/src/library/scala/reflect/Symbol.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/Tree.scala b/src/library/scala/reflect/Tree.scala index 0e6fe7153c..ff7fc73c8a 100644 --- a/src/library/scala/reflect/Tree.scala +++ b/src/library/scala/reflect/Tree.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/Type.scala b/src/library/scala/reflect/Type.scala index 1a09bf1e94..029bb3966e 100644 --- a/src/library/scala/reflect/Type.scala +++ b/src/library/scala/reflect/Type.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.reflect diff --git a/src/library/scala/reflect/generic/Constants.scala b/src/library/scala/reflect/generic/Constants.scala index 2fe9d24980..bf963a1aae 100755 --- a/src/library/scala/reflect/generic/Constants.scala +++ b/src/library/scala/reflect/generic/Constants.scala @@ -2,7 +2,6 @@ * Copyright 2005-2010 LAMP/EPFL * @author Martin Odersky */ -// $Id: Constants.scala 20028 2009-12-07 11:49:19Z cunei $ package scala.reflect package generic @@ -231,6 +230,6 @@ trait Constants { self: Universe => def symbolValue: Symbol = value.asInstanceOf[Symbol] override def hashCode: Int = - if (value == null) 0 else value.hashCode() * 41 + 17 + if (value == null) 0 else value.## * 41 + 17 } } diff --git a/src/library/scala/reflect/generic/PickleBuffer.scala b/src/library/scala/reflect/generic/PickleBuffer.scala index 2fab02bcfe..14190016b8 100755 --- a/src/library/scala/reflect/generic/PickleBuffer.scala +++ b/src/library/scala/reflect/generic/PickleBuffer.scala @@ -2,7 +2,6 @@ * Copyright 2005-2010 LAMP/EPFL * @author Martin Odersky */ -// $Id: PickleBuffer.scala 20028 2009-12-07 11:49:19Z cunei $ package scala.reflect package generic diff --git a/src/library/scala/reflect/generic/StandardDefinitions.scala b/src/library/scala/reflect/generic/StandardDefinitions.scala index 24dce7173a..c754fca808 100755 --- a/src/library/scala/reflect/generic/StandardDefinitions.scala +++ b/src/library/scala/reflect/generic/StandardDefinitions.scala @@ -2,7 +2,6 @@ * Copyright 2005-2010 LAMP/EPFL * @author Martin Odersky */ -// $Id: Definitions.scala 20619 2010-01-20 10:55:56Z rytz $ package scala.reflect package generic diff --git a/src/library/scala/reflect/generic/UnPickler.scala b/src/library/scala/reflect/generic/UnPickler.scala index d7eef770cc..ee021446bc 100755 --- a/src/library/scala/reflect/generic/UnPickler.scala +++ b/src/library/scala/reflect/generic/UnPickler.scala @@ -2,7 +2,6 @@ * Copyright 2005-2010 LAMP/EPFL * @author Martin Odersky */ -// $Id: UnPickler.scala 20716 2010-01-28 14:14:20Z rytz $ package scala.reflect package generic diff --git a/src/library/scala/remote.scala b/src/library/scala/remote.scala index 6ccfa28fdc..bcbc597338 100644 --- a/src/library/scala/remote.scala +++ b/src/library/scala/remote.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/runtime/AbstractFunction1.scala b/src/library/scala/runtime/AbstractFunction1.scala index 64945e9f51..be125d1566 100644 --- a/src/library/scala/runtime/AbstractFunction1.scala +++ b/src/library/scala/runtime/AbstractFunction1.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction10.scala b/src/library/scala/runtime/AbstractFunction10.scala index d6f6a225c9..5e44dc7513 100644 --- a/src/library/scala/runtime/AbstractFunction10.scala +++ b/src/library/scala/runtime/AbstractFunction10.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction11.scala b/src/library/scala/runtime/AbstractFunction11.scala index 6ffb8e6a7e..c7e7d2de28 100644 --- a/src/library/scala/runtime/AbstractFunction11.scala +++ b/src/library/scala/runtime/AbstractFunction11.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction12.scala b/src/library/scala/runtime/AbstractFunction12.scala index 733a0cc81d..6ca4602d00 100644 --- a/src/library/scala/runtime/AbstractFunction12.scala +++ b/src/library/scala/runtime/AbstractFunction12.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction13.scala b/src/library/scala/runtime/AbstractFunction13.scala index 60242cae17..f5f4d6f89f 100644 --- a/src/library/scala/runtime/AbstractFunction13.scala +++ b/src/library/scala/runtime/AbstractFunction13.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction14.scala b/src/library/scala/runtime/AbstractFunction14.scala index 306a3a7f6f..686f0e42b8 100644 --- a/src/library/scala/runtime/AbstractFunction14.scala +++ b/src/library/scala/runtime/AbstractFunction14.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction15.scala b/src/library/scala/runtime/AbstractFunction15.scala index fd2a341388..62b70ba7f9 100644 --- a/src/library/scala/runtime/AbstractFunction15.scala +++ b/src/library/scala/runtime/AbstractFunction15.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction16.scala b/src/library/scala/runtime/AbstractFunction16.scala index 9d0b2512da..6bd555f2c5 100644 --- a/src/library/scala/runtime/AbstractFunction16.scala +++ b/src/library/scala/runtime/AbstractFunction16.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction17.scala b/src/library/scala/runtime/AbstractFunction17.scala index ebf76d3de8..d679dd5a82 100644 --- a/src/library/scala/runtime/AbstractFunction17.scala +++ b/src/library/scala/runtime/AbstractFunction17.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction18.scala b/src/library/scala/runtime/AbstractFunction18.scala index 4906c0f7cf..04d05157a4 100644 --- a/src/library/scala/runtime/AbstractFunction18.scala +++ b/src/library/scala/runtime/AbstractFunction18.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction19.scala b/src/library/scala/runtime/AbstractFunction19.scala index 1c8c87c0fd..0f0b4f847a 100644 --- a/src/library/scala/runtime/AbstractFunction19.scala +++ b/src/library/scala/runtime/AbstractFunction19.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction2.scala b/src/library/scala/runtime/AbstractFunction2.scala index 1dad0963b7..75dfc5e0a9 100644 --- a/src/library/scala/runtime/AbstractFunction2.scala +++ b/src/library/scala/runtime/AbstractFunction2.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction20.scala b/src/library/scala/runtime/AbstractFunction20.scala index e76d60e774..6df9fff32f 100644 --- a/src/library/scala/runtime/AbstractFunction20.scala +++ b/src/library/scala/runtime/AbstractFunction20.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction21.scala b/src/library/scala/runtime/AbstractFunction21.scala index 75f314aa46..44a81e0ba9 100644 --- a/src/library/scala/runtime/AbstractFunction21.scala +++ b/src/library/scala/runtime/AbstractFunction21.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction22.scala b/src/library/scala/runtime/AbstractFunction22.scala index bd9a3d1bbd..5fc2d331ea 100644 --- a/src/library/scala/runtime/AbstractFunction22.scala +++ b/src/library/scala/runtime/AbstractFunction22.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction3.scala b/src/library/scala/runtime/AbstractFunction3.scala index 3d479c99fa..77473dda6f 100644 --- a/src/library/scala/runtime/AbstractFunction3.scala +++ b/src/library/scala/runtime/AbstractFunction3.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction4.scala b/src/library/scala/runtime/AbstractFunction4.scala index 3492c91cbd..6aaabe22d4 100644 --- a/src/library/scala/runtime/AbstractFunction4.scala +++ b/src/library/scala/runtime/AbstractFunction4.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction5.scala b/src/library/scala/runtime/AbstractFunction5.scala index 5aab3f065f..aae3ff44a2 100644 --- a/src/library/scala/runtime/AbstractFunction5.scala +++ b/src/library/scala/runtime/AbstractFunction5.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction6.scala b/src/library/scala/runtime/AbstractFunction6.scala index e770603d69..1bef135b27 100644 --- a/src/library/scala/runtime/AbstractFunction6.scala +++ b/src/library/scala/runtime/AbstractFunction6.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction7.scala b/src/library/scala/runtime/AbstractFunction7.scala index 80eaf98de4..97ee37d0c2 100644 --- a/src/library/scala/runtime/AbstractFunction7.scala +++ b/src/library/scala/runtime/AbstractFunction7.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction8.scala b/src/library/scala/runtime/AbstractFunction8.scala index 9d844b7945..0a50727c6d 100644 --- a/src/library/scala/runtime/AbstractFunction8.scala +++ b/src/library/scala/runtime/AbstractFunction8.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/AbstractFunction9.scala b/src/library/scala/runtime/AbstractFunction9.scala index 1b90996a94..3685004fe1 100644 --- a/src/library/scala/runtime/AbstractFunction9.scala +++ b/src/library/scala/runtime/AbstractFunction9.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ // generated by genprod on Thu Apr 29 17:52:16 CEST 2010 diff --git a/src/library/scala/runtime/BooleanRef.java b/src/library/scala/runtime/BooleanRef.java index f4599219ef..bf43b470b4 100644 --- a/src/library/scala/runtime/BooleanRef.java +++ b/src/library/scala/runtime/BooleanRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; diff --git a/src/library/scala/runtime/Boxed.scala b/src/library/scala/runtime/Boxed.scala index fef180def0..46515a7997 100644 --- a/src/library/scala/runtime/Boxed.scala +++ b/src/library/scala/runtime/Boxed.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/BoxedUnit.java b/src/library/scala/runtime/BoxedUnit.java index 8ae4f650a9..2f1e56059f 100644 --- a/src/library/scala/runtime/BoxedUnit.java +++ b/src/library/scala/runtime/BoxedUnit.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; diff --git a/src/library/scala/runtime/BoxesRunTime.java b/src/library/scala/runtime/BoxesRunTime.java index 7c27835b5a..8bce46ea66 100644 --- a/src/library/scala/runtime/BoxesRunTime.java +++ b/src/library/scala/runtime/BoxesRunTime.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -33,13 +32,13 @@ public final class BoxesRunTime private static final int CHAR = 0, BYTE = 1, SHORT = 2, INT = 3, LONG = 4, FLOAT = 5, DOUBLE = 6, OTHER = 7; private static int typeCode(Object a) { - if (a instanceof Integer) return INT; - if (a instanceof Byte) return BYTE; - if (a instanceof Character) return CHAR; - if (a instanceof Long) return LONG; - if (a instanceof Double) return DOUBLE; - if (a instanceof Short) return SHORT; - if (a instanceof Float) return FLOAT; + if (a instanceof java.lang.Integer) return INT; + if (a instanceof java.lang.Byte) return BYTE; + if (a instanceof java.lang.Character) return CHAR; + if (a instanceof java.lang.Long) return LONG; + if (a instanceof java.lang.Double) return DOUBLE; + if (a instanceof java.lang.Short) return SHORT; + if (a instanceof java.lang.Float) return FLOAT; return OTHER; } @@ -49,80 +48,80 @@ public final class BoxesRunTime /* BOXING ... BOXING ... BOXING ... BOXING ... BOXING ... BOXING ... BOXING ... BOXING */ - public static Boolean boxToBoolean(boolean b) { - return Boolean.valueOf(b); + public static java.lang.Boolean boxToBoolean(boolean b) { + return java.lang.Boolean.valueOf(b); } - public static Character boxToCharacter(char c) { - return Character.valueOf(c); + public static java.lang.Character boxToCharacter(char c) { + return java.lang.Character.valueOf(c); } - public static Byte boxToByte(byte b) { - return Byte.valueOf(b); + public static java.lang.Byte boxToByte(byte b) { + return java.lang.Byte.valueOf(b); } - public static Short boxToShort(short s) { - return Short.valueOf(s); + public static java.lang.Short boxToShort(short s) { + return java.lang.Short.valueOf(s); } - public static Integer boxToInteger(int i) { - return Integer.valueOf(i); + public static java.lang.Integer boxToInteger(int i) { + return java.lang.Integer.valueOf(i); } - public static Long boxToLong(long l) { - return Long.valueOf(l); + public static java.lang.Long boxToLong(long l) { + return java.lang.Long.valueOf(l); } - public static Float boxToFloat(float f) { - return Float.valueOf(f); + public static java.lang.Float boxToFloat(float f) { + return java.lang.Float.valueOf(f); } - public static Double boxToDouble(double d) { - return Double.valueOf(d); + public static java.lang.Double boxToDouble(double d) { + return java.lang.Double.valueOf(d); } /* UNBOXING ... UNBOXING ... UNBOXING ... UNBOXING ... UNBOXING ... UNBOXING ... UNBOXING */ public static boolean unboxToBoolean(Object b) { - return b == null ? false : ((Boolean)b).booleanValue(); + return b == null ? false : ((java.lang.Boolean)b).booleanValue(); } public static char unboxToChar(Object c) { - return c == null ? 0 : ((Character)c).charValue(); + return c == null ? 0 : ((java.lang.Character)c).charValue(); } public static byte unboxToByte(Object b) { - return b == null ? 0 : ((Byte)b).byteValue(); + return b == null ? 0 : ((java.lang.Byte)b).byteValue(); } public static short unboxToShort(Object s) { - return s == null ? 0 : ((Short)s).shortValue(); + return s == null ? 0 : ((java.lang.Short)s).shortValue(); } public static int unboxToInt(Object i) { - return i == null ? 0 : ((Integer)i).intValue(); + return i == null ? 0 : ((java.lang.Integer)i).intValue(); } public static long unboxToLong(Object l) { - return l == null ? 0 : ((Long)l).longValue(); + return l == null ? 0 : ((java.lang.Long)l).longValue(); } public static float unboxToFloat(Object f) { - return f == null ? 0.0f : ((Float)f).floatValue(); + return f == null ? 0.0f : ((java.lang.Float)f).floatValue(); } public static double unboxToDouble(Object d) { - return d == null ? 0.0d : ((Double)d).doubleValue(); + return d == null ? 0.0d : ((java.lang.Double)d).doubleValue(); } /* COMPARISON ... COMPARISON ... COMPARISON ... COMPARISON ... COMPARISON ... COMPARISON */ private static int eqTypeCode(Number a) { - if ((a instanceof Integer) || (a instanceof Byte)) return INT; - if (a instanceof Long) return LONG; - if (a instanceof Double) return DOUBLE; - if (a instanceof Short) return INT; - if (a instanceof Float) return FLOAT; + if ((a instanceof java.lang.Integer) || (a instanceof java.lang.Byte)) return INT; + if (a instanceof java.lang.Long) return LONG; + if (a instanceof java.lang.Double) return DOUBLE; + if (a instanceof java.lang.Short) return INT; + if (a instanceof java.lang.Float) return FLOAT; return OTHER; } @@ -136,24 +135,24 @@ public final class BoxesRunTime * in any case, we dispatch to it as soon as we spot one on either side. */ public static boolean equals2(Object x, Object y) { - if (x instanceof Number) - return equalsNumObject((Number)x, y); - if (x instanceof Character) - return equalsCharObject((Character)x, y); + if (x instanceof java.lang.Number) + return equalsNumObject((java.lang.Number)x, y); + if (x instanceof java.lang.Character) + return equalsCharObject((java.lang.Character)x, y); return x.equals(y); } - public static boolean equalsNumObject(Number xn, Object y) { - if (y instanceof Number) - return equalsNumNum(xn, (Number)y); - else if (y instanceof Character) - return equalsNumChar(xn, (Character)y); + public static boolean equalsNumObject(java.lang.Number xn, Object y) { + if (y instanceof java.lang.Number) + return equalsNumNum(xn, (java.lang.Number)y); + else if (y instanceof java.lang.Character) + return equalsNumChar(xn, (java.lang.Character)y); return xn.equals(y); } - public static boolean equalsNumNum(Number xn, Number yn) { + public static boolean equalsNumNum(java.lang.Number xn, java.lang.Number yn) { int xcode = eqTypeCode(xn); int ycode = eqTypeCode(yn); switch (ycode > xcode ? ycode : xcode) { @@ -172,16 +171,16 @@ public final class BoxesRunTime return xn.equals(yn); } - public static boolean equalsCharObject(Character xc, Object y) { - if (y instanceof Character) - return xc.charValue() == ((Character)y).charValue(); - if (y instanceof Number) - return equalsNumChar((Number)y, xc); + public static boolean equalsCharObject(java.lang.Character xc, Object y) { + if (y instanceof java.lang.Character) + return xc.charValue() == ((java.lang.Character)y).charValue(); + if (y instanceof java.lang.Number) + return equalsNumChar((java.lang.Number)y, xc); return xc.equals(y); } - private static boolean equalsNumChar(Number xn, Character yc) { + private static boolean equalsNumChar(java.lang.Number xn, java.lang.Character yc) { char ch = yc.charValue(); switch (eqTypeCode(xn)) { case INT: @@ -224,33 +223,33 @@ public final class BoxesRunTime * Note: Among primitives, Float.NaN != Float.NaN, but the boxed * verisons are equal. This still needs reconciliation. */ - public static int hashFromLong(Long n) { + public static int hashFromLong(java.lang.Long n) { int iv = n.intValue(); if (iv == n.longValue()) return iv; else return n.hashCode(); } - public static int hashFromDouble(Double n) { + public static int hashFromDouble(java.lang.Double n) { int iv = n.intValue(); double dv = n.doubleValue(); if (iv == dv) return iv; long lv = n.longValue(); - if (lv == dv) return Long.valueOf(lv).hashCode(); + if (lv == dv) return java.lang.Long.valueOf(lv).hashCode(); else return n.hashCode(); } - public static int hashFromFloat(Float n) { + public static int hashFromFloat(java.lang.Float n) { int iv = n.intValue(); float fv = n.floatValue(); if (iv == fv) return iv; long lv = n.longValue(); - if (lv == fv) return Long.valueOf(lv).hashCode(); + if (lv == fv) return java.lang.Long.valueOf(lv).hashCode(); else return n.hashCode(); } - public static int hashFromNumber(Number n) { - if (n instanceof Long) return hashFromLong((Long)n); - else if (n instanceof Double) return hashFromDouble((Double)n); - else if (n instanceof Float) return hashFromFloat((Float)n); + public static int hashFromNumber(java.lang.Number n) { + if (n instanceof java.lang.Long) return hashFromLong((java.lang.Long)n); + else if (n instanceof java.lang.Double) return hashFromDouble((java.lang.Double)n); + else if (n instanceof java.lang.Float) return hashFromFloat((java.lang.Float)n); else return n.hashCode(); } public static int hashFromObject(Object a) { @@ -266,23 +265,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 + val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 + val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToFloat(val1 + val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToDouble(val1 + val2); } throw new NoSuchMethodException(); @@ -294,23 +293,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 - val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 - val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToFloat(val1 - val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToDouble(val1 - val2); } throw new NoSuchMethodException(); @@ -322,23 +321,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 * val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 * val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToFloat(val1 * val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToDouble(val1 * val2); } throw new NoSuchMethodException(); @@ -350,23 +349,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 / val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 / val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToFloat(val1 / val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToDouble(val1 / val2); } throw new NoSuchMethodException(); @@ -378,23 +377,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 % val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 % val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToFloat(val1 % val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToDouble(val1 % val2); } throw new NoSuchMethodException(); @@ -405,24 +404,24 @@ public final class BoxesRunTime int code1 = typeCode(arg1); int code2 = typeCode(arg2); if (code1 <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 >> val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToInteger(val1 >> val2); } } if (code1 <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToLong(val1 >> val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 >> val2); } } @@ -434,24 +433,24 @@ public final class BoxesRunTime int code1 = typeCode(arg1); int code2 = typeCode(arg2); if (code1 <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 << val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToInteger(val1 << val2); } } if (code1 <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToLong(val1 << val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 << val2); } } @@ -463,24 +462,24 @@ public final class BoxesRunTime int code1 = typeCode(arg1); int code2 = typeCode(arg2); if (code1 <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 >>> val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToInteger(val1 >>> val2); } } if (code1 <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); if (code2 <= INT) { - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToLong(val1 >>> val2); } if (code2 <= LONG) { - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 >>> val2); } } @@ -491,19 +490,19 @@ public final class BoxesRunTime public static Object negate(Object arg) throws NoSuchMethodException { int code = typeCode(arg); if (code <= INT) { - int val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).intValue(); + int val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).intValue(); return boxToInteger(-val); } if (code <= LONG) { - long val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).longValue(); + long val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).longValue(); return boxToLong(-val); } if (code <= FLOAT) { - float val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).floatValue(); + float val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).floatValue(); return boxToFloat(-val); } if (code <= DOUBLE) { - double val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).doubleValue(); + double val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).doubleValue(); return boxToDouble(-val); } throw new NoSuchMethodException(); @@ -513,19 +512,19 @@ public final class BoxesRunTime public static Object positive(Object arg) throws NoSuchMethodException { int code = typeCode(arg); if (code <= INT) { - int val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).intValue(); + int val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).intValue(); return boxToInteger(+val); } if (code <= LONG) { - long val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).longValue(); + long val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).longValue(); return boxToLong(+val); } if (code <= FLOAT) { - float val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).floatValue(); + float val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).floatValue(); return boxToFloat(+val); } if (code <= DOUBLE) { - double val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).doubleValue(); + double val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).doubleValue(); return boxToDouble(+val); } throw new NoSuchMethodException(); @@ -537,19 +536,19 @@ public final class BoxesRunTime if (!((arg1 instanceof Boolean) && (arg2 instanceof Boolean))) { throw new NoSuchMethodException(); } - return boxToBoolean(((Boolean) arg1).booleanValue() & ((Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() & ((java.lang.Boolean) arg2).booleanValue()); } int code1 = typeCode(arg1); int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 & val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 & val2); } throw new NoSuchMethodException(); @@ -561,19 +560,19 @@ public final class BoxesRunTime if (!((arg1 instanceof Boolean) && (arg2 instanceof Boolean))) { throw new NoSuchMethodException(); } - return boxToBoolean(((Boolean) arg1).booleanValue() | ((Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() | ((java.lang.Boolean) arg2).booleanValue()); } int code1 = typeCode(arg1); int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 | val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 | val2); } throw new NoSuchMethodException(); @@ -585,19 +584,19 @@ public final class BoxesRunTime if (!((arg1 instanceof Boolean) && (arg2 instanceof Boolean))) { throw new NoSuchMethodException(); } - return boxToBoolean(((Boolean) arg1).booleanValue() ^ ((Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() ^ ((java.lang.Boolean) arg2).booleanValue()); } int code1 = typeCode(arg1); int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToInteger(val1 ^ val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToLong(val1 ^ val2); } throw new NoSuchMethodException(); @@ -606,7 +605,7 @@ public final class BoxesRunTime /** arg1 && arg2 */ public static Object takeConditionalAnd(Object arg1, Object arg2) throws NoSuchMethodException { if ((arg1 instanceof Boolean) && (arg2 instanceof Boolean)) { - return boxToBoolean(((Boolean) arg1).booleanValue() && ((Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() && ((java.lang.Boolean) arg2).booleanValue()); } throw new NoSuchMethodException(); } @@ -614,7 +613,7 @@ public final class BoxesRunTime /** arg1 || arg2 */ public static Object takeConditionalOr(Object arg1, Object arg2) throws NoSuchMethodException { if ((arg1 instanceof Boolean) && (arg2 instanceof Boolean)) { - return boxToBoolean(((Boolean) arg1).booleanValue() || ((Boolean) arg2).booleanValue()); + return boxToBoolean(((java.lang.Boolean) arg1).booleanValue() || ((java.lang.Boolean) arg2).booleanValue()); } throw new NoSuchMethodException(); } @@ -623,11 +622,11 @@ public final class BoxesRunTime public static Object complement(Object arg) throws NoSuchMethodException { int code = typeCode(arg); if (code <= INT) { - int val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).intValue(); + int val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).intValue(); return boxToInteger(~val); } if (code <= LONG) { - long val = (code == CHAR) ? ((Character) arg).charValue() : ((Number) arg).longValue(); + long val = (code == CHAR) ? ((java.lang.Character) arg).charValue() : ((java.lang.Number) arg).longValue(); return boxToLong(~val); } throw new NoSuchMethodException(); @@ -636,7 +635,7 @@ public final class BoxesRunTime /** !arg */ public static Object takeNot(Object arg) throws NoSuchMethodException { if (arg instanceof Boolean) { - return boxToBoolean(!((Boolean) arg).booleanValue()); + return boxToBoolean(!((java.lang.Boolean) arg).booleanValue()); } throw new NoSuchMethodException(); } @@ -654,23 +653,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToBoolean(val1 < val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToBoolean(val1 < val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToBoolean(val1 < val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToBoolean(val1 < val2); } throw new NoSuchMethodException(); @@ -681,23 +680,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToBoolean(val1 <= val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToBoolean(val1 <= val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToBoolean(val1 <= val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToBoolean(val1 <= val2); } throw new NoSuchMethodException(); @@ -708,23 +707,23 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToBoolean(val1 >= val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToBoolean(val1 >= val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToBoolean(val1 >= val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToBoolean(val1 >= val2); } throw new NoSuchMethodException(); @@ -735,109 +734,109 @@ public final class BoxesRunTime int code2 = typeCode(arg2); int maxcode = (code1 < code2) ? code2 : code1; if (maxcode <= INT) { - int val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).intValue(); - int val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).intValue(); + int val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).intValue(); + int val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).intValue(); return boxToBoolean(val1 > val2); } if (maxcode <= LONG) { - long val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).longValue(); - long val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).longValue(); + long val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).longValue(); + long val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).longValue(); return boxToBoolean(val1 > val2); } if (maxcode <= FLOAT) { - float val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).floatValue(); - float val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).floatValue(); + float val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).floatValue(); + float val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).floatValue(); return boxToBoolean(val1 > val2); } if (maxcode <= DOUBLE) { - double val1 = (code1 == CHAR) ? ((Character) arg1).charValue() : ((Number) arg1).doubleValue(); - double val2 = (code2 == CHAR) ? ((Character) arg2).charValue() : ((Number) arg2).doubleValue(); + double val1 = (code1 == CHAR) ? ((java.lang.Character) arg1).charValue() : ((java.lang.Number) arg1).doubleValue(); + double val2 = (code2 == CHAR) ? ((java.lang.Character) arg2).charValue() : ((java.lang.Number) arg2).doubleValue(); return boxToBoolean(val1 > val2); } throw new NoSuchMethodException(); } /** arg.toChar */ - public static Character toCharacter(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToCharacter((char)unboxToInt(arg)); - if (arg instanceof Short) return boxToCharacter((char)unboxToShort(arg)); - if (arg instanceof Character) return (Character)arg; - if (arg instanceof Long) return boxToCharacter((char)unboxToLong(arg)); - if (arg instanceof Byte) return boxToCharacter((char)unboxToByte(arg)); - if (arg instanceof Float) return boxToCharacter((char)unboxToFloat(arg)); - if (arg instanceof Double) return boxToCharacter((char)unboxToDouble(arg)); + public static java.lang.Character toCharacter(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToCharacter((char)unboxToInt(arg)); + if (arg instanceof java.lang.Short) return boxToCharacter((char)unboxToShort(arg)); + if (arg instanceof java.lang.Character) return (java.lang.Character)arg; + if (arg instanceof java.lang.Long) return boxToCharacter((char)unboxToLong(arg)); + if (arg instanceof java.lang.Byte) return boxToCharacter((char)unboxToByte(arg)); + if (arg instanceof java.lang.Float) return boxToCharacter((char)unboxToFloat(arg)); + if (arg instanceof java.lang.Double) return boxToCharacter((char)unboxToDouble(arg)); throw new NoSuchMethodException(); } /** arg.toByte */ - public static Byte toByte(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToByte((byte)unboxToInt(arg)); - if (arg instanceof Character) return boxToByte((byte)unboxToChar(arg)); - if (arg instanceof Byte) return (Byte)arg; - if (arg instanceof Long) return boxToByte((byte)unboxToLong(arg)); - if (arg instanceof Short) return boxToByte((byte)unboxToShort(arg)); - if (arg instanceof Float) return boxToByte((byte)unboxToFloat(arg)); - if (arg instanceof Double) return boxToByte((byte)unboxToDouble(arg)); + public static java.lang.Byte toByte(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToByte((byte)unboxToInt(arg)); + if (arg instanceof java.lang.Character) return boxToByte((byte)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return (java.lang.Byte)arg; + if (arg instanceof java.lang.Long) return boxToByte((byte)unboxToLong(arg)); + if (arg instanceof java.lang.Short) return boxToByte((byte)unboxToShort(arg)); + if (arg instanceof java.lang.Float) return boxToByte((byte)unboxToFloat(arg)); + if (arg instanceof java.lang.Double) return boxToByte((byte)unboxToDouble(arg)); throw new NoSuchMethodException(); } /** arg.toShort */ - public static Short toShort(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToShort((short)unboxToInt(arg)); - if (arg instanceof Long) return boxToShort((short)unboxToLong(arg)); - if (arg instanceof Character) return boxToShort((short)unboxToChar(arg)); - if (arg instanceof Byte) return boxToShort((short)unboxToByte(arg)); - if (arg instanceof Short) return (Short)arg; - if (arg instanceof Float) return boxToShort((short)unboxToFloat(arg)); - if (arg instanceof Double) return boxToShort((short)unboxToDouble(arg)); + public static java.lang.Short toShort(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToShort((short)unboxToInt(arg)); + if (arg instanceof java.lang.Long) return boxToShort((short)unboxToLong(arg)); + if (arg instanceof java.lang.Character) return boxToShort((short)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return boxToShort((short)unboxToByte(arg)); + if (arg instanceof java.lang.Short) return (java.lang.Short)arg; + if (arg instanceof java.lang.Float) return boxToShort((short)unboxToFloat(arg)); + if (arg instanceof java.lang.Double) return boxToShort((short)unboxToDouble(arg)); throw new NoSuchMethodException(); } /** arg.toInt */ - public static Integer toInteger(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return (Integer)arg; - if (arg instanceof Long) return boxToInteger((int)unboxToLong(arg)); - if (arg instanceof Double) return boxToInteger((int)unboxToDouble(arg)); - if (arg instanceof Float) return boxToInteger((int)unboxToFloat(arg)); - if (arg instanceof Character) return boxToInteger((int)unboxToChar(arg)); - if (arg instanceof Byte) return boxToInteger((int)unboxToByte(arg)); - if (arg instanceof Short) return boxToInteger((int)unboxToShort(arg)); + public static java.lang.Integer toInteger(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return (java.lang.Integer)arg; + if (arg instanceof java.lang.Long) return boxToInteger((int)unboxToLong(arg)); + if (arg instanceof java.lang.Double) return boxToInteger((int)unboxToDouble(arg)); + if (arg instanceof java.lang.Float) return boxToInteger((int)unboxToFloat(arg)); + if (arg instanceof java.lang.Character) return boxToInteger((int)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return boxToInteger((int)unboxToByte(arg)); + if (arg instanceof java.lang.Short) return boxToInteger((int)unboxToShort(arg)); throw new NoSuchMethodException(); } /** arg.toLong */ - public static Long toLong(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToLong((long)unboxToInt(arg)); - if (arg instanceof Double) return boxToLong((long)unboxToDouble(arg)); - if (arg instanceof Float) return boxToLong((long)unboxToFloat(arg)); - if (arg instanceof Long) return (Long)arg; - if (arg instanceof Character) return boxToLong((long)unboxToChar(arg)); - if (arg instanceof Byte) return boxToLong((long)unboxToByte(arg)); - if (arg instanceof Short) return boxToLong((long)unboxToShort(arg)); + public static java.lang.Long toLong(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToLong((long)unboxToInt(arg)); + if (arg instanceof java.lang.Double) return boxToLong((long)unboxToDouble(arg)); + if (arg instanceof java.lang.Float) return boxToLong((long)unboxToFloat(arg)); + if (arg instanceof java.lang.Long) return (java.lang.Long)arg; + if (arg instanceof java.lang.Character) return boxToLong((long)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return boxToLong((long)unboxToByte(arg)); + if (arg instanceof java.lang.Short) return boxToLong((long)unboxToShort(arg)); throw new NoSuchMethodException(); } /** arg.toFloat */ - public static Float toFloat(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToFloat((float)unboxToInt(arg)); - if (arg instanceof Long) return boxToFloat((float)unboxToLong(arg)); - if (arg instanceof Float) return (Float)arg; - if (arg instanceof Double) return boxToFloat((float)unboxToDouble(arg)); - if (arg instanceof Character) return boxToFloat((float)unboxToChar(arg)); - if (arg instanceof Byte) return boxToFloat((float)unboxToByte(arg)); - if (arg instanceof Short) return boxToFloat((float)unboxToShort(arg)); + public static java.lang.Float toFloat(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToFloat((float)unboxToInt(arg)); + if (arg instanceof java.lang.Long) return boxToFloat((float)unboxToLong(arg)); + if (arg instanceof java.lang.Float) return (java.lang.Float)arg; + if (arg instanceof java.lang.Double) return boxToFloat((float)unboxToDouble(arg)); + if (arg instanceof java.lang.Character) return boxToFloat((float)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return boxToFloat((float)unboxToByte(arg)); + if (arg instanceof java.lang.Short) return boxToFloat((float)unboxToShort(arg)); throw new NoSuchMethodException(); } /** arg.toDouble */ - public static Double toDouble(Object arg) throws NoSuchMethodException { - if (arg instanceof Integer) return boxToDouble((double)unboxToInt(arg)); - if (arg instanceof Float) return boxToDouble((double)unboxToFloat(arg)); - if (arg instanceof Double) return (Double)arg; - if (arg instanceof Long) return boxToDouble((double)unboxToLong(arg)); - if (arg instanceof Character) return boxToDouble((double)unboxToChar(arg)); - if (arg instanceof Byte) return boxToDouble((double)unboxToByte(arg)); - if (arg instanceof Short) return boxToDouble((double)unboxToShort(arg)); + public static java.lang.Double toDouble(Object arg) throws NoSuchMethodException { + if (arg instanceof java.lang.Integer) return boxToDouble((double)unboxToInt(arg)); + if (arg instanceof java.lang.Float) return boxToDouble((double)unboxToFloat(arg)); + if (arg instanceof java.lang.Double) return (java.lang.Double)arg; + if (arg instanceof java.lang.Long) return boxToDouble((double)unboxToLong(arg)); + if (arg instanceof java.lang.Character) return boxToDouble((double)unboxToChar(arg)); + if (arg instanceof java.lang.Byte) return boxToDouble((double)unboxToByte(arg)); + if (arg instanceof java.lang.Short) return boxToDouble((double)unboxToShort(arg)); throw new NoSuchMethodException(); } diff --git a/src/library/scala/runtime/ByteRef.java b/src/library/scala/runtime/ByteRef.java index 99cbf1827f..fc0b4c7442 100644 --- a/src/library/scala/runtime/ByteRef.java +++ b/src/library/scala/runtime/ByteRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class ByteRef implements java.io.Serializable { public byte elem; public ByteRef(byte elem) { this.elem = elem; } - public String toString() { return Byte.toString(elem); } + public String toString() { return java.lang.Byte.toString(elem); } } diff --git a/src/library/scala/runtime/CharRef.java b/src/library/scala/runtime/CharRef.java index a5803df34f..48d712b2b9 100644 --- a/src/library/scala/runtime/CharRef.java +++ b/src/library/scala/runtime/CharRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class CharRef implements java.io.Serializable { public char elem; public CharRef(char elem) { this.elem = elem; } - public String toString() { return Character.toString(elem); } + public String toString() { return java.lang.Character.toString(elem); } } diff --git a/src/library/scala/runtime/DoubleRef.java b/src/library/scala/runtime/DoubleRef.java index c97ffd78d5..d112841a72 100644 --- a/src/library/scala/runtime/DoubleRef.java +++ b/src/library/scala/runtime/DoubleRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class DoubleRef implements java.io.Serializable { public double elem; public DoubleRef(double elem) { this.elem = elem; } - public String toString() { return Double.toString(elem); } + public String toString() { return java.lang.Double.toString(elem); } } diff --git a/src/library/scala/runtime/FloatRef.java b/src/library/scala/runtime/FloatRef.java index 4e32cc352f..1fec0e5bfc 100644 --- a/src/library/scala/runtime/FloatRef.java +++ b/src/library/scala/runtime/FloatRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class FloatRef implements java.io.Serializable { public float elem; public FloatRef(float elem) { this.elem = elem; } - public String toString() { return Float.toString(elem); } + public String toString() { return java.lang.Float.toString(elem); } } diff --git a/src/library/scala/runtime/IntRef.java b/src/library/scala/runtime/IntRef.java index 74e71a2987..647cffed7a 100644 --- a/src/library/scala/runtime/IntRef.java +++ b/src/library/scala/runtime/IntRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class IntRef implements java.io.Serializable { public int elem; public IntRef(int elem) { this.elem = elem; } - public String toString() { return Integer.toString(elem); } + public String toString() { return java.lang.Integer.toString(elem); } } diff --git a/src/library/scala/runtime/LongRef.java b/src/library/scala/runtime/LongRef.java index 890c59b28e..708fc12ebe 100644 --- a/src/library/scala/runtime/LongRef.java +++ b/src/library/scala/runtime/LongRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; @@ -17,5 +16,5 @@ public class LongRef implements java.io.Serializable { public long elem; public LongRef(long elem) { this.elem = elem; } - public String toString() { return Long.toString(elem); } + public String toString() { return java.lang.Long.toString(elem); } } diff --git a/src/library/scala/runtime/MethodCache.scala b/src/library/scala/runtime/MethodCache.scala index c2146547b7..a98ae3ae03 100644 --- a/src/library/scala/runtime/MethodCache.scala +++ b/src/library/scala/runtime/MethodCache.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/NonLocalReturnControl.scala b/src/library/scala/runtime/NonLocalReturnControl.scala index 5591d4871b..f8843e9c64 100644 --- a/src/library/scala/runtime/NonLocalReturnControl.scala +++ b/src/library/scala/runtime/NonLocalReturnControl.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/NonLocalReturnException.scala b/src/library/scala/runtime/NonLocalReturnException.scala deleted file mode 100644 index 19a216be7c..0000000000 --- a/src/library/scala/runtime/NonLocalReturnException.scala +++ /dev/null @@ -1,19 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2010, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - - -package scala.runtime - -import scala.util.control.ControlThrowable - -/** !!! This class has been replaced by NonLocalReturnControl and should be deleted. - * But, it can't be deleted until starr is updated to use the new name. - */ -class NonLocalReturnException[T](val key: AnyRef, val value: T) extends ControlThrowable diff --git a/src/library/scala/runtime/Nothing$.scala b/src/library/scala/runtime/Nothing$.scala index 88d360a9bb..fd66996518 100644 --- a/src/library/scala/runtime/Nothing$.scala +++ b/src/library/scala/runtime/Nothing$.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/Null$.scala b/src/library/scala/runtime/Null$.scala index 808dee46a7..25662e1810 100644 --- a/src/library/scala/runtime/Null$.scala +++ b/src/library/scala/runtime/Null$.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/ObjectRef.java b/src/library/scala/runtime/ObjectRef.java index 2393ea146e..a1567b6e48 100644 --- a/src/library/scala/runtime/ObjectRef.java +++ b/src/library/scala/runtime/ObjectRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; diff --git a/src/library/scala/runtime/RichBoolean.scala b/src/library/scala/runtime/RichBoolean.scala index 297ee305e1..bfff5dae94 100644 --- a/src/library/scala/runtime/RichBoolean.scala +++ b/src/library/scala/runtime/RichBoolean.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichByte.scala b/src/library/scala/runtime/RichByte.scala index a20c890779..52ec045217 100644 --- a/src/library/scala/runtime/RichByte.scala +++ b/src/library/scala/runtime/RichByte.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichChar.scala b/src/library/scala/runtime/RichChar.scala index 1c95186558..b8324fa221 100644 --- a/src/library/scala/runtime/RichChar.scala +++ b/src/library/scala/runtime/RichChar.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichDouble.scala b/src/library/scala/runtime/RichDouble.scala index 5a9451cee6..64976acb12 100644 --- a/src/library/scala/runtime/RichDouble.scala +++ b/src/library/scala/runtime/RichDouble.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichException.scala b/src/library/scala/runtime/RichException.scala index 8c023f64a1..a806a3cf5e 100644 --- a/src/library/scala/runtime/RichException.scala +++ b/src/library/scala/runtime/RichException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichFloat.scala b/src/library/scala/runtime/RichFloat.scala index 4858ea92d5..e8e351bdaa 100644 --- a/src/library/scala/runtime/RichFloat.scala +++ b/src/library/scala/runtime/RichFloat.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichInt.scala b/src/library/scala/runtime/RichInt.scala index c949ab8129..30fc010d17 100644 --- a/src/library/scala/runtime/RichInt.scala +++ b/src/library/scala/runtime/RichInt.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichLong.scala b/src/library/scala/runtime/RichLong.scala index 6b9ca76e7f..bf573abc62 100644 --- a/src/library/scala/runtime/RichLong.scala +++ b/src/library/scala/runtime/RichLong.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichShort.scala b/src/library/scala/runtime/RichShort.scala index 45f818b2c9..0fa34b27c4 100644 --- a/src/library/scala/runtime/RichShort.scala +++ b/src/library/scala/runtime/RichShort.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/RichUnit.scala b/src/library/scala/runtime/RichUnit.scala index bce60f90c6..982ec8b963 100644 --- a/src/library/scala/runtime/RichUnit.scala +++ b/src/library/scala/runtime/RichUnit.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index a0bdd122e6..26dc0830e5 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime @@ -155,7 +154,7 @@ object ScalaRunTime { var i = 0 while (i < arr) { val elem = x.productElement(i) - code = code * 41 + (if (elem == null) 0 else elem.hashCode()) + code = code * 41 + (if (elem == null) 0 else elem.##) i += 1 } code @@ -176,6 +175,9 @@ object ScalaRunTime { } // hashcode ----------------------------------------------------------- + // + // Note that these are the implementations called by ##, so they + // must not call ## themselves. @inline def hash(x: Any): Int = if (x.isInstanceOf[java.lang.Number]) BoxesRunTime.hashFromNumber(x.asInstanceOf[java.lang.Number]) diff --git a/src/library/scala/runtime/ShortRef.java b/src/library/scala/runtime/ShortRef.java index b14b5b8e53..eadacaca19 100644 --- a/src/library/scala/runtime/ShortRef.java +++ b/src/library/scala/runtime/ShortRef.java @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.runtime; diff --git a/src/library/scala/runtime/StringAdd.scala b/src/library/scala/runtime/StringAdd.scala index 8325abddc2..5ec865eac8 100644 --- a/src/library/scala/runtime/StringAdd.scala +++ b/src/library/scala/runtime/StringAdd.scala @@ -6,7 +6,6 @@ ** ** \* */ -// $Id$ package scala.runtime diff --git a/src/library/scala/serializable.scala b/src/library/scala/serializable.scala index 48a04c5f1a..6269359cd8 100644 --- a/src/library/scala/serializable.scala +++ b/src/library/scala/serializable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/specialized.scala b/src/library/scala/specialized.scala index 4ac3037328..f4ce207c4b 100644 --- a/src/library/scala/specialized.scala +++ b/src/library/scala/specialized.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/testing/Benchmark.scala b/src/library/scala/testing/Benchmark.scala index bb7e50a3aa..8e29d740db 100644 --- a/src/library/scala/testing/Benchmark.scala +++ b/src/library/scala/testing/Benchmark.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.testing diff --git a/src/library/scala/testing/SUnit.scala b/src/library/scala/testing/SUnit.scala index d5d845cb98..1ea54f4982 100644 --- a/src/library/scala/testing/SUnit.scala +++ b/src/library/scala/testing/SUnit.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.testing diff --git a/src/library/scala/testing/Show.scala b/src/library/scala/testing/Show.scala index d5e932e6ff..f0efa691ac 100644 --- a/src/library/scala/testing/Show.scala +++ b/src/library/scala/testing/Show.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.testing diff --git a/src/library/scala/text/Document.scala b/src/library/scala/text/Document.scala index d201938832..b44741dfe8 100644 --- a/src/library/scala/text/Document.scala +++ b/src/library/scala/text/Document.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.text diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala index b932ccc7ac..62dfc8fc96 100644 --- a/src/library/scala/throws.scala +++ b/src/library/scala/throws.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/transient.scala b/src/library/scala/transient.scala index aea7ba7b5f..12aa15fd1f 100644 --- a/src/library/scala/transient.scala +++ b/src/library/scala/transient.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/unchecked.scala b/src/library/scala/unchecked.scala index 3dbbc9dad0..7cdce63380 100644 --- a/src/library/scala/unchecked.scala +++ b/src/library/scala/unchecked.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/util/DynamicVariable.scala b/src/library/scala/util/DynamicVariable.scala index ff2f6206f6..52d1763123 100644 --- a/src/library/scala/util/DynamicVariable.scala +++ b/src/library/scala/util/DynamicVariable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util diff --git a/src/library/scala/util/JenkinsHash.scala b/src/library/scala/util/JenkinsHash.scala index fcd263f5c9..83df5ad834 100644 --- a/src/library/scala/util/JenkinsHash.scala +++ b/src/library/scala/util/JenkinsHash.scala @@ -124,7 +124,7 @@ object JenkinsHash { */ def hashSeq(xs: Seq[Any]): Int = { val (values, refs) = partitionValuesAndRefs(xs) - val refsSum = refs map (x => if (x == null) 0 else x.hashCode) sum + val refsSum = refs map (x => if (x == null) 0 else x.##) sum hashAnyValSeq(values) + refsSum } diff --git a/src/library/scala/util/Marshal.scala b/src/library/scala/util/Marshal.scala index e1cdce25bc..32c0a15ef3 100644 --- a/src/library/scala/util/Marshal.scala +++ b/src/library/scala/util/Marshal.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 3a08fa0482..e4da90ee28 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util diff --git a/src/library/scala/util/Random.scala b/src/library/scala/util/Random.scala index cd9d5eed0e..69cb4bb48d 100644 --- a/src/library/scala/util/Random.scala +++ b/src/library/scala/util/Random.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util diff --git a/src/library/scala/util/Sorting.scala b/src/library/scala/util/Sorting.scala index 4189f2d912..8174a0e711 100644 --- a/src/library/scala/util/Sorting.scala +++ b/src/library/scala/util/Sorting.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala index ab7b97f188..63eb0aba9f 100644 --- a/src/library/scala/util/automata/BaseBerrySethi.scala +++ b/src/library/scala/util/automata/BaseBerrySethi.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala index c69f39d212..e1e19589c2 100644 --- a/src/library/scala/util/automata/DetWordAutom.scala +++ b/src/library/scala/util/automata/DetWordAutom.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/automata/Inclusion.scala b/src/library/scala/util/automata/Inclusion.scala index 084b8bed9d..55ca4e0c37 100644 --- a/src/library/scala/util/automata/Inclusion.scala +++ b/src/library/scala/util/automata/Inclusion.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala index 2363741b7a..4434ed395d 100644 --- a/src/library/scala/util/automata/NondetWordAutom.scala +++ b/src/library/scala/util/automata/NondetWordAutom.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala index c8fba39f0e..d5b1a19083 100644 --- a/src/library/scala/util/automata/SubsetConstruction.scala +++ b/src/library/scala/util/automata/SubsetConstruction.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala index b54fdc53f2..4a41cbbf5a 100644 --- a/src/library/scala/util/automata/WordBerrySethi.scala +++ b/src/library/scala/util/automata/WordBerrySethi.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.automata diff --git a/src/library/scala/util/control/Breaks.scala b/src/library/scala/util/control/Breaks.scala index 1f06f04418..dedf721cd4 100644 --- a/src/library/scala/util/control/Breaks.scala +++ b/src/library/scala/util/control/Breaks.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.control diff --git a/src/library/scala/util/control/ControlThrowable.scala b/src/library/scala/util/control/ControlThrowable.scala index 090bec4e98..dd09793b5f 100644 --- a/src/library/scala/util/control/ControlThrowable.scala +++ b/src/library/scala/util/control/ControlThrowable.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.control diff --git a/src/library/scala/util/grammar/HedgeRHS.scala b/src/library/scala/util/grammar/HedgeRHS.scala index 6dc6a18936..6d72bbb5d5 100644 --- a/src/library/scala/util/grammar/HedgeRHS.scala +++ b/src/library/scala/util/grammar/HedgeRHS.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.grammar diff --git a/src/library/scala/util/grammar/TreeRHS.scala b/src/library/scala/util/grammar/TreeRHS.scala index 040a37b9e2..36f3884034 100644 --- a/src/library/scala/util/grammar/TreeRHS.scala +++ b/src/library/scala/util/grammar/TreeRHS.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.grammar diff --git a/src/library/scala/util/logging/ConsoleLogger.scala b/src/library/scala/util/logging/ConsoleLogger.scala index ec4148abc9..61950a315c 100644 --- a/src/library/scala/util/logging/ConsoleLogger.scala +++ b/src/library/scala/util/logging/ConsoleLogger.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.logging diff --git a/src/library/scala/util/logging/Logged.scala b/src/library/scala/util/logging/Logged.scala index b2461ea3d8..ecf25e230d 100644 --- a/src/library/scala/util/logging/Logged.scala +++ b/src/library/scala/util/logging/Logged.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.logging diff --git a/src/library/scala/util/matching/Regex.scala b/src/library/scala/util/matching/Regex.scala index 1384dfa47c..cf2c1d2cea 100644 --- a/src/library/scala/util/matching/Regex.scala +++ b/src/library/scala/util/matching/Regex.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.matching diff --git a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala b/src/library/scala/util/parsing/combinator/ImplicitConversions.scala index 4b80d198ce..1ba9270ec6 100644 --- a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala +++ b/src/library/scala/util/parsing/combinator/ImplicitConversions.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator diff --git a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala b/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala index 6f15f54af8..02fb85e81a 100644 --- a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator diff --git a/src/library/scala/util/parsing/combinator/PackratParsers.scala b/src/library/scala/util/parsing/combinator/PackratParsers.scala index 4803ddd202..1e2975b615 100644 --- a/src/library/scala/util/parsing/combinator/PackratParsers.scala +++ b/src/library/scala/util/parsing/combinator/PackratParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/library/scala/util/parsing/combinator/Parsers.scala index d270757189..0df8871f82 100644 --- a/src/library/scala/util/parsing/combinator/Parsers.scala +++ b/src/library/scala/util/parsing/combinator/Parsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator diff --git a/src/library/scala/util/parsing/combinator/RegexParsers.scala b/src/library/scala/util/parsing/combinator/RegexParsers.scala index fd8ee60db0..ec056f9b4f 100644 --- a/src/library/scala/util/parsing/combinator/RegexParsers.scala +++ b/src/library/scala/util/parsing/combinator/RegexParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator diff --git a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala b/src/library/scala/util/parsing/combinator/lexical/Lexical.scala index 7a35bcad7d..2a44a1c98c 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala +++ b/src/library/scala/util/parsing/combinator/lexical/Lexical.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing diff --git a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala index 96e9a76572..90e9fa9b82 100644 --- a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala +++ b/src/library/scala/util/parsing/combinator/lexical/Scanners.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala index bc53e3731d..8d286d9aef 100644 --- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing diff --git a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala index 31fa06035c..a3f7c24c0a 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing package combinator diff --git a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala index 5b62280b78..bc37ce7b4d 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing diff --git a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala index ae4120b402..d9353b6b27 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing package combinator diff --git a/src/library/scala/util/parsing/combinator/testing/RegexTest.scala b/src/library/scala/util/parsing/combinator/testing/RegexTest.scala index 3a024013c9..299736046e 100644 --- a/src/library/scala/util/parsing/combinator/testing/RegexTest.scala +++ b/src/library/scala/util/parsing/combinator/testing/RegexTest.scala @@ -1,4 +1,3 @@ -// $Id$ package scala.util.parsing.combinator.testing diff --git a/src/library/scala/util/parsing/combinator/testing/Tester.scala b/src/library/scala/util/parsing/combinator/testing/Tester.scala index 6ed86e77d7..7709cc0896 100644 --- a/src/library/scala/util/parsing/combinator/testing/Tester.scala +++ b/src/library/scala/util/parsing/combinator/testing/Tester.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.combinator.testing import scala.util.parsing.combinator._ diff --git a/src/library/scala/util/parsing/input/CharArrayReader.scala b/src/library/scala/util/parsing/input/CharArrayReader.scala index a58174df81..772dd533ae 100644 --- a/src/library/scala/util/parsing/input/CharArrayReader.scala +++ b/src/library/scala/util/parsing/input/CharArrayReader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/input/CharSequenceReader.scala b/src/library/scala/util/parsing/input/CharSequenceReader.scala index 3ae845a344..e47b213ad3 100644 --- a/src/library/scala/util/parsing/input/CharSequenceReader.scala +++ b/src/library/scala/util/parsing/input/CharSequenceReader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/input/NoPosition.scala b/src/library/scala/util/parsing/input/NoPosition.scala index e20f6ee3e6..311dde7b9a 100644 --- a/src/library/scala/util/parsing/input/NoPosition.scala +++ b/src/library/scala/util/parsing/input/NoPosition.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/input/PagedSeqReader.scala b/src/library/scala/util/parsing/input/PagedSeqReader.scala index c264be1dd6..71e1395f24 100644 --- a/src/library/scala/util/parsing/input/PagedSeqReader.scala +++ b/src/library/scala/util/parsing/input/PagedSeqReader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/input/Reader.scala b/src/library/scala/util/parsing/input/Reader.scala index 313097e860..2249f8867a 100644 --- a/src/library/scala/util/parsing/input/Reader.scala +++ b/src/library/scala/util/parsing/input/Reader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/input/StreamReader.scala b/src/library/scala/util/parsing/input/StreamReader.scala index 3c98d0e8df..6dc15f25c8 100644 --- a/src/library/scala/util/parsing/input/StreamReader.scala +++ b/src/library/scala/util/parsing/input/StreamReader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.input diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala index 1900044698..1be8a10931 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/library/scala/util/parsing/json/JSON.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.json diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/library/scala/util/parsing/json/Lexer.scala index 0415624524..347d317f11 100644 --- a/src/library/scala/util/parsing/json/Lexer.scala +++ b/src/library/scala/util/parsing/json/Lexer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.json diff --git a/src/library/scala/util/parsing/json/Parser.scala b/src/library/scala/util/parsing/json/Parser.scala index 46a556c0ee..0d573edce4 100644 --- a/src/library/scala/util/parsing/json/Parser.scala +++ b/src/library/scala/util/parsing/json/Parser.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.parsing.json diff --git a/src/library/scala/util/regexp/Base.scala b/src/library/scala/util/regexp/Base.scala index 6ab20ec7d3..359416b20b 100644 --- a/src/library/scala/util/regexp/Base.scala +++ b/src/library/scala/util/regexp/Base.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.regexp diff --git a/src/library/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/util/regexp/PointedHedgeExp.scala index e147733fd5..83b9dbff06 100644 --- a/src/library/scala/util/regexp/PointedHedgeExp.scala +++ b/src/library/scala/util/regexp/PointedHedgeExp.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.regexp diff --git a/src/library/scala/util/regexp/SyntaxError.scala b/src/library/scala/util/regexp/SyntaxError.scala index 8fc472b2fc..367d2d1295 100644 --- a/src/library/scala/util/regexp/SyntaxError.scala +++ b/src/library/scala/util/regexp/SyntaxError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.regexp diff --git a/src/library/scala/util/regexp/WordExp.scala b/src/library/scala/util/regexp/WordExp.scala index 0a58d6399f..411a588297 100644 --- a/src/library/scala/util/regexp/WordExp.scala +++ b/src/library/scala/util/regexp/WordExp.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.util.regexp diff --git a/src/library/scala/volatile.scala b/src/library/scala/volatile.scala index 005cd6628c..7c9d9726bd 100644 --- a/src/library/scala/volatile.scala +++ b/src/library/scala/volatile.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala diff --git a/src/library/scala/xml/Atom.scala b/src/library/scala/xml/Atom.scala index 7c66995573..8d8667eae6 100644 --- a/src/library/scala/xml/Atom.scala +++ b/src/library/scala/xml/Atom.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Attribute.scala b/src/library/scala/xml/Attribute.scala index 3259526d98..17780fc024 100644 --- a/src/library/scala/xml/Attribute.scala +++ b/src/library/scala/xml/Attribute.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Comment.scala b/src/library/scala/xml/Comment.scala index 9608748601..f52f626c57 100644 --- a/src/library/scala/xml/Comment.scala +++ b/src/library/scala/xml/Comment.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Document.scala b/src/library/scala/xml/Document.scala index 6c73252a37..60e4790139 100644 --- a/src/library/scala/xml/Document.scala +++ b/src/library/scala/xml/Document.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala index 9c58177417..c65608f5fb 100644 --- a/src/library/scala/xml/Elem.scala +++ b/src/library/scala/xml/Elem.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/EntityRef.scala b/src/library/scala/xml/EntityRef.scala index fbc1f351cf..cd84fca7f4 100644 --- a/src/library/scala/xml/EntityRef.scala +++ b/src/library/scala/xml/EntityRef.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Equality.scala b/src/library/scala/xml/Equality.scala index d09ae10b2d..210029b3bd 100644 --- a/src/library/scala/xml/Equality.scala +++ b/src/library/scala/xml/Equality.scala @@ -74,7 +74,7 @@ trait Equality extends scala.Equals { def strict_==(other: Equality): Boolean def strict_!=(other: Equality) = !strict_==(other) - private def hashOf(x: Any) = if (x == null) 1 else x.hashCode() + private def hashOf(x: Any) = if (x == null) 1 else x.## /** We insist we're only equal to other xml.Equality implementors, * which heads off a lot of inconsistency up front. diff --git a/src/library/scala/xml/Group.scala b/src/library/scala/xml/Group.scala index 8b714d2813..614adc98a9 100644 --- a/src/library/scala/xml/Group.scala +++ b/src/library/scala/xml/Group.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/HasKeyValue.scala b/src/library/scala/xml/HasKeyValue.scala index 6a79adadee..1ec117a6b6 100644 --- a/src/library/scala/xml/HasKeyValue.scala +++ b/src/library/scala/xml/HasKeyValue.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/MalformedAttributeException.scala b/src/library/scala/xml/MalformedAttributeException.scala index fab4ba0d2a..a85995d960 100644 --- a/src/library/scala/xml/MalformedAttributeException.scala +++ b/src/library/scala/xml/MalformedAttributeException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/MetaData.scala b/src/library/scala/xml/MetaData.scala index 744b662fb8..ab3d476deb 100644 --- a/src/library/scala/xml/MetaData.scala +++ b/src/library/scala/xml/MetaData.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala index 47ca8fed87..3b29f2e90a 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/library/scala/xml/NamespaceBinding.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Node.scala b/src/library/scala/xml/Node.scala index 5117bb9282..6e3c2acebf 100644 --- a/src/library/scala/xml/Node.scala +++ b/src/library/scala/xml/Node.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/NodeBuffer.scala b/src/library/scala/xml/NodeBuffer.scala index 2cf999e8a4..e9c82b0451 100644 --- a/src/library/scala/xml/NodeBuffer.scala +++ b/src/library/scala/xml/NodeBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml @@ -39,9 +38,10 @@ class NodeBuffer extends scala.collection.mutable.ArrayBuffer[Node] { def &+(o: Any): NodeBuffer = { o match { case null | _: Unit | Text("") => // ignore - case it: Iterator[_] => it foreach (this &+ _) + case it: Iterator[_] => it foreach &+ case n: Node => super.+=(n) case ns: Iterable[_] => this &+ ns.iterator + case ns: Array[_] => this &+ ns.iterator case d => super.+=(new Atom(d)) } this diff --git a/src/library/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala index 0cab5422b6..cf343c55e8 100644 --- a/src/library/scala/xml/NodeSeq.scala +++ b/src/library/scala/xml/NodeSeq.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Null.scala b/src/library/scala/xml/Null.scala index d6f06fc3cd..6d2939a9a1 100644 --- a/src/library/scala/xml/Null.scala +++ b/src/library/scala/xml/Null.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/PCData.scala b/src/library/scala/xml/PCData.scala index fa44591496..330ad897f9 100644 --- a/src/library/scala/xml/PCData.scala +++ b/src/library/scala/xml/PCData.scala @@ -1,4 +1,3 @@ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/PrefixedAttribute.scala b/src/library/scala/xml/PrefixedAttribute.scala index d7c04ab6ad..c739dbe1fa 100644 --- a/src/library/scala/xml/PrefixedAttribute.scala +++ b/src/library/scala/xml/PrefixedAttribute.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala index 77199ca367..5927ae0d11 100644 --- a/src/library/scala/xml/PrettyPrinter.scala +++ b/src/library/scala/xml/PrettyPrinter.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala index 051fd499f4..72b9ba00f2 100644 --- a/src/library/scala/xml/ProcInstr.scala +++ b/src/library/scala/xml/ProcInstr.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml @@ -35,5 +34,5 @@ case class ProcInstr(target: String, proctext: String) extends SpecialNode * to this stringbuffer. */ override def buildString(sb: StringBuilder) = - sb append "<?%s%s?>".format(target, (if (proctext.isEmpty) "" else " " + proctext)) + sb append "<?%s%s?>".format(target, (if (proctext == "") "" else " " + proctext)) } diff --git a/src/library/scala/xml/QNode.scala b/src/library/scala/xml/QNode.scala index f7cec9b894..331f138f25 100644 --- a/src/library/scala/xml/QNode.scala +++ b/src/library/scala/xml/QNode.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/SpecialNode.scala b/src/library/scala/xml/SpecialNode.scala index 1688cd1e15..1b5a8a7d9a 100644 --- a/src/library/scala/xml/SpecialNode.scala +++ b/src/library/scala/xml/SpecialNode.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Text.scala b/src/library/scala/xml/Text.scala index 5f0b010c9f..aebb0d4897 100644 --- a/src/library/scala/xml/Text.scala +++ b/src/library/scala/xml/Text.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/TextBuffer.scala b/src/library/scala/xml/TextBuffer.scala index 84c6c24146..265851a04b 100644 --- a/src/library/scala/xml/TextBuffer.scala +++ b/src/library/scala/xml/TextBuffer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala index 8b3c1383c9..33b7bbfa01 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/library/scala/xml/TopScope.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/TypeSymbol.scala b/src/library/scala/xml/TypeSymbol.scala index d9b4d092dc..b9bd6960cc 100644 --- a/src/library/scala/xml/TypeSymbol.scala +++ b/src/library/scala/xml/TypeSymbol.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Unparsed.scala b/src/library/scala/xml/Unparsed.scala index d3c63172e8..7911310363 100644 --- a/src/library/scala/xml/Unparsed.scala +++ b/src/library/scala/xml/Unparsed.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/UnprefixedAttribute.scala b/src/library/scala/xml/UnprefixedAttribute.scala index a8720f13e1..a4bbef37b0 100644 --- a/src/library/scala/xml/UnprefixedAttribute.scala +++ b/src/library/scala/xml/UnprefixedAttribute.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala index 8637148489..65d7179fa2 100644 --- a/src/library/scala/xml/Utility.scala +++ b/src/library/scala/xml/Utility.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml @@ -262,14 +261,14 @@ object Utility extends AnyRef with parsing.TokenTests * @param children */ def hashCode(pre: String, label: String, attribHashCode: Int, scpeHash: Int, children: Seq[Node]) = ( - ( if(pre ne null) {41 * pre.hashCode() % 7} else {0}) - + label.hashCode() * 53 + ( if(pre ne null) {41 * pre.## % 7} else {0}) + + label.## * 53 + attribHashCode * 7 + scpeHash * 31 + { var c = 0 val i = children.iterator - while(i.hasNext) c = c * 41 + i.next.hashCode + while(i.hasNext) c = c * 41 + i.next.## c } ) diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala index dd85b58e50..b3ecc6ba7b 100644 --- a/src/library/scala/xml/XML.scala +++ b/src/library/scala/xml/XML.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/Xhtml.scala b/src/library/scala/xml/Xhtml.scala index 162ea5696a..4dc01a5b45 100644 --- a/src/library/scala/xml/Xhtml.scala +++ b/src/library/scala/xml/Xhtml.scala @@ -1,4 +1,3 @@ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index 772d8ec599..d864d4630d 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala index 2b0df3f6a5..199aa3492d 100644 --- a/src/library/scala/xml/dtd/ContentModelParser.scala +++ b/src/library/scala/xml/dtd/ContentModelParser.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index 0fde1188f3..bfb9ad19ba 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala index 2ac3d42a67..0badde91c4 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/library/scala/xml/dtd/Decl.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index 7da38b3e73..9aa2e7504d 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 9ebed8d87c..872fb58393 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml @@ -48,7 +47,7 @@ class ElementValidator() extends Function1[Node,Boolean] { def setMetaData(adecls: List[AttrDecl]) { this.adecls = adecls } def getIterable(nodes: Seq[Node], skipPCDATA: Boolean): Iterable[ElemName] = { - def isAllWhitespace(a: Atom[_]) = cond(a.data) { case s: String if s.trim.isEmpty => true } + def isAllWhitespace(a: Atom[_]) = cond(a.data) { case s: String if s.trim == "" => true } nodes.filter { case y: SpecialNode => y match { diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index b0d311e54a..df5d611690 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala index 7b3e2acfe0..b8dc2b070b 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/library/scala/xml/dtd/Scanner.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package dtd diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala index 9c3bfbc992..94f6b9aa11 100644 --- a/src/library/scala/xml/dtd/Tokens.scala +++ b/src/library/scala/xml/dtd/Tokens.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala index 692d501d10..09142e9770 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/library/scala/xml/dtd/ValidationException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala index 3996ef2d36..b0e38a39cb 100644 --- a/src/library/scala/xml/factory/Binder.scala +++ b/src/library/scala/xml/factory/Binder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala index 647ea57e36..2159f8c106 100644 --- a/src/library/scala/xml/factory/LoggedNodeFactory.scala +++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml @@ -59,7 +58,7 @@ with scala.util.logging.Logged { if (logNode) log("[makeNode for "+label+"]"); - val hash = Utility.hashCode(pre, label, attrSeq.hashCode(), scope.hashCode(), children) + val hash = Utility.hashCode(pre, label, attrSeq.##, scope.##, children) /* if(logCompressLevel >= FULL) { diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala index 2dd52242db..4178a38cd9 100644 --- a/src/library/scala/xml/factory/NodeFactory.scala +++ b/src/library/scala/xml/factory/NodeFactory.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package factory @@ -41,7 +40,7 @@ trait NodeFactory[A <: Node] eqElements(n.child, children) def makeNode(pre: String, name: String, attrSeq: MetaData, scope: NamespaceBinding, children: Seq[Node]): A = { - val hash = Utility.hashCode( pre, name, attrSeq.hashCode(), scope.hashCode(), children) + val hash = Utility.hashCode( pre, name, attrSeq.##, scope.##, children) def cons(old: List[A]) = construct(hash, old, pre, name, attrSeq, scope, children) (cache get hash) match { diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/library/scala/xml/factory/XMLLoader.scala index 6321c10e97..006edca054 100644 --- a/src/library/scala/xml/factory/XMLLoader.scala +++ b/src/library/scala/xml/factory/XMLLoader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package factory @@ -24,17 +23,13 @@ trait XMLLoader[T <: Node] import scala.xml.Source._ def adapter: FactoryAdapter = new NoBindingFactoryAdapter() - private val saxFactory = { + /* Override this to use a different SAXParser. */ + def parser: SAXParser = { val f = SAXParserFactory.newInstance() f.setNamespaceAware(false) - // Discovered at: http://www.jdom.org/docs/faq.html#a0350 (see ticket #2725) - f.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false) - f + f.newSAXParser() } - /* Override this to use a different SAXParser. */ - def parser: SAXParser = saxFactory.newSAXParser() - /** Loads XML from the given InputSource, using the supplied parser. * The methods available in scala.xml.XML use the XML parser in the JDK. */ diff --git a/src/library/scala/xml/include/CircularIncludeException.scala b/src/library/scala/xml/include/CircularIncludeException.scala index a2b4fd7681..5c6e327de9 100644 --- a/src/library/scala/xml/include/CircularIncludeException.scala +++ b/src/library/scala/xml/include/CircularIncludeException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include diff --git a/src/library/scala/xml/include/UnavailableResourceException.scala b/src/library/scala/xml/include/UnavailableResourceException.scala index aa313cabec..da1c5d452c 100644 --- a/src/library/scala/xml/include/UnavailableResourceException.scala +++ b/src/library/scala/xml/include/UnavailableResourceException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include diff --git a/src/library/scala/xml/include/XIncludeException.scala b/src/library/scala/xml/include/XIncludeException.scala index a671f32dca..3faf587cd9 100644 --- a/src/library/scala/xml/include/XIncludeException.scala +++ b/src/library/scala/xml/include/XIncludeException.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/library/scala/xml/include/sax/EncodingHeuristics.scala index 6b04e859b8..95fe240635 100644 --- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala +++ b/src/library/scala/xml/include/sax/EncodingHeuristics.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include.sax diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala index 60031b4b6a..ed2e5ebf37 100644 --- a/src/library/scala/xml/include/sax/Main.scala +++ b/src/library/scala/xml/include/sax/Main.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include.sax diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/library/scala/xml/include/sax/XIncludeFilter.scala index b5c468dc81..ce0fc4bf50 100644 --- a/src/library/scala/xml/include/sax/XIncludeFilter.scala +++ b/src/library/scala/xml/include/sax/XIncludeFilter.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include.sax diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala index 8bc3c4e41a..64d91b21ca 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/library/scala/xml/include/sax/XIncluder.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package include.sax diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala index 319483752a..f2dd7e58fd 100644 --- a/src/library/scala/xml/parsing/ConstructingHandler.scala +++ b/src/library/scala/xml/parsing/ConstructingHandler.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala index 00f195e9fd..e54e411587 100644 --- a/src/library/scala/xml/parsing/ConstructingParser.scala +++ b/src/library/scala/xml/parsing/ConstructingParser.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala index 0a8bd7c4d6..c215b8b639 100644 --- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala +++ b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala index 4081fa9722..e0a0f6b986 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/library/scala/xml/parsing/ExternalSources.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala index 6960e05d25..0e8ea2c5b6 100644 --- a/src/library/scala/xml/parsing/FactoryAdapter.scala +++ b/src/library/scala/xml/parsing/FactoryAdapter.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala index 73634298fa..d2d6cf32b4 100644 --- a/src/library/scala/xml/parsing/FatalError.scala +++ b/src/library/scala/xml/parsing/FatalError.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala index bcb0e03a07..d53e5d3319 100644 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/library/scala/xml/parsing/MarkupHandler.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala index 083465bc41..3854f66683 100644 --- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala +++ b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package parsing diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala index 13500e8510..88a9ac3756 100644 --- a/src/library/scala/xml/parsing/TokenTests.scala +++ b/src/library/scala/xml/parsing/TokenTests.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala index 00126c4881..c02d1e1242 100644 --- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/parsing/XhtmlEntities.scala b/src/library/scala/xml/parsing/XhtmlEntities.scala index 6e35aa9606..5ca2cf2b0c 100644 --- a/src/library/scala/xml/parsing/XhtmlEntities.scala +++ b/src/library/scala/xml/parsing/XhtmlEntities.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package parsing diff --git a/src/library/scala/xml/parsing/XhtmlParser.scala b/src/library/scala/xml/parsing/XhtmlParser.scala index 464c543f30..0647addf8b 100644 --- a/src/library/scala/xml/parsing/XhtmlParser.scala +++ b/src/library/scala/xml/parsing/XhtmlParser.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package parsing diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/library/scala/xml/persistent/CachedFileStorage.scala index 8715944794..dfd675f36a 100644 --- a/src/library/scala/xml/persistent/CachedFileStorage.scala +++ b/src/library/scala/xml/persistent/CachedFileStorage.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package persistent diff --git a/src/library/scala/xml/persistent/Index.scala b/src/library/scala/xml/persistent/Index.scala index 7468efeb93..92825f92c7 100644 --- a/src/library/scala/xml/persistent/Index.scala +++ b/src/library/scala/xml/persistent/Index.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/persistent/SetStorage.scala b/src/library/scala/xml/persistent/SetStorage.scala index cedd01063f..a49858487c 100644 --- a/src/library/scala/xml/persistent/SetStorage.scala +++ b/src/library/scala/xml/persistent/SetStorage.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package persistent diff --git a/src/library/scala/xml/pull/XMLEvent.scala b/src/library/scala/xml/pull/XMLEvent.scala index 4fa30836b8..3de618e3a7 100644 --- a/src/library/scala/xml/pull/XMLEvent.scala +++ b/src/library/scala/xml/pull/XMLEvent.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala index deff8e75ff..90c19f9c0b 100644 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/library/scala/xml/pull/XMLEventReader.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml package pull diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala index 33819e12ef..242549ebb2 100644 --- a/src/library/scala/xml/transform/BasicTransformer.scala +++ b/src/library/scala/xml/transform/BasicTransformer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala index fbf52c39a4..1b6a0cb16b 100644 --- a/src/library/scala/xml/transform/RewriteRule.scala +++ b/src/library/scala/xml/transform/RewriteRule.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala index 80cc7bb067..2105d1437b 100644 --- a/src/library/scala/xml/transform/RuleTransformer.scala +++ b/src/library/scala/xml/transform/RuleTransformer.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ -// $Id$ package scala.xml |