{ tpl.companion match { -- cgit v1.2.3 From 65b9fec4b1981c3e10c27cd41fd8cac054e7b05c Mon Sep 17 00:00:00 2001 From: Simon Ochsenreither Date: Wed, 2 May 2012 02:58:54 +0200 Subject: Fixes SI-4478. - Replaced/simplified usages of "wrt". - Added backticks to $Coll definitions, so stuff like "immutable.Stack" hopefully stops being interpreted as the end of a sentence and shown like that in the summary line of ScalaDoc's method description. See collection.immutable.Stack's sortBy. Additionally, it looks nicer this way. - Fixes the typo mentioned in SI-5666. --- src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 2 +- src/library/rootdoc.txt | 4 ++-- src/library/scala/Array.scala | 2 +- src/library/scala/Option.scala | 2 +- src/library/scala/collection/BitSet.scala | 2 +- src/library/scala/collection/BitSetLike.scala | 2 +- src/library/scala/collection/GenIterableLike.scala | 2 +- src/library/scala/collection/GenMapLike.scala | 2 +- src/library/scala/collection/GenTraversableLike.scala | 2 +- src/library/scala/collection/GenTraversableOnce.scala | 2 +- src/library/scala/collection/IndexedSeq.scala | 2 +- src/library/scala/collection/IndexedSeqLike.scala | 2 +- src/library/scala/collection/Iterable.scala | 2 +- src/library/scala/collection/LinearSeq.scala | 2 +- src/library/scala/collection/Map.scala | 2 +- src/library/scala/collection/Seq.scala | 2 +- src/library/scala/collection/SeqLike.scala | 14 +++++++------- src/library/scala/collection/Set.scala | 2 +- src/library/scala/collection/concurrent/Map.scala | 2 +- .../collection/generic/ArrayTagTraversableFactory.scala | 2 +- src/library/scala/collection/generic/BitSetFactory.scala | 2 +- src/library/scala/collection/generic/GenMapFactory.scala | 2 +- src/library/scala/collection/generic/GenSetFactory.scala | 2 +- .../scala/collection/generic/GenTraversableFactory.scala | 2 +- .../scala/collection/generic/GenericCompanion.scala | 2 +- .../scala/collection/generic/GenericParCompanion.scala | 2 +- src/library/scala/collection/generic/Growable.scala | 2 +- .../collection/generic/ImmutableSortedMapFactory.scala | 2 +- .../collection/generic/ImmutableSortedSetFactory.scala | 4 ++-- .../scala/collection/generic/MutableSortedSetFactory.scala | 4 ++-- src/library/scala/collection/generic/ParFactory.scala | 2 +- src/library/scala/collection/generic/ParMapFactory.scala | 2 +- src/library/scala/collection/generic/Shrinkable.scala | 2 +- src/library/scala/collection/immutable/BitSet.scala | 4 ++-- .../scala/collection/immutable/GenSeq.scala.disabled | 2 +- .../scala/collection/immutable/GenSet.scala.disabled | 2 +- src/library/scala/collection/immutable/HashMap.scala | 4 ++-- src/library/scala/collection/immutable/HashSet.scala | 6 +++--- src/library/scala/collection/immutable/IndexedSeq.scala | 2 +- src/library/scala/collection/immutable/IntMap.scala | 4 ++-- src/library/scala/collection/immutable/Iterable.scala | 4 ++-- src/library/scala/collection/immutable/LinearSeq.scala | 2 +- src/library/scala/collection/immutable/List.scala | 4 ++-- src/library/scala/collection/immutable/LongMap.scala | 4 ++-- src/library/scala/collection/immutable/Map.scala | 2 +- src/library/scala/collection/immutable/NumericRange.scala | 2 +- src/library/scala/collection/immutable/PagedSeq.scala | 2 +- src/library/scala/collection/immutable/Queue.scala | 4 ++-- src/library/scala/collection/immutable/Seq.scala | 4 ++-- src/library/scala/collection/immutable/Set.scala | 4 ++-- src/library/scala/collection/immutable/SortedSet.scala | 4 ++-- src/library/scala/collection/immutable/Stack.scala | 4 ++-- src/library/scala/collection/immutable/Stream.scala | 8 ++++---- src/library/scala/collection/immutable/StringLike.scala | 2 +- src/library/scala/collection/immutable/StringOps.scala | 2 +- src/library/scala/collection/immutable/Traversable.scala | 2 +- src/library/scala/collection/immutable/TreeSet.scala | 4 ++-- src/library/scala/collection/immutable/Vector.scala | 2 +- src/library/scala/collection/immutable/WrappedString.scala | 2 +- src/library/scala/collection/mutable/ArrayBuffer.scala | 4 ++-- src/library/scala/collection/mutable/ArrayLike.scala | 2 +- src/library/scala/collection/mutable/ArrayOps.scala | 2 +- src/library/scala/collection/mutable/ArraySeq.scala | 4 ++-- src/library/scala/collection/mutable/ArrayStack.scala | 4 ++-- src/library/scala/collection/mutable/BitSet.scala | 4 ++-- src/library/scala/collection/mutable/Buffer.scala | 4 ++-- src/library/scala/collection/mutable/BufferProxy.scala | 2 +- src/library/scala/collection/mutable/ConcurrentMap.scala | 2 +- .../scala/collection/mutable/DoubleLinkedList.scala | 4 ++-- .../scala/collection/mutable/DoubleLinkedListLike.scala | 2 +- src/library/scala/collection/mutable/GenSeq.scala.disabled | 2 +- src/library/scala/collection/mutable/GenSet.scala.disabled | 2 +- src/library/scala/collection/mutable/GrowingBuilder.scala | 2 +- src/library/scala/collection/mutable/HashMap.scala | 4 ++-- src/library/scala/collection/mutable/HashSet.scala | 4 ++-- src/library/scala/collection/mutable/IndexedSeq.scala | 2 +- src/library/scala/collection/mutable/IndexedSeqLike.scala | 2 +- src/library/scala/collection/mutable/Iterable.scala | 2 +- src/library/scala/collection/mutable/LinearSeq.scala | 4 ++-- src/library/scala/collection/mutable/LinkedHashMap.scala | 4 ++-- src/library/scala/collection/mutable/LinkedHashSet.scala | 4 ++-- src/library/scala/collection/mutable/LinkedList.scala | 4 ++-- src/library/scala/collection/mutable/LinkedListLike.scala | 2 +- src/library/scala/collection/mutable/ListBuffer.scala | 4 ++-- src/library/scala/collection/mutable/ListMap.scala | 4 ++-- src/library/scala/collection/mutable/Map.scala | 2 +- src/library/scala/collection/mutable/MultiMap.scala | 2 +- src/library/scala/collection/mutable/OpenHashMap.scala | 4 ++-- src/library/scala/collection/mutable/Queue.scala | 2 +- src/library/scala/collection/mutable/Seq.scala | 4 ++-- src/library/scala/collection/mutable/Set.scala | 4 ++-- src/library/scala/collection/mutable/SortedSet.scala | 4 ++-- src/library/scala/collection/mutable/Stack.scala | 4 ++-- .../scala/collection/mutable/SynchronizedBuffer.scala | 2 +- src/library/scala/collection/mutable/SynchronizedMap.scala | 2 +- .../collection/mutable/SynchronizedPriorityQueue.scala | 2 +- .../scala/collection/mutable/SynchronizedQueue.scala | 2 +- src/library/scala/collection/mutable/SynchronizedSet.scala | 2 +- .../scala/collection/mutable/SynchronizedStack.scala | 2 +- src/library/scala/collection/mutable/Traversable.scala | 2 +- src/library/scala/collection/mutable/TreeSet.scala | 2 +- src/library/scala/collection/mutable/UnrolledBuffer.scala | 2 +- src/library/scala/collection/mutable/WeakHashMap.scala | 4 ++-- src/library/scala/collection/mutable/WrappedArray.scala | 2 +- src/library/scala/collection/parallel/ParIterable.scala | 2 +- .../scala/collection/parallel/immutable/ParHashMap.scala | 4 ++-- .../scala/collection/parallel/immutable/ParHashSet.scala | 4 ++-- .../parallel/immutable/ParNumericRange.scala.disabled | 2 +- .../scala/collection/parallel/immutable/ParRange.scala | 2 +- .../scala/collection/parallel/immutable/ParSeq.scala | 4 ++-- .../scala/collection/parallel/immutable/ParSet.scala | 4 ++-- .../scala/collection/parallel/immutable/ParVector.scala | 4 ++-- .../scala/collection/parallel/mutable/ParArray.scala | 4 ++-- .../collection/parallel/mutable/ParFlatHashTable.scala | 2 +- .../scala/collection/parallel/mutable/ParHashMap.scala | 4 ++-- .../scala/collection/parallel/mutable/ParHashSet.scala | 4 ++-- src/library/scala/collection/parallel/mutable/ParSeq.scala | 4 ++-- src/library/scala/collection/parallel/mutable/ParSet.scala | 4 ++-- src/library/scala/reflect/api/Types.scala | 14 ++++++++------ 119 files changed, 182 insertions(+), 180 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 5e5b09405c..4aeb537f9b 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -821,7 +821,7 @@ abstract class GenICode extends SubComponent { ctx2 case _ => - abort("Cannot instantiate " + tpt + "of kind: " + generatedType) + abort("Cannot instantiate " + tpt + " of kind: " + generatedType) } case Apply(fun @ _, List(expr)) if (definitions.isBox(fun.symbol)) => diff --git a/src/library/rootdoc.txt b/src/library/rootdoc.txt index 6145429f1e..da27a0084b 100644 --- a/src/library/rootdoc.txt +++ b/src/library/rootdoc.txt @@ -22,6 +22,6 @@ Many other packages exist. See the complete list on the left. Identifiers in the scala package and the [[scala.Predef]] object are always in scope by default. -Some of these identifiers are type aliases provided as shortcuts to commonly used classes. For example, List is an alias for scala.collection.immutable.[[scala.collection.immutable.List]]. +Some of these identifiers are type aliases provided as shortcuts to commonly used classes. For example, `List` is an alias for scala.collection.immutable.[[scala.collection.immutable.List]]. -Other aliases refer to classes providing by the underlying platform. For example, on the JVM, String is an alias for java.lang.String. +Other aliases refer to classes provided by the underlying platform. For example, on the JVM, `String` is an alias for `java.lang.String`. diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index fd61cfd0a1..36e95b303d 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -468,7 +468,7 @@ object Array extends FallbackArrayBuilding { * @see [[http://www.scala-lang.org/docu/files/collections-api/collections_38.html#anchor "The Scala 2.8 Collections' API"]] * section on `Array` by Martin Odersky for more information. * @define coll array - * @define Coll Array + * @define Coll `Array` * @define orderDependent * @define orderDependentFold * @define mayNotTerminateInf diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala index a58297d7d4..44c8fba45f 100644 --- a/src/library/scala/Option.scala +++ b/src/library/scala/Option.scala @@ -83,7 +83,7 @@ object Option { * @define p `p` * @define f `f` * @define coll option - * @define Coll Option + * @define Coll `Option` * @define orderDependent * @define orderDependentFold * @define mayNotTerminateInf diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala index 59b53faf7e..90e837b219 100644 --- a/src/library/scala/collection/BitSet.scala +++ b/src/library/scala/collection/BitSet.scala @@ -22,7 +22,7 @@ trait BitSet extends SortedSet[Int] /** $factoryInfo * @define coll bitset - * @define Coll BitSet + * @define Coll `BitSet` */ object BitSet extends BitSetFactory[BitSet] { val empty: BitSet = immutable.BitSet.empty diff --git a/src/library/scala/collection/BitSetLike.scala b/src/library/scala/collection/BitSetLike.scala index e4f9fd436a..c0aaa9f28e 100644 --- a/src/library/scala/collection/BitSetLike.scala +++ b/src/library/scala/collection/BitSetLike.scala @@ -30,7 +30,7 @@ import mutable.StringBuilder * @version 2.8 * @since 2.8 * @define coll bitset - * @define Coll BitSet + * @define Coll `BitSet` */ trait BitSetLike[+This <: BitSetLike[This] with SortedSet[Int]] extends SortedSetLike[Int, This] { self => diff --git a/src/library/scala/collection/GenIterableLike.scala b/src/library/scala/collection/GenIterableLike.scala index 8fa5981969..79113ddaa7 100644 --- a/src/library/scala/collection/GenIterableLike.scala +++ b/src/library/scala/collection/GenIterableLike.scala @@ -16,7 +16,7 @@ import generic.{ CanBuildFrom => CBF, _ } * This trait contains abstract methods and methods that can be implemented * directly in terms of other methods. * - * @define Coll GenIterable + * @define Coll `GenIterable` * @define coll general iterable collection * * @author Martin Odersky diff --git a/src/library/scala/collection/GenMapLike.scala b/src/library/scala/collection/GenMapLike.scala index 114169c849..d611eaea43 100644 --- a/src/library/scala/collection/GenMapLike.scala +++ b/src/library/scala/collection/GenMapLike.scala @@ -11,7 +11,7 @@ package scala.collection /** A trait for all maps upon which operations may be * implemented in parallel. * - * @define Coll GenMap + * @define Coll `GenMap` * @define coll general map * @author Martin Odersky * @author Aleksandar Prokopec diff --git a/src/library/scala/collection/GenTraversableLike.scala b/src/library/scala/collection/GenTraversableLike.scala index 4500a849b1..903594b69d 100644 --- a/src/library/scala/collection/GenTraversableLike.scala +++ b/src/library/scala/collection/GenTraversableLike.scala @@ -43,7 +43,7 @@ import annotation.migration * @define traversableInfo * This is a base trait of all kinds of Scala collections. * - * @define Coll GenTraversable + * @define Coll `GenTraversable` * @define coll general collection * @define collectExample * @tparam A the collection element type. diff --git a/src/library/scala/collection/GenTraversableOnce.scala b/src/library/scala/collection/GenTraversableOnce.scala index fd8595ccb8..f4e3848d98 100644 --- a/src/library/scala/collection/GenTraversableOnce.scala +++ b/src/library/scala/collection/GenTraversableOnce.scala @@ -14,7 +14,7 @@ package scala.collection * Methods in this trait are either abstract or can be implemented in terms * of other methods. * - * @define Coll GenTraversableOnce + * @define Coll `GenTraversableOnce` * @define coll collection or iterator * @define possiblyparinfo * This trait may possibly have operations implemented in parallel. diff --git a/src/library/scala/collection/IndexedSeq.scala b/src/library/scala/collection/IndexedSeq.scala index 4a3586a375..56dd0bffff 100644 --- a/src/library/scala/collection/IndexedSeq.scala +++ b/src/library/scala/collection/IndexedSeq.scala @@ -26,7 +26,7 @@ trait IndexedSeq[+A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is a `Vector`. * @define coll indexed sequence - * @define Coll IndexedSeq + * @define Coll `IndexedSeq` */ object IndexedSeq extends SeqFactory[IndexedSeq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, IndexedSeq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/IndexedSeqLike.scala b/src/library/scala/collection/IndexedSeqLike.scala index d1f7d1cb36..11f481e425 100644 --- a/src/library/scala/collection/IndexedSeqLike.scala +++ b/src/library/scala/collection/IndexedSeqLike.scala @@ -26,7 +26,7 @@ import scala.annotation.tailrec * access and length computation. They are defined in terms of abstract methods * `apply` for indexing and `length`. * - * Indexed sequences do not add any new methods wrt `Seq`, but promise + * Indexed sequences do not add any new methods to `Seq`, but promise * efficient implementations of random access patterns. * * @tparam A the element type of the $coll diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index b1752a5c67..f543c6f80f 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -40,7 +40,7 @@ trait Iterable[+A] extends Traversable[A] /** $factoryInfo * The current default implementation of a $Coll is a `Vector`. * @define coll iterable collection - * @define Coll Iterable + * @define Coll `Iterable` */ object Iterable extends TraversableFactory[Iterable] { diff --git a/src/library/scala/collection/LinearSeq.scala b/src/library/scala/collection/LinearSeq.scala index be143cf96b..21ed91f7f3 100644 --- a/src/library/scala/collection/LinearSeq.scala +++ b/src/library/scala/collection/LinearSeq.scala @@ -26,7 +26,7 @@ trait LinearSeq[+A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is a `Vector`. * @define coll linear sequence - * @define Coll LinearSeq + * @define Coll `LinearSeq` */ object LinearSeq extends SeqFactory[LinearSeq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, LinearSeq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala index 0c07d5bb74..a124e60c96 100644 --- a/src/library/scala/collection/Map.scala +++ b/src/library/scala/collection/Map.scala @@ -33,7 +33,7 @@ trait Map[A, +B] extends Iterable[(A, B)] with GenMap[A, B] with MapLike[A, B, M } /** $factoryInfo - * @define Coll Map + * @define Coll `Map` * @define coll map */ object Map extends MapFactory[Map] { diff --git a/src/library/scala/collection/Seq.scala b/src/library/scala/collection/Seq.scala index fd03a49af4..34705ee058 100644 --- a/src/library/scala/collection/Seq.scala +++ b/src/library/scala/collection/Seq.scala @@ -27,7 +27,7 @@ trait Seq[+A] extends PartialFunction[Int, A] /** $factoryInfo * The current default implementation of a $Coll is a `List`. * @define coll sequence - * @define Coll Seq + * @define Coll `Seq` */ object Seq extends SeqFactory[Seq] { /** $genericCanBuildFromInfo */ diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala index a9535adc23..044bd624ae 100644 --- a/src/library/scala/collection/SeqLike.scala +++ b/src/library/scala/collection/SeqLike.scala @@ -45,7 +45,7 @@ import scala.math.Ordering * @version 1.0, 16/07/2003 * @since 2.8 * - * @define Coll Seq + * @define Coll `Seq` * @define coll sequence * @define thatinfo the class of the returned collection. Where possible, `That` is * the same class as the current collection class `Repr`, but this @@ -380,8 +380,8 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[ * $mayNotTerminateInf * * @param elem the element to test. - * @return `true` if this $coll has an element that is - * is equal (wrt `==`) to `elem`, `false` otherwise. + * @return `true` if this $coll has an element that is equal (as + * determined by `==`) to `elem`, `false` otherwise. */ def contains(elem: Any): Boolean = exists (_ == elem) @@ -553,8 +553,8 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[ /** Sorts this $coll according to a comparison function. * $willNotTerminateInf * - * The sort is stable. That is, elements that are equal wrt `lt` appear in the - * same order in the sorted sequence as in the original. + * The sort is stable. That is, elements that are equal (as determined by + * `lt`) appear in the same order in the sorted sequence as in the original. * * @param lt the comparison function which tests whether * its first argument precedes its second argument in @@ -592,8 +592,8 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[ /** Sorts this $coll according to an Ordering. * - * The sort is stable. That is, elements that are equal wrt `lt` appear in the - * same order in the sorted sequence as in the original. + * The sort is stable. That is, elements that are equal (as determined by + * `lt`) appear in the same order in the sorted sequence as in the original. * * @see scala.math.Ordering * diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala index 4c67aad603..7424c9cb9a 100644 --- a/src/library/scala/collection/Set.scala +++ b/src/library/scala/collection/Set.scala @@ -35,7 +35,7 @@ trait Set[A] extends (A => Boolean) * The current default implementation of a $Coll is one of `EmptySet`, `Set1`, `Set2`, `Set3`, `Set4` in * class `immutable.Set` for sets of sizes up to 4, and a `immutable.HashSet` for sets of larger sizes. * @define coll set - * @define Coll Set + * @define Coll `Set` */ object Set extends SetFactory[Set] { def newBuilder[A] = immutable.Set.newBuilder[A] diff --git a/src/library/scala/collection/concurrent/Map.scala b/src/library/scala/collection/concurrent/Map.scala index 83445738d9..a724be42cc 100644 --- a/src/library/scala/collection/concurrent/Map.scala +++ b/src/library/scala/collection/concurrent/Map.scala @@ -19,7 +19,7 @@ package scala.collection.concurrent * @tparam A the key type of the map * @tparam B the value type of the map * - * @define Coll ConcurrentMap + * @define Coll `ConcurrentMap` * @define coll concurrent map * @define concurrentmapinfo * This is a base trait for all Scala concurrent map implementations. It diff --git a/src/library/scala/collection/generic/ArrayTagTraversableFactory.scala b/src/library/scala/collection/generic/ArrayTagTraversableFactory.scala index d9ab17559e..ddae0a4d64 100644 --- a/src/library/scala/collection/generic/ArrayTagTraversableFactory.scala +++ b/src/library/scala/collection/generic/ArrayTagTraversableFactory.scala @@ -15,7 +15,7 @@ import language.higherKinds * subclasses thereof. * * @define coll collection - * @define Coll Traversable + * @define Coll `Traversable` * @define genericCanBuildFromInfo * The standard `CanBuildFrom` instance for $Coll objects. * @author Aleksandar Prokopec diff --git a/src/library/scala/collection/generic/BitSetFactory.scala b/src/library/scala/collection/generic/BitSetFactory.scala index 796b12b0ac..da80b3964b 100644 --- a/src/library/scala/collection/generic/BitSetFactory.scala +++ b/src/library/scala/collection/generic/BitSetFactory.scala @@ -15,7 +15,7 @@ import scala.collection._ import mutable.Builder /** @define coll collection - * @define Coll Traversable + * @define Coll `Traversable` * @define factoryInfo * This object provides a set of operations to create `$Coll` values. * @author Martin Odersky diff --git a/src/library/scala/collection/generic/GenMapFactory.scala b/src/library/scala/collection/generic/GenMapFactory.scala index b3faf0497b..31fe4e100d 100644 --- a/src/library/scala/collection/generic/GenMapFactory.scala +++ b/src/library/scala/collection/generic/GenMapFactory.scala @@ -15,7 +15,7 @@ import language.higherKinds /** A template for companion objects of `Map` and subclasses thereof. * * @define coll map - * @define Coll Map + * @define Coll `Map` * @define factoryInfo * This object provides a set of operations needed to create `$Coll` values. * @author Martin Odersky diff --git a/src/library/scala/collection/generic/GenSetFactory.scala b/src/library/scala/collection/generic/GenSetFactory.scala index caae8afa1c..4f812b337c 100644 --- a/src/library/scala/collection/generic/GenSetFactory.scala +++ b/src/library/scala/collection/generic/GenSetFactory.scala @@ -17,7 +17,7 @@ import language.higherKinds /** A template for companion objects of `Set` and subclasses thereof. * * @define coll set - * @define Coll Set + * @define Coll `Set` * @define factoryInfo * This object provides a set of operations needed to create `$Coll` values. * @author Martin Odersky diff --git a/src/library/scala/collection/generic/GenTraversableFactory.scala b/src/library/scala/collection/generic/GenTraversableFactory.scala index f233a40d35..94def7ab5d 100644 --- a/src/library/scala/collection/generic/GenTraversableFactory.scala +++ b/src/library/scala/collection/generic/GenTraversableFactory.scala @@ -19,7 +19,7 @@ import language.higherKinds * @since 2.8 * * @define coll collection - * @define Coll Traversable + * @define Coll `Traversable` * @define factoryInfo * This object provides a set of operations to create `$Coll` values. * @author Martin Odersky diff --git a/src/library/scala/collection/generic/GenericCompanion.scala b/src/library/scala/collection/generic/GenericCompanion.scala index cf01cf5f08..badceac713 100644 --- a/src/library/scala/collection/generic/GenericCompanion.scala +++ b/src/library/scala/collection/generic/GenericCompanion.scala @@ -20,7 +20,7 @@ import language.higherKinds * @author Martin Odersky * @since 2.8 * @define coll collection - * @define Coll CC + * @define Coll `CC` */ abstract class GenericCompanion[+CC[X] <: GenTraversable[X]] { /** The underlying collection type with unknown element type */ diff --git a/src/library/scala/collection/generic/GenericParCompanion.scala b/src/library/scala/collection/generic/GenericParCompanion.scala index 93c166b7ba..484da5c6d9 100644 --- a/src/library/scala/collection/generic/GenericParCompanion.scala +++ b/src/library/scala/collection/generic/GenericParCompanion.scala @@ -16,7 +16,7 @@ import language.higherKinds /** A template class for companion objects of parallel collection classes. * They should be mixed in together with `GenericCompanion` type. * - * @define Coll ParIterable + * @define Coll `ParIterable` * @tparam CC the type constructor representing the collection class * @since 2.8 */ diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index f0a70c2b88..baf332fcd8 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -18,7 +18,7 @@ package generic * @version 2.8 * @since 2.8 * @define coll growable collection - * @define Coll Growable + * @define Coll `Growable` * @define add add * @define Add add */ diff --git a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala index 93aae0e355..f415a52b4d 100644 --- a/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala @@ -16,7 +16,7 @@ import language.higherKinds /** A template for companion objects of `SortedMap` and subclasses thereof. * * @since 2.8 - * @define Coll SortedMap + * @define Coll `SortedMap` * @define coll sorted map * @define factoryInfo * This object provides a set of operations needed to create sorted maps of type `$Coll`. diff --git a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala index 67fb72270c..1317bb4796 100644 --- a/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala @@ -16,8 +16,8 @@ import language.higherKinds /** A template for companion objects of `SortedSet` and subclasses thereof. * * @since 2.8 - * @define Coll immutable.SortedSet - * @define coll immutable sorted + * @define Coll `immutable.SortedSet` + * @define coll immutable sorted set * @define factoryInfo * This object provides a set of operations needed to create sorted sets of type `$Coll`. * @author Martin Odersky diff --git a/src/library/scala/collection/generic/MutableSortedSetFactory.scala b/src/library/scala/collection/generic/MutableSortedSetFactory.scala index b0dd23ee1a..0e90ed999c 100644 --- a/src/library/scala/collection/generic/MutableSortedSetFactory.scala +++ b/src/library/scala/collection/generic/MutableSortedSetFactory.scala @@ -13,8 +13,8 @@ import scala.collection.mutable.{ Builder, GrowingBuilder } import language.higherKinds /** - * @define Coll mutable.SortedSet - * @define coll mutable sorted + * @define Coll `mutable.SortedSet` + * @define coll mutable sorted set * * @author Lucien Pereira * diff --git a/src/library/scala/collection/generic/ParFactory.scala b/src/library/scala/collection/generic/ParFactory.scala index 0829ba6616..41dca8fbe9 100644 --- a/src/library/scala/collection/generic/ParFactory.scala +++ b/src/library/scala/collection/generic/ParFactory.scala @@ -17,7 +17,7 @@ import language.higherKinds * operations to create `$Coll` objects. * * @define coll parallel collection - * @define Coll ParIterable + * @define Coll `ParIterable` * @since 2.8 */ abstract class ParFactory[CC[X] <: ParIterable[X] with GenericParTemplate[X, CC]] diff --git a/src/library/scala/collection/generic/ParMapFactory.scala b/src/library/scala/collection/generic/ParMapFactory.scala index c05ab73431..5aedf67924 100644 --- a/src/library/scala/collection/generic/ParMapFactory.scala +++ b/src/library/scala/collection/generic/ParMapFactory.scala @@ -19,7 +19,7 @@ import language.higherKinds * to create `$Coll` objects. * * @define coll parallel map - * @define Coll ParMap + * @define Coll `ParMap` * @author Aleksandar Prokopec * @since 2.8 */ diff --git a/src/library/scala/collection/generic/Shrinkable.scala b/src/library/scala/collection/generic/Shrinkable.scala index 88c7ce3a3d..0c9dafefb1 100644 --- a/src/library/scala/collection/generic/Shrinkable.scala +++ b/src/library/scala/collection/generic/Shrinkable.scala @@ -17,7 +17,7 @@ package generic * @version 2.8 * @since 2.8 * @define coll shrinkable collection - * @define Coll Shrinkable + * @define Coll `Shrinkable` */ trait Shrinkable[-A] { diff --git a/src/library/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala index 870d5534dc..1b676e2d2f 100644 --- a/src/library/scala/collection/immutable/BitSet.scala +++ b/src/library/scala/collection/immutable/BitSet.scala @@ -20,7 +20,7 @@ import mutable.{ Builder, SetBuilder } * @see [[http://docs.scala-lang.org/overviews/collections/concrete-immutable-collection-classes.html#immutable_bitsets "Scala's Collection Library overview"]] * section on `Immutable BitSets` for more information. * - * @define Coll immutable.BitSet + * @define Coll `immutable.BitSet` * @define coll immutable bitset */ @SerialVersionUID(1611436763290191562L) @@ -63,7 +63,7 @@ abstract class BitSet extends scala.collection.AbstractSet[Int] } /** $factoryInfo - * @define Coll immutable.BitSet + * @define Coll `immutable.BitSet` * @define coll immutable bitset */ object BitSet extends BitSetFactory[BitSet] { diff --git a/src/library/scala/collection/immutable/GenSeq.scala.disabled b/src/library/scala/collection/immutable/GenSeq.scala.disabled index 5b59418b9f..b8bc420ec3 100644 --- a/src/library/scala/collection/immutable/GenSeq.scala.disabled +++ b/src/library/scala/collection/immutable/GenSeq.scala.disabled @@ -25,7 +25,7 @@ import mutable.Builder * * The class adds an `update` method to `collection.Seq`. * - * @define Coll mutable.Seq + * @define Coll `mutable.Seq` * @define coll mutable sequence */ trait GenSeq[+A] extends GenIterable[A] diff --git a/src/library/scala/collection/immutable/GenSet.scala.disabled b/src/library/scala/collection/immutable/GenSet.scala.disabled index dc921b5245..828219580e 100644 --- a/src/library/scala/collection/immutable/GenSet.scala.disabled +++ b/src/library/scala/collection/immutable/GenSet.scala.disabled @@ -24,7 +24,7 @@ import mutable.Builder * * @since 1.0 * @author Matthias Zenger - * @define Coll mutable.Set + * @define Coll `mutable.Set` * @define coll mutable set */ trait GenSet[A] extends GenIterable[A] diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index 6b11371bec..13a0febfee 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -27,7 +27,7 @@ import parallel.immutable.ParHashMap * @since 2.3 * @see [[http://docs.scala-lang.org/overviews/collections/concrete-immutable-collection-classes.html#hash_tries "Scala's Collection Library overview"]] * section on `Hash Tries` for more information. - * @define Coll immutable.HashMap + * @define Coll `immutable.HashMap` * @define coll immutable hash map * @define mayNotTerminateInf * @define willNotTerminateInf @@ -96,7 +96,7 @@ class HashMap[A, +B] extends AbstractMap[A, B] } /** $factoryInfo - * @define Coll immutable.HashMap + * @define Coll `immutable.HashMap` * @define coll immutable hash map * * @author Tiark Rompf diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala index 79d2fb71cc..b956a4d838 100644 --- a/src/library/scala/collection/immutable/HashSet.scala +++ b/src/library/scala/collection/immutable/HashSet.scala @@ -26,7 +26,7 @@ import collection.parallel.immutable.ParHashSet * @author Tiark Rompf * @version 2.8 * @since 2.3 - * @define Coll immutable.HashSet + * @define Coll `immutable.HashSet` * @define coll immutable hash set */ @SerialVersionUID(2L) @@ -85,12 +85,12 @@ class HashSet[A] extends AbstractSet[A] } /** $factoryInfo - * @define Coll immutable.HashSet + * @define Coll `immutable.HashSet` * @define coll immutable hash set * * @author Tiark Rompf * @since 2.3 - * @define Coll immutable.HashSet + * @define Coll `immutable.HashSet` * @define coll immutable hash set * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/immutable/IndexedSeq.scala b/src/library/scala/collection/immutable/IndexedSeq.scala index e3939001d8..b37edc4254 100644 --- a/src/library/scala/collection/immutable/IndexedSeq.scala +++ b/src/library/scala/collection/immutable/IndexedSeq.scala @@ -29,7 +29,7 @@ trait IndexedSeq[+A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is a `Vector`. * @define coll indexed sequence - * @define Coll IndexedSeq + * @define Coll `IndexedSeq` */ object IndexedSeq extends SeqFactory[IndexedSeq] { class Impl[A](buf: ArrayBuffer[A]) extends AbstractSeq[A] with IndexedSeq[A] with Serializable { diff --git a/src/library/scala/collection/immutable/IntMap.scala b/src/library/scala/collection/immutable/IntMap.scala index 3c9c0c2f24..039a57041c 100644 --- a/src/library/scala/collection/immutable/IntMap.scala +++ b/src/library/scala/collection/immutable/IntMap.scala @@ -36,7 +36,7 @@ import IntMapUtils._ /** A companion object for integer maps. * - * @define Coll IntMap + * @define Coll `IntMap` * @define mapCanBuildFromInfo * The standard `CanBuildFrom` instance for `$Coll` objects. * The created value is an instance of class `MapCanBuildFrom`. @@ -150,7 +150,7 @@ import IntMap._ * @tparam T type of the values associated with integer keys. * * @since 2.7 - * @define Coll immutable.IntMap + * @define Coll `immutable.IntMap` * @define coll immutable integer map * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala index d5fca2bdff..a1390ba189 100644 --- a/src/library/scala/collection/immutable/Iterable.scala +++ b/src/library/scala/collection/immutable/Iterable.scala @@ -18,7 +18,7 @@ import parallel.immutable.ParIterable /** A base trait for iterable collections that are guaranteed immutable. * $iterableInfo * - * @define Coll immutable.Iterable + * @define Coll `immutable.Iterable` * @define coll immutable iterable collection */ trait Iterable[+A] extends Traversable[A] @@ -34,7 +34,7 @@ trait Iterable[+A] extends Traversable[A] } /** $factoryInfo - * @define Coll immutable.Iterable + * @define Coll `immutable.Iterable` * @define coll immutable iterable collection */ object Iterable extends TraversableFactory[Iterable] { diff --git a/src/library/scala/collection/immutable/LinearSeq.scala b/src/library/scala/collection/immutable/LinearSeq.scala index 536894c287..2d6986740a 100644 --- a/src/library/scala/collection/immutable/LinearSeq.scala +++ b/src/library/scala/collection/immutable/LinearSeq.scala @@ -29,7 +29,7 @@ trait LinearSeq[+A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is a `List`. * @define coll immutable linear sequence - * @define Coll immutable.LinearSeq + * @define Coll `immutable.LinearSeq` */ object LinearSeq extends SeqFactory[LinearSeq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, LinearSeq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index 1b75c10113..b4c22c3b6c 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -141,7 +141,7 @@ sealed abstract class List[+A] extends AbstractSeq[A] /** Builds a new list by applying a function to all elements of this list. * Like `xs map f`, but returns `xs` unchanged if function - * `f` maps all elements to themselves (wrt eq). + * `f` maps all elements to themselves (as determined by `eq`). * * @param f the function to apply to each element. * @tparam B the element type of the returned collection. @@ -382,7 +382,7 @@ final case class ::[B](private var hd: B, private[scala] var tl: List[B]) extend /** $factoryInfo * @define coll list - * @define Coll List + * @define Coll `List` */ object List extends SeqFactory[List] { diff --git a/src/library/scala/collection/immutable/LongMap.scala b/src/library/scala/collection/immutable/LongMap.scala index 11b5d1e311..8a316f37de 100644 --- a/src/library/scala/collection/immutable/LongMap.scala +++ b/src/library/scala/collection/immutable/LongMap.scala @@ -36,7 +36,7 @@ import LongMapUtils._ /** A companion object for long maps. * - * @define Coll LongMap + * @define Coll `LongMap` * @define mapCanBuildFromInfo * The standard `CanBuildFrom` instance for `$Coll` objects. * The created value is an instance of class `MapCanBuildFrom`. @@ -147,7 +147,7 @@ import LongMap._; * @tparam T type of the values associated with the long keys. * * @since 2.7 - * @define Coll immutable.LongMap + * @define Coll `immutable.LongMap` * @define coll immutable long integer map * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index bbefd983fd..e73da01ac4 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -66,7 +66,7 @@ trait Map[A, +B] extends Iterable[(A, B)] } /** $factoryInfo - * @define Coll immutable.Map + * @define Coll `immutable.Map` * @define coll immutable map */ object Map extends ImmutableMapFactory[Map] { diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala index 0966fa035f..4c82d99c03 100644 --- a/src/library/scala/collection/immutable/NumericRange.scala +++ b/src/library/scala/collection/immutable/NumericRange.scala @@ -34,7 +34,7 @@ import generic._ * * @author Paul Phillips * @version 2.8 - * @define Coll NumericRange + * @define Coll `NumericRange` * @define coll numeric range * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala index 68c75ee586..94953ce38b 100644 --- a/src/library/scala/collection/immutable/PagedSeq.scala +++ b/src/library/scala/collection/immutable/PagedSeq.scala @@ -119,7 +119,7 @@ import PagedSeq._ * * @author Martin Odersky * @since 2.7 - * @define Coll PagedSeq + * @define Coll `PagedSeq` * @define coll paged sequence * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala index da04446281..e980dda847 100644 --- a/src/library/scala/collection/immutable/Queue.scala +++ b/src/library/scala/collection/immutable/Queue.scala @@ -30,7 +30,7 @@ import annotation.tailrec * @see [[http://docs.scala-lang.org/overviews/collections/concrete-immutable-collection-classes.html#immutable_queues "Scala's Collection Library overview"]] * section on `Immutable Queues` for more information. * - * @define Coll immutable.Queue + * @define Coll `immutable.Queue` * @define coll immutable queue * @define mayNotTerminateInf * @define willNotTerminateInf @@ -131,7 +131,7 @@ class Queue[+A] protected(protected val in: List[A], protected val out: List[A]) } /** $factoryInfo - * @define Coll immutable.Queue + * @define Coll `immutable.Queue` * @define coll immutable queue */ object Queue extends SeqFactory[Queue] { diff --git a/src/library/scala/collection/immutable/Seq.scala b/src/library/scala/collection/immutable/Seq.scala index 882ca12612..1104eb1b4f 100644 --- a/src/library/scala/collection/immutable/Seq.scala +++ b/src/library/scala/collection/immutable/Seq.scala @@ -19,7 +19,7 @@ import parallel.immutable.ParSeq * that are guaranteed immutable. * * $seqInfo - * @define Coll immutable.Seq + * @define Coll `immutable.Seq` * @define coll immutable sequence */ trait Seq[+A] extends Iterable[A] @@ -36,7 +36,7 @@ trait Seq[+A] extends Iterable[A] } /** $factoryInfo - * @define Coll immutable.Seq + * @define Coll `immutable.Seq` * @define coll immutable sequence */ object Seq extends SeqFactory[Seq] { diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala index cd972d6c30..f783f2d562 100644 --- a/src/library/scala/collection/immutable/Set.scala +++ b/src/library/scala/collection/immutable/Set.scala @@ -21,7 +21,7 @@ import parallel.immutable.ParSet * @since 1.0 * @author Matthias Zenger * @author Martin Odersky - * @define Coll immutable.Set + * @define Coll `immutable.Set` * @define coll immutable set */ trait Set[A] extends Iterable[A] @@ -38,7 +38,7 @@ trait Set[A] extends Iterable[A] } /** $factoryInfo - * @define Coll immutable.Set + * @define Coll `immutable.Set` * @define coll immutable set */ object Set extends ImmutableSetFactory[Set] { diff --git a/src/library/scala/collection/immutable/SortedSet.scala b/src/library/scala/collection/immutable/SortedSet.scala index e1637ce78b..62fa4e0335 100644 --- a/src/library/scala/collection/immutable/SortedSet.scala +++ b/src/library/scala/collection/immutable/SortedSet.scala @@ -21,7 +21,7 @@ import mutable.Builder * @author Martin Odersky * @version 2.8 * @since 2.4 - * @define Coll immutable.SortedSet + * @define Coll `immutable.SortedSet` * @define coll immutable sorted set */ trait SortedSet[A] extends Set[A] with scala.collection.SortedSet[A] with SortedSetLike[A, SortedSet[A]] { @@ -30,7 +30,7 @@ trait SortedSet[A] extends Set[A] with scala.collection.SortedSet[A] with Sorted } /** $factoryInfo - * @define Coll immutable.SortedSet + * @define Coll `immutable.SortedSet` * @define coll immutable sorted set */ object SortedSet extends ImmutableSortedSetFactory[SortedSet] { diff --git a/src/library/scala/collection/immutable/Stack.scala b/src/library/scala/collection/immutable/Stack.scala index 50fc2795c0..c63c1ce232 100644 --- a/src/library/scala/collection/immutable/Stack.scala +++ b/src/library/scala/collection/immutable/Stack.scala @@ -13,7 +13,7 @@ import generic._ import mutable.{ ArrayBuffer, Builder } /** $factoryInfo - * @define Coll immutable.Stack + * @define Coll `immutable.Stack` * @define coll immutable stack */ object Stack extends SeqFactory[Stack] { @@ -37,7 +37,7 @@ object Stack extends SeqFactory[Stack] { * @see [[http://docs.scala-lang.org/overviews/collections/concrete-immutable-collection-classes.html#immutable_stacks "Scala's Collection Library overview"]] * section on `Immutable stacks` for more information. * - * @define Coll immutable.Stack + * @define Coll `immutable.Stack` * @define coll immutable stack * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index 2df4ed70c7..f3e7214c5f 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -177,7 +177,7 @@ import language.implicitConversions * section on `Streams` for more information. * @define naturalsEx def naturalsFrom(i: Int): Stream[Int] = i #:: naturalsFrom(i + 1) - * @define Coll Stream + * @define Coll `Stream` * @define coll stream * @define orderDependent * @define orderDependentFold @@ -805,9 +805,9 @@ self => these } - /** Builds a new stream from this stream in which any duplicates (wrt to ==) - * have been removed. Among duplicate elements, only the first one is - * retained in the resulting `Stream`. + /** Builds a new stream from this stream in which any duplicates (as + * determined by `==`) have been removed. Among duplicate elements, only the + * first one is retained in the resulting `Stream`. * * @return A new `Stream` representing the result of applying distinctness to * the original `Stream`. diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala index 52032a1cde..d1605bf637 100644 --- a/src/library/scala/collection/immutable/StringLike.scala +++ b/src/library/scala/collection/immutable/StringLike.scala @@ -33,7 +33,7 @@ import StringLike._ * @tparam Repr The type of the actual collection inheriting `StringLike`. * * @since 2.8 - * @define Coll String + * @define Coll `String` * @define coll string * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/immutable/StringOps.scala b/src/library/scala/collection/immutable/StringOps.scala index 97609b4c4d..633821ecea 100644 --- a/src/library/scala/collection/immutable/StringOps.scala +++ b/src/library/scala/collection/immutable/StringOps.scala @@ -25,7 +25,7 @@ import mutable.StringBuilder * @param repr the actual representation of this string operations object. * * @since 2.8 - * @define Coll StringOps + * @define Coll `StringOps` * @define coll string */ final class StringOps(override val repr: String) extends AnyVal with StringLike[String] { diff --git a/src/library/scala/collection/immutable/Traversable.scala b/src/library/scala/collection/immutable/Traversable.scala index 7830b38d69..59d3b4e029 100644 --- a/src/library/scala/collection/immutable/Traversable.scala +++ b/src/library/scala/collection/immutable/Traversable.scala @@ -30,7 +30,7 @@ trait Traversable[+A] extends scala.collection.Traversable[A] /** $factoryInfo * The current default implementation of a $Coll is a `Vector`. * @define coll immutable traversable collection - * @define Coll immutable.Traversable + * @define Coll `immutable.Traversable` */ object Traversable extends TraversableFactory[Traversable] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Traversable[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala index 1b3d72ceb7..882e828c5b 100644 --- a/src/library/scala/collection/immutable/TreeSet.scala +++ b/src/library/scala/collection/immutable/TreeSet.scala @@ -16,7 +16,7 @@ import immutable.{RedBlackTree => RB} import mutable.{ Builder, SetBuilder } /** $factoryInfo - * @define Coll immutable.TreeSet + * @define Coll `immutable.TreeSet` * @define coll immutable tree set */ object TreeSet extends ImmutableSortedSetFactory[TreeSet] { @@ -40,7 +40,7 @@ object TreeSet extends ImmutableSortedSetFactory[TreeSet] { * @see [[http://docs.scala-lang.org/overviews/collections/concrete-immutable-collection-classes.html#redblack_trees "Scala's Collection Library overview"]] * section on `Red-Black Trees` for more information. * - * @define Coll immutable.TreeSet + * @define Coll `immutable.TreeSet` * @define coll immutable tree set * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index 55c31feec2..1395a8f52d 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -40,7 +40,7 @@ object Vector extends SeqFactory[Vector] { * * @tparam A the element type * - * @define Coll Vector + * @define Coll `Vector` * @define coll vector * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `Vector[B]` because an implicit of type `CanBuildFrom[Vector, B, That]` diff --git a/src/library/scala/collection/immutable/WrappedString.scala b/src/library/scala/collection/immutable/WrappedString.scala index de8aeea7e1..aa7e5b3c4a 100644 --- a/src/library/scala/collection/immutable/WrappedString.scala +++ b/src/library/scala/collection/immutable/WrappedString.scala @@ -25,7 +25,7 @@ import mutable.{Builder, StringBuilder} * @param self a string contained within this wrapped string * * @since 2.8 - * @define Coll WrappedString + * @define Coll `WrappedString` * @define coll wrapped string */ class WrappedString(val self: String) extends AbstractSeq[Char] with IndexedSeq[Char] with StringLike[WrappedString] { diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala index bfdc08536c..3034fc2bce 100644 --- a/src/library/scala/collection/mutable/ArrayBuffer.scala +++ b/src/library/scala/collection/mutable/ArrayBuffer.scala @@ -29,7 +29,7 @@ import parallel.mutable.ParArray * * @tparam A the type of this arraybuffer's elements. * - * @define Coll ArrayBuffer + * @define Coll `ArrayBuffer` * @define coll arraybuffer * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `ArrayBuffer[B]` because an implicit of type `CanBuildFrom[ArrayBuffer, B, ArrayBuffer[B]]` @@ -187,7 +187,7 @@ class ArrayBuffer[A](override protected val initialSize: Int) * * $factoryInfo * @define coll array buffer - * @define Coll ArrayBuffer + * @define Coll `ArrayBuffer` */ object ArrayBuffer extends SeqFactory[ArrayBuffer] { /** $genericCanBuildFromInfo */ diff --git a/src/library/scala/collection/mutable/ArrayLike.scala b/src/library/scala/collection/mutable/ArrayLike.scala index 23d36252d2..04601845c4 100644 --- a/src/library/scala/collection/mutable/ArrayLike.scala +++ b/src/library/scala/collection/mutable/ArrayLike.scala @@ -18,7 +18,7 @@ import generic._ * @tparam A type of the elements contained in the array like object. * @tparam Repr the type of the actual collection containing the elements. * - * @define Coll ArrayLike + * @define Coll `ArrayLike` * @version 2.8 * @since 2.8 */ diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala index 5f0e1e1071..57e81fdb9c 100644 --- a/src/library/scala/collection/mutable/ArrayOps.scala +++ b/src/library/scala/collection/mutable/ArrayOps.scala @@ -30,7 +30,7 @@ import parallel.mutable.ParArray * * @tparam T type of the elements contained in this array. * - * @define Coll ArrayOps + * @define Coll `ArrayOps` * @define orderDependent * @define orderDependentFold * @define mayNotTerminateInf diff --git a/src/library/scala/collection/mutable/ArraySeq.scala b/src/library/scala/collection/mutable/ArraySeq.scala index cb86c416fe..d0eaee348b 100644 --- a/src/library/scala/collection/mutable/ArraySeq.scala +++ b/src/library/scala/collection/mutable/ArraySeq.scala @@ -27,7 +27,7 @@ import parallel.mutable.ParArray * @tparam A type of the elements contained in this array sequence. * @param length the length of the underlying array. * - * @define Coll ArraySeq + * @define Coll `ArraySeq` * @define coll array sequence * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `ArraySeq[B]` because an implicit of type `CanBuildFrom[ArraySeq, B, ArraySeq[B]]` @@ -93,7 +93,7 @@ extends AbstractSeq[A] /** $factoryInfo * @define coll array sequence - * @define Coll ArraySeq + * @define Coll `ArraySeq` */ object ArraySeq extends SeqFactory[ArraySeq] { /** $genericCanBuildFromInfo */ diff --git a/src/library/scala/collection/mutable/ArrayStack.scala b/src/library/scala/collection/mutable/ArrayStack.scala index b3a0534826..04a318d0c3 100644 --- a/src/library/scala/collection/mutable/ArrayStack.scala +++ b/src/library/scala/collection/mutable/ArrayStack.scala @@ -15,7 +15,7 @@ import generic._ * * $factoryInfo * @define coll array stack - * @define Coll ArrayStack + * @define Coll `ArrayStack` */ object ArrayStack extends SeqFactory[ArrayStack] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, ArrayStack[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] @@ -51,7 +51,7 @@ object ArrayStack extends SeqFactory[ArrayStack] { * * @tparam T type of the elements contained in this array stack. * - * @define Coll ArrayStack + * @define Coll `ArrayStack` * @define coll array stack * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala index 6b9673dae6..58b45aa2a2 100644 --- a/src/library/scala/collection/mutable/BitSet.scala +++ b/src/library/scala/collection/mutable/BitSet.scala @@ -21,7 +21,7 @@ import BitSetLike.{LogWL, updateArray} * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#mutable_bitsets "Scala's Collection Library overview"]] * section on `Mutable Bitsets` for more information. * - * @define Coll BitSet + * @define Coll `BitSet` * @define coll bitset * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `BitSet[B]` because an implicit of type `CanBuildFrom[BitSet, B, BitSet]` @@ -114,7 +114,7 @@ class BitSet(protected var elems: Array[Long]) extends AbstractSet[Int] /** $factoryInfo * @define coll bitset - * @define Coll BitSet + * @define Coll `BitSet` */ object BitSet extends BitSetFactory[BitSet] { def empty: BitSet = new BitSet diff --git a/src/library/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala index 7326d5ec5b..dd225cfab9 100644 --- a/src/library/scala/collection/mutable/Buffer.scala +++ b/src/library/scala/collection/mutable/Buffer.scala @@ -25,7 +25,7 @@ import generic._ * * @tparam A type of the elements contained in this buffer. * - * @define Coll Buffer + * @define Coll `Buffer` * @define coll buffer */ @cloneable @@ -37,7 +37,7 @@ trait Buffer[A] extends Seq[A] /** $factoryInfo * @define coll buffer - * @define Coll Buffer + * @define Coll `Buffer` */ object Buffer extends SeqFactory[Buffer] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Buffer[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala index 6a6bdd0077..aa1b20d240 100644 --- a/src/library/scala/collection/mutable/BufferProxy.scala +++ b/src/library/scala/collection/mutable/BufferProxy.scala @@ -25,7 +25,7 @@ import script._ * * @tparam A type of the elements the buffer proxy contains. * - * @define Coll BufferProxy + * @define Coll `BufferProxy` * @define coll buffer proxy */ trait BufferProxy[A] extends Buffer[A] with Proxy { diff --git a/src/library/scala/collection/mutable/ConcurrentMap.scala b/src/library/scala/collection/mutable/ConcurrentMap.scala index f2b44d6737..ad6b609862 100644 --- a/src/library/scala/collection/mutable/ConcurrentMap.scala +++ b/src/library/scala/collection/mutable/ConcurrentMap.scala @@ -20,7 +20,7 @@ package mutable * @tparam A the key type of the map * @tparam B the value type of the map * - * @define Coll ConcurrentMap + * @define Coll `ConcurrentMap` * @define coll concurrent map * @define concurrentmapinfo * This is a base trait for all Scala concurrent map implementations. It diff --git a/src/library/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala index 49378a4f4e..cba4e9725e 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedList.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedList.scala @@ -26,7 +26,7 @@ import generic._ * * @tparam A the type of the elements contained in this double linked list. * - * @define Coll DoubleLinkedList + * @define Coll `DoubleLinkedList` * @define coll double linked list * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `DoubleLinkedList[B]` because an implicit of type `CanBuildFrom[DoubleLinkedList, B, DoubleLinkedList[B]]` @@ -67,7 +67,7 @@ class DoubleLinkedList[A]() extends AbstractSeq[A] /** $factoryInfo * @define coll double linked list - * @define Coll DoubleLinkedList + * @define Coll `DoubleLinkedList` */ object DoubleLinkedList extends SeqFactory[DoubleLinkedList] { /** $genericCanBuildFromInfo */ diff --git a/src/library/scala/collection/mutable/DoubleLinkedListLike.scala b/src/library/scala/collection/mutable/DoubleLinkedListLike.scala index dfb70beeda..ebccacf976 100644 --- a/src/library/scala/collection/mutable/DoubleLinkedListLike.scala +++ b/src/library/scala/collection/mutable/DoubleLinkedListLike.scala @@ -52,7 +52,7 @@ import annotation.migration * @tparam A type of the elements contained in the double linked list * @tparam This the type of the actual linked list holding the elements * - * @define Coll DoubleLinkedList + * @define Coll `DoubleLinkedList` * @define coll double linked list */ trait DoubleLinkedListLike[A, This <: Seq[A] with DoubleLinkedListLike[A, This]] extends SeqLike[A, This] with LinkedListLike[A, This] { self => diff --git a/src/library/scala/collection/mutable/GenSeq.scala.disabled b/src/library/scala/collection/mutable/GenSeq.scala.disabled index 85e4065183..53ec5acc34 100644 --- a/src/library/scala/collection/mutable/GenSeq.scala.disabled +++ b/src/library/scala/collection/mutable/GenSeq.scala.disabled @@ -24,7 +24,7 @@ import generic._ * * The class adds an `update` method to `collection.Seq`. * - * @define Coll mutable.Seq + * @define Coll `mutable.Seq` * @define coll mutable sequence */ trait GenSeq[A] extends GenIterable[A] diff --git a/src/library/scala/collection/mutable/GenSet.scala.disabled b/src/library/scala/collection/mutable/GenSet.scala.disabled index ac11e634e8..9080abaf38 100644 --- a/src/library/scala/collection/mutable/GenSet.scala.disabled +++ b/src/library/scala/collection/mutable/GenSet.scala.disabled @@ -24,7 +24,7 @@ import generic._ * * @since 1.0 * @author Matthias Zenger - * @define Coll mutable.Set + * @define Coll `mutable.Set` * @define coll mutable set */ trait GenSet[A] extends GenIterable[A] diff --git a/src/library/scala/collection/mutable/GrowingBuilder.scala b/src/library/scala/collection/mutable/GrowingBuilder.scala index 0b7385194e..df63177b87 100644 --- a/src/library/scala/collection/mutable/GrowingBuilder.scala +++ b/src/library/scala/collection/mutable/GrowingBuilder.scala @@ -18,7 +18,7 @@ import generic._ * @version 2.8 * @since 2.8 * - * @define Coll GrowingBuilder + * @define Coll `GrowingBuilder` * @define coll growing builder */ class GrowingBuilder[Elem, To <: Growable[Elem]](empty: To) extends Builder[Elem, To] { diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala index 65a10f4ba9..bf640cdb90 100644 --- a/src/library/scala/collection/mutable/HashMap.scala +++ b/src/library/scala/collection/mutable/HashMap.scala @@ -21,7 +21,7 @@ import scala.collection.parallel.mutable.ParHashMap * @tparam A the type of the keys contained in this hash map. * @tparam B the type of the values assigned to keys in this hash map. * - * @define Coll mutable.HashMap + * @define Coll `mutable.HashMap` * @define coll mutable hash map * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `HashMap[A, B]` if the elements contained in the resulting collection are @@ -138,7 +138,7 @@ extends AbstractMap[A, B] } /** $factoryInfo - * @define Coll mutable.HashMap + * @define Coll `mutable.HashMap` * @define coll mutable hash map */ object HashMap extends MutableMapFactory[HashMap] { diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala index 8ed6b925aa..e040d1e421 100644 --- a/src/library/scala/collection/mutable/HashSet.scala +++ b/src/library/scala/collection/mutable/HashSet.scala @@ -25,7 +25,7 @@ import collection.parallel.mutable.ParHashSet * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#hash_tables "Scala's Collection Library overview"]] * section on `Hash Tables` for more information. * - * @define Coll mutable.HashSet + * @define Coll `mutable.HashSet` * @define coll mutable hash set * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `HashSet[B]` because an implicit of type `CanBuildFrom[HashSet, B, HashSet[B]]` @@ -98,7 +98,7 @@ extends AbstractSet[A] } /** $factoryInfo - * @define Coll mutable.HashSet + * @define Coll `mutable.HashSet` * @define coll mutable hash set */ object HashSet extends MutableSetFactory[HashSet] { diff --git a/src/library/scala/collection/mutable/IndexedSeq.scala b/src/library/scala/collection/mutable/IndexedSeq.scala index 0e2e06df84..686f90c9e8 100644 --- a/src/library/scala/collection/mutable/IndexedSeq.scala +++ b/src/library/scala/collection/mutable/IndexedSeq.scala @@ -29,7 +29,7 @@ trait IndexedSeq[A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is an `ArrayBuffer`. * @define coll mutable indexed sequence - * @define Coll mutable.IndexedSeq + * @define Coll `mutable.IndexedSeq` */ object IndexedSeq extends SeqFactory[IndexedSeq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, IndexedSeq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/IndexedSeqLike.scala b/src/library/scala/collection/mutable/IndexedSeqLike.scala index 0c1df17ead..4bd5ea1e89 100644 --- a/src/library/scala/collection/mutable/IndexedSeqLike.scala +++ b/src/library/scala/collection/mutable/IndexedSeqLike.scala @@ -27,7 +27,7 @@ import generic._ * @tparam A the element type of the $coll * @tparam Repr the type of the actual $coll containing the elements. * - * @define Coll IndexedSeq + * @define Coll `IndexedSeq` * @define coll mutable indexed sequence * @define indexedSeqInfo * @author Martin Odersky diff --git a/src/library/scala/collection/mutable/Iterable.scala b/src/library/scala/collection/mutable/Iterable.scala index 54fe11f98c..3b5ee63ea3 100644 --- a/src/library/scala/collection/mutable/Iterable.scala +++ b/src/library/scala/collection/mutable/Iterable.scala @@ -29,7 +29,7 @@ trait Iterable[A] extends Traversable[A] /** $factoryInfo * The current default implementation of a $Coll is an `ArrayBuffer`. * @define coll mutable iterable collection - * @define Coll mutable.Iterable + * @define Coll `mutable.Iterable` */ object Iterable extends TraversableFactory[Iterable] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Iterable[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/LinearSeq.scala b/src/library/scala/collection/mutable/LinearSeq.scala index 522ebfd277..443b458342 100644 --- a/src/library/scala/collection/mutable/LinearSeq.scala +++ b/src/library/scala/collection/mutable/LinearSeq.scala @@ -17,7 +17,7 @@ import generic._ * that can be mutated. * $linearSeqInfo * - * @define Coll LinearSeq + * @define Coll `LinearSeq` * @define coll linear sequence * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#mutable_lists "Scala's Collection Library overview"]] * section on `Mutable Lists` for more information. @@ -33,7 +33,7 @@ trait LinearSeq[A] extends Seq[A] /** $factoryInfo * The current default implementation of a $Coll is a `MutableList`. * @define coll mutable linear sequence - * @define Coll mutable.LinearSeq + * @define Coll `mutable.LinearSeq` */ object LinearSeq extends SeqFactory[LinearSeq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, LinearSeq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala index e4090637ec..cd174523b1 100644 --- a/src/library/scala/collection/mutable/LinkedHashMap.scala +++ b/src/library/scala/collection/mutable/LinkedHashMap.scala @@ -14,7 +14,7 @@ package mutable import generic._ /** $factoryInfo - * @define Coll LinkedHashMap + * @define Coll `LinkedHashMap` * @define coll linked hash map */ object LinkedHashMap extends MutableMapFactory[LinkedHashMap] { @@ -28,7 +28,7 @@ object LinkedHashMap extends MutableMapFactory[LinkedHashMap] { * @tparam A the type of the keys contained in this hash map. * @tparam B the type of the values assigned to keys in this hash map. * - * @define Coll LinkedHashMap + * @define Coll `LinkedHashMap` * @define coll linked hash map * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `LinkedHashMap[A, B]` if the elements contained in the resulting collection are diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala index d2815cf9de..3f789f9fa2 100644 --- a/src/library/scala/collection/mutable/LinkedHashSet.scala +++ b/src/library/scala/collection/mutable/LinkedHashSet.scala @@ -24,7 +24,7 @@ import generic._ * * @tparam A the type of the elements contained in this set. * - * @define Coll LinkedHashSet + * @define Coll `LinkedHashSet` * @define coll linked hash set * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `LinkedHashSet[B]` because an implicit of type `CanBuildFrom[LinkedHashSet, B, LinkedHashSet[B]]` @@ -87,7 +87,7 @@ class LinkedHashSet[A] extends AbstractSet[A] } /** $factoryInfo - * @define Coll LinkedHashSet + * @define Coll `LinkedHashSet` * @define coll linked hash set */ object LinkedHashSet extends MutableSetFactory[LinkedHashSet] { diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala index 8510827697..335ddccf56 100644 --- a/src/library/scala/collection/mutable/LinkedList.scala +++ b/src/library/scala/collection/mutable/LinkedList.scala @@ -40,7 +40,7 @@ import generic._ * * @constructor Creates an "empty" list, defined as a single node with no data element and next pointing to itself. - * @define Coll LinkedList + * @define Coll `LinkedList` * @define coll linked list * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `LinkedList[B]` because an implicit of type `CanBuildFrom[LinkedList, B, LinkedList[B]]` @@ -109,7 +109,7 @@ class LinkedList[A]() extends AbstractSeq[A] } /** $factoryInfo - * @define Coll LinkedList + * @define Coll `LinkedList` * @define coll linked list */ object LinkedList extends SeqFactory[LinkedList] { diff --git a/src/library/scala/collection/mutable/LinkedListLike.scala b/src/library/scala/collection/mutable/LinkedListLike.scala index ebec31ca98..07a8501ca4 100644 --- a/src/library/scala/collection/mutable/LinkedListLike.scala +++ b/src/library/scala/collection/mutable/LinkedListLike.scala @@ -29,7 +29,7 @@ import annotation.tailrec * @tparam A type of the elements contained in the linked list * @tparam This the type of the actual linked list holding the elements * - * @define Coll LinkedList + * @define Coll `LinkedList` * @define coll linked list * * @define singleLinkedListExample diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index 96e73522b6..5c580f9c09 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -27,7 +27,7 @@ import java.io._ * * @tparam A the type of this list buffer's elements. * - * @define Coll ListBuffer + * @define Coll `ListBuffer` * @define coll list buffer * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `ListBuffer[B]` because an implicit of type `CanBuildFrom[ListBuffer, B, ListBuffer[B]]` @@ -425,7 +425,7 @@ final class ListBuffer[A] } /** $factoryInfo - * @define Coll ListBuffer + * @define Coll `ListBuffer` * @define coll list buffer */ object ListBuffer extends SeqFactory[ListBuffer] { diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala index d8d60d1c9a..61810c4ddf 100644 --- a/src/library/scala/collection/mutable/ListMap.scala +++ b/src/library/scala/collection/mutable/ListMap.scala @@ -18,7 +18,7 @@ import generic._ * @tparam A the type of the keys contained in this list map. * @tparam B the type of the values assigned to keys in this list map. * - * @define Coll mutable.ListMap + * @define Coll `mutable.ListMap` * @define coll mutable list map * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `ListMap[A, B]` if the elements contained in the resulting collection are @@ -60,7 +60,7 @@ extends AbstractMap[A, B] } /** $factoryInfo - * @define Coll mutable.ListMap + * @define Coll `mutable.ListMap` * @define coll mutable list map */ object ListMap extends MutableMapFactory[ListMap] { diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala index 0d40a1c70d..207b3f3324 100644 --- a/src/library/scala/collection/mutable/Map.scala +++ b/src/library/scala/collection/mutable/Map.scala @@ -63,7 +63,7 @@ trait Map[A, B] /** $factoryInfo * The current default implementation of a $Coll is a `HashMap`. * @define coll mutable map - * @define Coll mutable.Map + * @define Coll `mutable.Map` */ object Map extends MutableMapFactory[Map] { /** $canBuildFromInfo */ diff --git a/src/library/scala/collection/mutable/MultiMap.scala b/src/library/scala/collection/mutable/MultiMap.scala index 0f298c4a8a..d21624759d 100644 --- a/src/library/scala/collection/mutable/MultiMap.scala +++ b/src/library/scala/collection/mutable/MultiMap.scala @@ -19,7 +19,7 @@ package mutable * `B` objects. * * @define coll multimap - * @define Coll MultiMap + * @define Coll `MultiMap` * @author Matthias Zenger * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/mutable/OpenHashMap.scala b/src/library/scala/collection/mutable/OpenHashMap.scala index 87e5c061fa..2634deb819 100644 --- a/src/library/scala/collection/mutable/OpenHashMap.scala +++ b/src/library/scala/collection/mutable/OpenHashMap.scala @@ -10,7 +10,7 @@ package scala.collection package mutable /** - * @define Coll OpenHashMap + * @define Coll `OpenHashMap` * @define coll open hash map * * @since 2.7 @@ -42,7 +42,7 @@ object OpenHashMap { * @author David MacIver * @since 2.7 * - * @define Coll OpenHashMap + * @define Coll `OpenHashMap` * @define coll open hash map * @define mayNotTerminateInf * @define willNotTerminateInf diff --git a/src/library/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala index 77b1ae21cb..605d37aec6 100644 --- a/src/library/scala/collection/mutable/Queue.scala +++ b/src/library/scala/collection/mutable/Queue.scala @@ -23,7 +23,7 @@ import generic._ * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#mutable_queues "Scala's Collection Library overview"]] * section on `Queues` for more information. * - * @define Coll mutable.Queue + * @define Coll `mutable.Queue` * @define coll mutable queue * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/mutable/Seq.scala b/src/library/scala/collection/mutable/Seq.scala index 89b930e36f..ceed76cf88 100644 --- a/src/library/scala/collection/mutable/Seq.scala +++ b/src/library/scala/collection/mutable/Seq.scala @@ -21,7 +21,7 @@ import generic._ * * The class adds an `update` method to `collection.Seq`. * - * @define Coll mutable.Seq + * @define Coll `mutable.Seq` * @define coll mutable sequence */ trait Seq[A] extends Iterable[A] @@ -36,7 +36,7 @@ trait Seq[A] extends Iterable[A] /** $factoryInfo * The current default implementation of a $Coll is an `ArrayBuffer`. * @define coll mutable sequence - * @define Coll mutable.Seq + * @define Coll `mutable.Seq` */ object Seq extends SeqFactory[Seq] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Seq[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala index 744768e8dd..33a99e9474 100644 --- a/src/library/scala/collection/mutable/Set.scala +++ b/src/library/scala/collection/mutable/Set.scala @@ -19,7 +19,7 @@ import generic._ * * @since 1.0 * @author Matthias Zenger - * @define Coll mutable.Set + * @define Coll `mutable.Set` * @define coll mutable set */ trait Set[A] extends Iterable[A] @@ -34,7 +34,7 @@ trait Set[A] extends Iterable[A] /** $factoryInfo * The current default implementation of a $Coll is a `HashSet`. * @define coll mutable set - * @define Coll mutable.Set + * @define Coll `mutable.Set` */ object Set extends MutableSetFactory[Set] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Set[A]] = setCanBuildFrom[A] diff --git a/src/library/scala/collection/mutable/SortedSet.scala b/src/library/scala/collection/mutable/SortedSet.scala index f41a51d3ef..78d12f3d64 100644 --- a/src/library/scala/collection/mutable/SortedSet.scala +++ b/src/library/scala/collection/mutable/SortedSet.scala @@ -14,7 +14,7 @@ import generic._ /** * Base trait for mutable sorted set. * - * @define Coll mutable.SortedSet + * @define Coll `mutable.SortedSet` * @define coll mutable sorted set * * @author Lucien Pereira @@ -31,7 +31,7 @@ trait SortedSet[A] extends collection.SortedSet[A] with collection.SortedSetLike /** * A template for mutable sorted set companion objects. * - * @define Coll mutable.SortedSet + * @define Coll `mutable.SortedSet` * @define coll mutable sorted set * @define factoryInfo * This object provides a set of operations needed to create sorted sets of type mutable.SortedSet. diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala index b70df05c55..042eac517a 100644 --- a/src/library/scala/collection/mutable/Stack.scala +++ b/src/library/scala/collection/mutable/Stack.scala @@ -20,7 +20,7 @@ import annotation.migration * * $factoryInfo * @define coll mutable stack - * @define Coll mutable.Stack + * @define Coll `mutable.Stack` */ object Stack extends SeqFactory[Stack] { class StackBuilder[A] extends Builder[A, Stack[A]] { @@ -46,7 +46,7 @@ object Stack extends SeqFactory[Stack] { * @since 1 * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#stacks "Scala's Collection Library overview"]] * section on `Stacks` for more information. - * @define Coll Stack + * @define Coll `Stack` * @define coll stack * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala index 23552e9d52..a14605d60a 100644 --- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala +++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala @@ -21,7 +21,7 @@ import script._ * @author Matthias Zenger * @version 1.0, 08/07/2003 * @since 1 - * @define Coll SynchronizedBuffer + * @define Coll `SynchronizedBuffer` * @define coll synchronized buffer */ trait SynchronizedBuffer[A] extends Buffer[A] { diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala index 6e3ae13ada..037b8ec5f5 100644 --- a/src/library/scala/collection/mutable/SynchronizedMap.scala +++ b/src/library/scala/collection/mutable/SynchronizedMap.scala @@ -22,7 +22,7 @@ import annotation.migration * @author Matthias Zenger, Martin Odersky * @version 2.0, 31/12/2006 * @since 1 - * @define Coll SynchronizedMap + * @define Coll `SynchronizedMap` * @define coll synchronized map */ trait SynchronizedMap[A, B] extends Map[A, B] { diff --git a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala index 159b8312b2..bc32537798 100644 --- a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala +++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala @@ -20,7 +20,7 @@ package mutable * @author Matthias Zenger * @version 1.0, 03/05/2004 * @since 1 - * @define Coll SynchronizedPriorityQueue + * @define Coll `SynchronizedPriorityQueue` * @define coll synchronized priority queue */ class SynchronizedPriorityQueue[A](implicit ord: Ordering[A]) extends PriorityQueue[A] { diff --git a/src/library/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala index 56f74a5b9b..9e00c5d6fd 100644 --- a/src/library/scala/collection/mutable/SynchronizedQueue.scala +++ b/src/library/scala/collection/mutable/SynchronizedQueue.scala @@ -21,7 +21,7 @@ package mutable * @author Matthias Zenger * @version 1.0, 03/05/2004 * @since 1 - * @define Coll SynchronizedQueue + * @define Coll `SynchronizedQueue` * @define coll synchronized queue */ class SynchronizedQueue[A] extends Queue[A] { diff --git a/src/library/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala index c945a859f3..c28764ff68 100644 --- a/src/library/scala/collection/mutable/SynchronizedSet.scala +++ b/src/library/scala/collection/mutable/SynchronizedSet.scala @@ -20,7 +20,7 @@ import script._ * @author Matthias Zenger * @version 1.0, 08/07/2003 * @since 1 - * @define Coll SynchronizedSet + * @define Coll `SynchronizedSet` * @define coll synchronized set */ trait SynchronizedSet[A] extends Set[A] { diff --git a/src/library/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala index a09ae21901..8363222295 100644 --- a/src/library/scala/collection/mutable/SynchronizedStack.scala +++ b/src/library/scala/collection/mutable/SynchronizedStack.scala @@ -21,7 +21,7 @@ package mutable * @author Matthias Zenger * @version 1.0, 03/05/2004 * @since 1 - * @define Coll SynchronizedStack + * @define Coll `SynchronizedStack` * @define coll synchronized stack */ class SynchronizedStack[A] extends Stack[A] { diff --git a/src/library/scala/collection/mutable/Traversable.scala b/src/library/scala/collection/mutable/Traversable.scala index 04b67c0bad..28241fdec9 100644 --- a/src/library/scala/collection/mutable/Traversable.scala +++ b/src/library/scala/collection/mutable/Traversable.scala @@ -29,7 +29,7 @@ trait Traversable[A] extends scala.collection.Traversable[A] /** $factoryInfo * The current default implementation of a $Coll is an `ArrayBuffer`. * @define coll mutable traversable collection - * @define Coll mutable.Traversable + * @define Coll `mutable.Traversable` */ object Traversable extends TraversableFactory[Traversable] { implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, Traversable[A]] = ReusableCBF.asInstanceOf[GenericCanBuildFrom[A]] diff --git a/src/library/scala/collection/mutable/TreeSet.scala b/src/library/scala/collection/mutable/TreeSet.scala index 02ee811193..00675b9119 100644 --- a/src/library/scala/collection/mutable/TreeSet.scala +++ b/src/library/scala/collection/mutable/TreeSet.scala @@ -12,7 +12,7 @@ package mutable import generic._ /** - * @define Coll mutable.TreeSet + * @define Coll `mutable.TreeSet` * @define coll mutable tree set * @factoryInfo * Companion object of TreeSet providing factory related utilities. diff --git a/src/library/scala/collection/mutable/UnrolledBuffer.scala b/src/library/scala/collection/mutable/UnrolledBuffer.scala index 889768d471..cd76c7de4e 100644 --- a/src/library/scala/collection/mutable/UnrolledBuffer.scala +++ b/src/library/scala/collection/mutable/UnrolledBuffer.scala @@ -36,7 +36,7 @@ import annotation.tailrec * should still be avoided for such a purpose. * * @define coll unrolled buffer - * @define Coll UnrolledBuffer + * @define Coll `UnrolledBuffer` * @author Aleksandar Prokopec * */ diff --git a/src/library/scala/collection/mutable/WeakHashMap.scala b/src/library/scala/collection/mutable/WeakHashMap.scala index 4e09755acf..ec99197bb9 100644 --- a/src/library/scala/collection/mutable/WeakHashMap.scala +++ b/src/library/scala/collection/mutable/WeakHashMap.scala @@ -23,7 +23,7 @@ import convert.Wrappers._ * @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#weak_hash_maps "Scala's Collection Library overview"]] * section on `Weak Hash Maps` for more information. * - * @define Coll WeakHashMap + * @define Coll `WeakHashMap` * @define coll weak hash map * @define thatinfo the class of the returned collection. In the standard library configuration, * `That` is always `WeakHashMap[A, B]` if the elements contained in the resulting collection are @@ -43,7 +43,7 @@ class WeakHashMap[A, B] extends JMapWrapper[A, B](new java.util.WeakHashMap) } /** $factoryInfo - * @define Coll WeakHashMap + * @define Coll `WeakHashMap` * @define coll weak hash map */ object WeakHashMap extends MutableMapFactory[WeakHashMap] { diff --git a/src/library/scala/collection/mutable/WrappedArray.scala b/src/library/scala/collection/mutable/WrappedArray.scala index 9d170b2832..86317819a1 100644 --- a/src/library/scala/collection/mutable/WrappedArray.scala +++ b/src/library/scala/collection/mutable/WrappedArray.scala @@ -24,7 +24,7 @@ import scala.collection.parallel.mutable.ParArray * @author Martin Odersky, Stephane Micheloud * @version 1.0 * @since 2.8 - * @define Coll WrappedArray + * @define Coll `WrappedArray` * @define coll wrapped array * @define orderDependent * @define orderDependentFold diff --git a/src/library/scala/collection/parallel/ParIterable.scala b/src/library/scala/collection/parallel/ParIterable.scala index 0b5faf15ee..0bd6abaf78 100644 --- a/src/library/scala/collection/parallel/ParIterable.scala +++ b/src/library/scala/collection/parallel/ParIterable.scala @@ -24,7 +24,7 @@ import scala.collection.parallel.mutable.ParArray * @author Aleksandar Prokopec * @since 2.9 * - * @define Coll ParIterable + * @define Coll `ParIterable` * @define coll parallel iterable */ trait ParIterable[+T] diff --git a/src/library/scala/collection/parallel/immutable/ParHashMap.scala b/src/library/scala/collection/parallel/immutable/ParHashMap.scala index e630a9dbed..ad882390c8 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashMap.scala @@ -39,7 +39,7 @@ import collection.parallel.Task * @see [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#parallel_hash_tries Scala's Parallel Collections Library overview]] * section on Parallel Hash Tries for more information. * - * @define Coll immutable.ParHashMap + * @define Coll `immutable.ParHashMap` * @define coll immutable parallel hash map */ @SerialVersionUID(1L) @@ -140,7 +140,7 @@ self => /** $factoryInfo - * @define Coll immutable.ParHashMap + * @define Coll `immutable.ParHashMap` * @define coll immutable parallel hash map */ object ParHashMap extends ParMapFactory[ParHashMap] { diff --git a/src/library/scala/collection/parallel/immutable/ParHashSet.scala b/src/library/scala/collection/parallel/immutable/ParHashSet.scala index 084637c5dc..d1899601d7 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashSet.scala @@ -38,7 +38,7 @@ import collection.parallel.Task * @see [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#parallel_hash_tries Scala's Parallel Collections Library overview]] * section on Parallel Hash Tries for more information. * - * @define Coll immutable.ParHashSet + * @define Coll `immutable.ParHashSet` * @define coll immutable parallel hash set */ @SerialVersionUID(1L) @@ -118,7 +118,7 @@ self => /** $factoryInfo - * @define Coll immutable.ParHashSet + * @define Coll `immutable.ParHashSet` * @define coll immutable parallel hash set */ object ParHashSet extends ParSetFactory[ParHashSet] { diff --git a/src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled b/src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled index fb411ec0ac..04bc8b8d29 100644 --- a/src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled +++ b/src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled @@ -29,7 +29,7 @@ import scala.collection.parallel.ParIterableIterator * @author Aleksandar Prokopec * @since 2.9 * - * @define Coll immutable.ParRange + * @define Coll `immutable.ParRange` * @define coll immutable parallel range */ @SerialVersionUID(1L) diff --git a/src/library/scala/collection/parallel/immutable/ParRange.scala b/src/library/scala/collection/parallel/immutable/ParRange.scala index 277fd5fdd3..9553704caa 100644 --- a/src/library/scala/collection/parallel/immutable/ParRange.scala +++ b/src/library/scala/collection/parallel/immutable/ParRange.scala @@ -28,7 +28,7 @@ import scala.collection.Iterator * @see [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#parallel_range Scala's Parallel Collections Library overview]] * section on `ParRange` for more information. * - * @define Coll immutable.ParRange + * @define Coll `immutable.ParRange` * @define coll immutable parallel range */ @SerialVersionUID(1L) diff --git a/src/library/scala/collection/parallel/immutable/ParSeq.scala b/src/library/scala/collection/parallel/immutable/ParSeq.scala index bf3d3a5aa8..dde6533c82 100644 --- a/src/library/scala/collection/parallel/immutable/ParSeq.scala +++ b/src/library/scala/collection/parallel/immutable/ParSeq.scala @@ -24,7 +24,7 @@ import scala.collection.GenSeq /** An immutable variant of `ParSeq`. * - * @define Coll mutable.ParSeq + * @define Coll `mutable.ParSeq` * @define coll mutable parallel sequence */ trait ParSeq[+T] @@ -40,7 +40,7 @@ extends collection/*.immutable*/.GenSeq[T] /** $factoryInfo - * @define Coll mutable.ParSeq + * @define Coll `mutable.ParSeq` * @define coll mutable parallel sequence */ object ParSeq extends ParFactory[ParSeq] { diff --git a/src/library/scala/collection/parallel/immutable/ParSet.scala b/src/library/scala/collection/parallel/immutable/ParSet.scala index d64858ed10..40429280ac 100644 --- a/src/library/scala/collection/parallel/immutable/ParSet.scala +++ b/src/library/scala/collection/parallel/immutable/ParSet.scala @@ -16,7 +16,7 @@ import scala.collection.parallel.Combiner /** An immutable variant of `ParSet`. * - * @define Coll mutable.ParSet + * @define Coll `mutable.ParSet` * @define coll mutable parallel set */ trait ParSet[T] @@ -38,7 +38,7 @@ self => } /** $factoryInfo - * @define Coll mutable.ParSet + * @define Coll `mutable.ParSet` * @define coll mutable parallel set */ object ParSet extends ParSetFactory[ParSet] { diff --git a/src/library/scala/collection/parallel/immutable/ParVector.scala b/src/library/scala/collection/parallel/immutable/ParVector.scala index 8baa84b77c..1ece663a1d 100644 --- a/src/library/scala/collection/parallel/immutable/ParVector.scala +++ b/src/library/scala/collection/parallel/immutable/ParVector.scala @@ -37,7 +37,7 @@ import immutable.VectorIterator * @see [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#parallel_vector Scala's Parallel Collections Library overview]] * section on `ParVector` for more information. * - * @define Coll immutable.ParVector + * @define Coll `immutable.ParVector` * @define coll immutable parallel vector */ class ParVector[+T](private[this] val vector: Vector[T]) @@ -86,7 +86,7 @@ extends ParSeq[T] /** $factoryInfo - * @define Coll immutable.ParVector + * @define Coll `immutable.ParVector` * @define coll immutable parallel vector */ object ParVector extends ParFactory[ParVector] { diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index 92ba701f7c..29d84408db 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -49,7 +49,7 @@ import scala.collection.GenTraversableOnce * @see [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#parallel_array Scala's Parallel Collections Library overview]] * section on `ParArray` for more information. * - * @define Coll ParArray + * @define Coll `ParArray` * @define coll parallel array * */ @@ -685,7 +685,7 @@ self => /** $factoryInfo - * @define Coll mutable.ParArray + * @define Coll `mutable.ParArray` * @define coll parallel array */ object ParArray extends ParFactory[ParArray] { diff --git a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala index 35c748916c..d0c7f6050e 100644 --- a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala +++ b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala @@ -15,7 +15,7 @@ import collection.parallel.IterableSplitter * * @tparam T type of the elements in the $coll. * @define coll table - * @define Coll flat hash table + * @define Coll `ParFlatHashTable` * * @author Aleksandar Prokopec */ diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala index 23b23d55a1..05b3f89fa1 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala @@ -28,7 +28,7 @@ import collection.parallel.Task * * @tparam T type of the elements in the parallel hash map * - * @define Coll ParHashMap + * @define Coll `ParHashMap` * @define coll parallel hash map * * @author Aleksandar Prokopec @@ -141,7 +141,7 @@ self => /** $factoryInfo - * @define Coll mutable.ParHashMap + * @define Coll `mutable.ParHashMap` * @define coll parallel hash map */ object ParHashMap extends ParMapFactory[ParHashMap] { diff --git a/src/library/scala/collection/parallel/mutable/ParHashSet.scala b/src/library/scala/collection/parallel/mutable/ParHashSet.scala index 4e9a38c13f..783f8dce77 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashSet.scala @@ -25,7 +25,7 @@ import collection.parallel.Task * * @tparam T type of the elements in the $coll. * - * @define Coll ParHashSet + * @define Coll `ParHashSet` * @define coll parallel hash set * * @author Aleksandar Prokopec @@ -104,7 +104,7 @@ extends ParSet[T] /** $factoryInfo - * @define Coll mutable.ParHashSet + * @define Coll `mutable.ParHashSet` * @define coll parallel hash set */ object ParHashSet extends ParSetFactory[ParHashSet] { diff --git a/src/library/scala/collection/parallel/mutable/ParSeq.scala b/src/library/scala/collection/parallel/mutable/ParSeq.scala index a48ba48d56..f46b369494 100644 --- a/src/library/scala/collection/parallel/mutable/ParSeq.scala +++ b/src/library/scala/collection/parallel/mutable/ParSeq.scala @@ -26,7 +26,7 @@ import scala.collection.GenSeq /** A mutable variant of `ParSeq`. * - * @define Coll mutable.ParSeq + * @define Coll `mutable.ParSeq` * @define coll mutable parallel sequence */ trait ParSeq[T] extends collection/*.mutable*/.GenSeq[T] // was: collection.mutable.Seq[T] @@ -47,7 +47,7 @@ self => /** $factoryInfo - * @define Coll mutable.ParSeq + * @define Coll `mutable.ParSeq` * @define coll mutable parallel sequence */ object ParSeq extends ParFactory[ParSeq] { diff --git a/src/library/scala/collection/parallel/mutable/ParSet.scala b/src/library/scala/collection/parallel/mutable/ParSet.scala index 1d295fd5fe..6da4c8a7bc 100644 --- a/src/library/scala/collection/parallel/mutable/ParSet.scala +++ b/src/library/scala/collection/parallel/mutable/ParSet.scala @@ -21,7 +21,7 @@ import scala.collection.GenSet /** A mutable variant of `ParSet`. * - * @define Coll mutable.ParSet + * @define Coll `mutable.ParSet` * @define coll mutable parallel set * * @author Aleksandar Prokopec @@ -41,7 +41,7 @@ self => /** $factoryInfo - * @define Coll mutable.ParSet + * @define Coll `mutable.ParSet` * @define coll mutable parallel set */ object ParSet extends ParSetFactory[ParSet] { diff --git a/src/library/scala/reflect/api/Types.scala b/src/library/scala/reflect/api/Types.scala index e06bb37cba..5c7563c2c5 100755 --- a/src/library/scala/reflect/api/Types.scala +++ b/src/library/scala/reflect/api/Types.scala @@ -464,10 +464,10 @@ trait Types { self: Universe => def unapply(tpe: AnnotatedType): Option[(List[AnnotationInfo], Type, Symbol)] } - /** The least upper bound wrt <:< of a list of types */ + /** The least upper bound of a list of types, as determined by `<:<`. */ def lub(xs: List[Type]): Type - /** The greatest lower bound wrt <:< of a list of types */ + /** The greatest lower bound of a list of types, as determined by `<:<`. */ def glb(ts: List[Type]): Type // Creators --------------------------------------------------------------- @@ -515,15 +515,17 @@ trait Types { self: Universe => /** A creator for existential types. This generates: * - * tpe1 where { tparams } + * {{{ + * tpe1 where { tparams } + * }}} * - * where `tpe1` is the result of extrapolating `tpe` wrt to `tparams`. + * where `tpe1` is the result of extrapolating `tpe` with regard to `tparams`. * Extrapolating means that type variables in `tparams` occurring * in covariant positions are replaced by upper bounds, (minus any * SingletonClass markers), type variables in `tparams` occurring in * contravariant positions are replaced by upper bounds, provided the - * resulting type is legal wrt to stability, and does not contain any type - * variable in `tparams`. + * resulting type is legal with regard to stability, and does not contain + * any type variable in `tparams`. * * The abstraction drops all type parameters that are not directly or * indirectly referenced by type `tpe1`. If there are no remaining type -- cgit v1.2.3 From b6e989fbf63c9f47acfb54175241b42fdfbfe51b Mon Sep 17 00:00:00 2001 From: Vlad Ureche Date: Thu, 3 May 2012 02:54:27 +0200 Subject: Fixes the backticks in use case signature crash Suggested by Simon in https://groups.google.com/forum/?hl=en&fromgroups#!topic/scala-internals/z7s1CCRCz74 Now it eliminates backticks and gracefully bails out with an error message when it can't remove the wiki syntax. --- src/compiler/scala/tools/nsc/ast/DocComments.scala | 25 ++++++++++++++++----- test/scaladoc/run/usecase-var-expansion.check | 4 ++++ test/scaladoc/run/usecase-var-expansion.scala | 26 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 test/scaladoc/run/usecase-var-expansion.check create mode 100644 test/scaladoc/run/usecase-var-expansion.scala (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala index b3ed446563..028c5741c9 100755 --- a/src/compiler/scala/tools/nsc/ast/DocComments.scala +++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala @@ -383,7 +383,7 @@ trait DocComments { self: Global => } // !!! todo: inherit from Comment? - case class DocComment(raw: String, pos: Position = NoPosition) { + case class DocComment(raw: String, pos: Position = NoPosition, codePos: Position = NoPosition) { /** Returns: * template: the doc comment minus all @define and @usecase sections @@ -412,7 +412,7 @@ trait DocComments { self: Global => val comment = "/** " + raw.substring(commentStart, end) + "*/" val commentPos = subPos(commentStart, end) - UseCase(DocComment(comment, commentPos), code, codePos) + UseCase(DocComment(comment, commentPos, codePos), code, codePos) } private def subPos(start: Int, end: Int) = @@ -461,7 +461,18 @@ trait DocComments { self: Global => findIn(classes ::: List(pkgs.head, definitions.RootClass)) } - def getType(str: String): Type = { + def getType(_str: String, variable: String): Type = { + /* + * work around the backticks issue suggested by Simon in + * https://groups.google.com/forum/?hl=en&fromgroups#!topic/scala-internals/z7s1CCRCz74 + * ideally, we'd have a removeWikiSyntax method in the CommentFactory to completely eliminate the wiki markup + */ + val str = + if (_str.length >= 2 && _str.startsWith("`") && _str.endsWith("`")) + _str.substring(1, _str.length - 2) + else + _str + def getParts(start: Int): List[String] = { val end = skipIdent(str, start) if (end == start) List() @@ -471,7 +482,11 @@ trait DocComments { self: Global => } } val parts = getParts(0) - assert(parts.nonEmpty, "parts is empty '" + str + "' in site " + site) + if (parts.isEmpty) { + reporter.error(comment.codePos, "Incorrect variable expansion for " + variable + " in use case. Does the " + + "variable expand to wiki syntax when documenting " + site + "?") + return ErrorType + } val partnames = (parts.init map newTermName) :+ newTypeName(parts.last) val (start, rest) = parts match { case "this" :: _ => (site.thisType, partnames.tail) @@ -490,7 +505,7 @@ trait DocComments { self: Global => for (alias <- aliases) yield lookupVariable(alias.name.toString.substring(1), site) match { case Some(repl) => - val tpe = getType(repl.trim) + val tpe = getType(repl.trim, alias.name.toString) if (tpe != NoType) tpe else { val alias1 = alias.cloneSymbol(definitions.RootClass, alias.rawflags, newTypeName(repl)) diff --git a/test/scaladoc/run/usecase-var-expansion.check b/test/scaladoc/run/usecase-var-expansion.check new file mode 100644 index 0000000000..3faa4735c0 --- /dev/null +++ b/test/scaladoc/run/usecase-var-expansion.check @@ -0,0 +1,4 @@ +newSource:8: error: Incorrect variable expansion for $Coll in use case. Does the variable expand to wiki syntax when documenting class Test2? + * @usecase def foo: $Coll[T] + ^ +Done. diff --git a/test/scaladoc/run/usecase-var-expansion.scala b/test/scaladoc/run/usecase-var-expansion.scala new file mode 100644 index 0000000000..e86ea4a835 --- /dev/null +++ b/test/scaladoc/run/usecase-var-expansion.scala @@ -0,0 +1,26 @@ +import scala.tools.nsc.doc.model._ +import scala.tools.partest.ScaladocModelTest +import language._ + +object Test extends ScaladocModelTest { + + override def code = """ + /** + * @define Coll `Test` + */ + class Test[T] { + /** + * member $Coll + * @usecase def foo: $Coll[T] + * usecase $Coll + */ + def foo(implicit err: String): Test[T] = sys.error(err) + } + + /** @define Coll {{{some `really` < !! >> invalid $$$ thing}}} */ + class Test2[T] extends Test[Int] + """ + + def scaladocSettings = "" + def testModel(root: Package) = () +} -- cgit v1.2.3 From 6300c3033e7b852c6cbef332af6085aac6150a70 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 2 May 2012 14:39:13 -0700 Subject: Eliminating reflective calls. Frobbed knobs and made little traits until all relevant looking reflective calls were gone. --- src/compiler/scala/reflect/internal/Required.scala | 5 +--- .../scala/reflect/internal/SymbolTable.scala | 27 ++++++++++------------ src/compiler/scala/reflect/internal/Types.scala | 7 +++--- .../scala/reflect/runtime/AbstractFile.scala | 11 +++++---- src/compiler/scala/tools/nsc/io/AbstractFile.scala | 3 ++- .../scala/tools/nsc/util/WeakHashSet.scala | 3 ++- .../scala/collection/generic/Clearable.scala | 26 +++++++++++++++++++++ .../scala/collection/generic/Growable.scala | 4 ++-- src/library/scala/reflect/api/RequiredFile.scala | 7 ++++++ 9 files changed, 62 insertions(+), 31 deletions(-) create mode 100644 src/library/scala/collection/generic/Clearable.scala create mode 100644 src/library/scala/reflect/api/RequiredFile.scala (limited to 'src/compiler') diff --git a/src/compiler/scala/reflect/internal/Required.scala b/src/compiler/scala/reflect/internal/Required.scala index ba6d65a306..6d146354a3 100644 --- a/src/compiler/scala/reflect/internal/Required.scala +++ b/src/compiler/scala/reflect/internal/Required.scala @@ -5,10 +5,7 @@ import settings.MutableSettings trait Required { self: SymbolTable => - type AbstractFileType >: Null <: { - def path: String - def canonicalPath: String - } + type AbstractFileType >: Null <: api.RequiredFile def picklerPhase: Phase diff --git a/src/compiler/scala/reflect/internal/SymbolTable.scala b/src/compiler/scala/reflect/internal/SymbolTable.scala index 9158c2a4d4..aa60fb4aba 100644 --- a/src/compiler/scala/reflect/internal/SymbolTable.scala +++ b/src/compiler/scala/reflect/internal/SymbolTable.scala @@ -280,16 +280,8 @@ abstract class SymbolTable extends api.Universe object perRunCaches { import java.lang.ref.WeakReference import scala.runtime.ScalaRunTime.stringOf + import scala.collection.generic.Clearable - import language.reflectiveCalls - - // We can allow ourselves a structural type, these methods - // amount to a few calls per run at most. This does suggest - // a "Clearable" trait may be useful. - private type Clearable = { - def size: Int - def clear(): Unit - } // Weak references so the garbage collector will take care of // letting us know when a cache is really out of commission. private val caches = mutable.HashSet[WeakReference[Clearable]]() @@ -298,10 +290,14 @@ abstract class SymbolTable extends api.Universe println(caches.size + " structures are in perRunCaches.") caches.zipWithIndex foreach { case (ref, index) => val cache = ref.get() - println("(" + index + ")" + ( - if (cache == null) " has been collected." - else " has " + cache.size + " entries:\n" + stringOf(cache) - )) + cache match { + case xs: Traversable[_] => + println("(" + index + ")" + ( + if (cache == null) " has been collected." + else " has " + xs.size + " entries:\n" + stringOf(xs) + )) + case _ => + } } } // if (settings.debug.value) { @@ -315,8 +311,9 @@ abstract class SymbolTable extends api.Universe def clearAll() = { if (settings.debug.value) { - val size = caches flatMap (ref => Option(ref.get)) map (_.size) sum; - log("Clearing " + caches.size + " caches totalling " + size + " entries.") + // val size = caches flatMap (ref => Option(ref.get)) map (_.size) sum; + log("Clearing " + caches.size + " caches.") + // totalling " + size + " entries.") } caches foreach { ref => val cache = ref.get() diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index b8346a663d..165f8119ce 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -6,7 +6,8 @@ package scala.reflect package internal -import scala.collection.{ mutable, immutable } +import scala.collection.{ mutable, immutable, generic } +import generic.Clearable import scala.ref.WeakReference import mutable.ListBuffer import Flags._ @@ -115,7 +116,7 @@ trait Types extends api.Types { self: SymbolTable => protected def newUndoLog = new UndoLog - class UndoLog { + class UndoLog extends Clearable { private type UndoPairs = List[(TypeVar, TypeConstraint)] private var log: UndoPairs = List() @@ -139,7 +140,7 @@ trait Types extends api.Types { self: SymbolTable => log ::= ((tv, tv.constr.cloneInternal)) } - private[scala] def clear() { + def clear() { if (settings.debug.value) self.log("Clearing " + log.size + " entries from the undoLog.") diff --git a/src/compiler/scala/reflect/runtime/AbstractFile.scala b/src/compiler/scala/reflect/runtime/AbstractFile.scala index bf3b47298b..414bba020b 100644 --- a/src/compiler/scala/reflect/runtime/AbstractFile.scala +++ b/src/compiler/scala/reflect/runtime/AbstractFile.scala @@ -1,6 +1,7 @@ -package scala.reflect.runtime +package scala.reflect +package runtime -class AbstractFile(val jfile: java.io.File) { - def path: String = jfile.getPath() - def canonicalPath: String = jfile.getCanonicalPath() -} \ No newline at end of file +class AbstractFile(val jfile: java.io.File) extends api.RequiredFile { + def path: String = jfile.getPath() + def canonicalPath: String = jfile.getCanonicalPath() +} diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala index b51cf1228c..deb914f806 100644 --- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala @@ -10,6 +10,7 @@ package io import java.io.{ FileOutputStream, IOException, InputStream, OutputStream, BufferedOutputStream } import java.net.URL import scala.collection.mutable.ArrayBuffer +import scala.reflect.api.RequiredFile /** * @author Philippe Altherr @@ -81,7 +82,7 @@ object AbstractFile { * global.settings.encoding.value. *

*/ -abstract class AbstractFile extends AnyRef with Iterable[AbstractFile] { +abstract class AbstractFile extends AnyRef with RequiredFile with Iterable[AbstractFile] { /** Returns the name of this abstract file. */ def name: String diff --git a/src/compiler/scala/tools/nsc/util/WeakHashSet.scala b/src/compiler/scala/tools/nsc/util/WeakHashSet.scala index 6a10422b00..5bbb766e21 100644 --- a/src/compiler/scala/tools/nsc/util/WeakHashSet.scala +++ b/src/compiler/scala/tools/nsc/util/WeakHashSet.scala @@ -4,6 +4,7 @@ import scala.collection.mutable import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.Builder import scala.collection.mutable.SetBuilder +import scala.collection.generic.Clearable import scala.runtime.AbstractFunction1 /** A bare-bones implementation of a mutable `Set` that uses weak references @@ -12,7 +13,7 @@ import scala.runtime.AbstractFunction1 * This implementation offers only add/remove/test operations, * therefore it does not fulfill the contract of Scala collection sets. */ -class WeakHashSet[T <: AnyRef] extends AbstractFunction1[T, Boolean] { +class WeakHashSet[T <: AnyRef] extends AbstractFunction1[T, Boolean] with Clearable { private val underlying = mutable.HashSet[WeakReferenceWithEquals[T]]() /** Add the given element to this set. */ diff --git a/src/library/scala/collection/generic/Clearable.scala b/src/library/scala/collection/generic/Clearable.scala new file mode 100644 index 0000000000..6c8d9558b0 --- /dev/null +++ b/src/library/scala/collection/generic/Clearable.scala @@ -0,0 +1,26 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +package scala.collection +package generic + +/** This trait forms part of collections that can be cleared + * with a clear() call. + * + * @author Paul Phillips + * @version 2.10 + * @since 2.10 + * @define coll clearable collection + * @define Coll `Clearable` + */ +trait Clearable { + /** Clears the $coll's contents. After this operation, the + * $coll is empty. + */ + def clear(): Unit +} diff --git a/src/library/scala/collection/generic/Growable.scala b/src/library/scala/collection/generic/Growable.scala index baf332fcd8..d6a263af2f 100644 --- a/src/library/scala/collection/generic/Growable.scala +++ b/src/library/scala/collection/generic/Growable.scala @@ -22,7 +22,7 @@ package generic * @define add add * @define Add add */ -trait Growable[-A] { +trait Growable[-A] extends Clearable { /** ${Add}s a single element to this $coll. * @@ -50,5 +50,5 @@ trait Growable[-A] { /** Clears the $coll's contents. After this operation, the * $coll is empty. */ - def clear() + def clear(): Unit } diff --git a/src/library/scala/reflect/api/RequiredFile.scala b/src/library/scala/reflect/api/RequiredFile.scala new file mode 100644 index 0000000000..4a54595940 --- /dev/null +++ b/src/library/scala/reflect/api/RequiredFile.scala @@ -0,0 +1,7 @@ +package scala.reflect +package api + +trait RequiredFile { + def path: String + def canonicalPath: String +} -- cgit v1.2.3 From aabe71f989f023d64b6c52680485e4cacb4e88b9 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 2 May 2012 10:19:05 -0700 Subject: SI-5720: Qual block doesn't update sym owner A one-line change to blockWithQualifier. The symptom is undefined tmp var symbols in the backend; lamba lift thinks the tmp var is free and adds it to anonfun ctors. --- .../tools/nsc/typechecker/NamesDefaults.scala | 2 + test/files/pos/t5720-ownerous.scala | 56 ++++++++++++++++++++++ test/files/pos/t5727.scala | 31 ++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 test/files/pos/t5720-ownerous.scala create mode 100644 test/files/pos/t5727.scala (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index 898a9fee9f..90e388c30a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -155,6 +155,8 @@ trait NamesDefaults { self: Analyzer => val sym = blockTyper.context.owner.newValue(unit.freshTermName("qual$"), qual.pos) setInfo qual.tpe blockTyper.context.scope enter sym val vd = atPos(sym.pos)(ValDef(sym, qual) setType NoType) + // it stays in Vegas: SI-5720, SI-5727 + qual changeOwner (blockTyper.context.owner -> sym) var baseFunTransformed = atPos(baseFun.pos.makeTransparent) { // don't use treeCopy: it would assign opaque position. diff --git a/test/files/pos/t5720-ownerous.scala b/test/files/pos/t5720-ownerous.scala new file mode 100644 index 0000000000..3a12499612 --- /dev/null +++ b/test/files/pos/t5720-ownerous.scala @@ -0,0 +1,56 @@ + +/* + * The block under qual$1 must be owned by it. + * In the sample bug, the first default arg generates x$4, + * the second default arg generates qual$1, hence the maximal + * minimization. + * + def model: C.this.M = { + val qual$1: C.this.M = scala.Option.apply[C.this.M]({ + val x$1: lang.this.String("foo") = "foo"; + val x$2: String = C.this.M.apply$default$2("foo"); + C.this.M.apply("foo")(x$2) +}).getOrElse[C.this.M]({ + val x$3: lang.this.String("bar") = "bar"; + val x$4: String = C.this.M.apply$default$2("bar"); + C.this.M.apply("bar")(x$4) + }); + val x$5: lang.this.String("baz") = "baz"; + val x$6: String = qual$1.copy$default$2("baz"); + qual$1.copy("baz")(x$6) + } + */ +class C { + case class M(currentUser: String = "anon")(val message: String = "empty") + val m = M("foo")() + + // reported + //def model = Option(M("foo")()).getOrElse(M("bar")()).copy(currentUser = "")() + + // the bug + def model = Option(m).getOrElse(M("bar")()).copy("baz")() + + // style points for this version + def modish = ((null: Option[M]) getOrElse new M()()).copy()() + + // various simplifications are too simple + case class N(currentUser: String = "anon") + val n = N("fun") + def nudel = Option(n).getOrElse(N()).copy() +} + +object Test { + def main(args: Array[String]) { + val c = new C + println(c.model.currentUser) + println(c.model.message) + } +} +/* +symbol value x$4$1 does not exist in badcopy.C.model +at scala.reflect.internal.SymbolTable.abort(SymbolTable.scala:45) +at scala.tools.nsc.Global.abort(Global.scala:202) +at scala.tools.nsc.backend.icode.GenICode$ICodePhase.liftedTree2$1(GenICode.scala:998) +at scala.tools.nsc.backend.icode.GenICode$ICodePhase.scala$tools$nsc$backend$icode$GenICode$ICodePhase$$genLoad(GenICode.scala:992) +*/ + diff --git a/test/files/pos/t5727.scala b/test/files/pos/t5727.scala new file mode 100644 index 0000000000..e091d827b4 --- /dev/null +++ b/test/files/pos/t5727.scala @@ -0,0 +1,31 @@ + +/* + * We like operators, bar none. + */ +object Test { + + trait SomeInfo + case object NoInfo extends SomeInfo + + sealed abstract class Res[+T] + case object NotRes extends Res[Nothing] + + + abstract class Base[+T] { + def apply(f: String): Res[T] + // 'i' crashes the compiler, similarly if we use currying + //def |[U >: T](a: => Base[U], i: SomeInfo = NoInfo): Base[U] = null + def bar[U >: T](a: => Base[U], i: SomeInfo = NoInfo): Base[U] = null + } + + implicit def fromStringToBase(a: String): Base[String] = new Base[String] { def apply(in: String) = NotRes } + + // bug + //def Sample: Base[Any] = ( rep("foo" | "bar") | "sth") + def Sample: Base[Any] = ( rep("foo" bar "bar") bar "sth") + + def rep[T](p: => Base[T]): Base[T] = null // whatever + + def main(args: Array[String]) { + } +} -- cgit v1.2.3 From 7a5aaa9e23a98d60343cc0c4411b3fc395faa3ab Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 3 May 2012 11:09:13 +0200 Subject: SI-5703: normalize refined types more to improve Array[T] java-interop with T[], normalize Object with Object{} to Object fix #SI-5688 by flattening refined types in parents updated check files to reflect flattening of refined types and updated position for refined types --- src/compiler/scala/reflect/internal/Types.scala | 31 ++++++++++----- .../nsc/symtab/classfile/ClassfileParser.scala | 6 ++- .../scala/tools/nsc/typechecker/Namers.scala | 5 +++ .../tools/nsc/typechecker/PatternMatching.scala | 2 +- test/files/neg/override.check | 2 +- test/files/pos/t5703/Base.java | 3 ++ test/files/pos/t5703/Impl.scala | 3 ++ test/files/run/existentials3-old.check | 44 +++++++++++----------- test/files/run/t5688.check | 1 + test/files/run/t5688.scala | 23 +++++++++++ 10 files changed, 86 insertions(+), 34 deletions(-) create mode 100644 test/files/pos/t5703/Base.java create mode 100644 test/files/pos/t5703/Impl.scala create mode 100644 test/files/run/t5688.check create mode 100644 test/files/run/t5688.scala (limited to 'src/compiler') diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index 165f8119ce..799671f9e3 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -1610,12 +1610,26 @@ trait Types extends api.Types { self: SymbolTable => override def typeConstructor = copyRefinedType(this, parents map (_.typeConstructor), decls) - /* MO to AM: This is probably not correct - * If they are several higher-kinded parents with different bounds we need - * to take the intersection of their bounds - */ - override def normalize = { - if (isHigherKinded) { + final override def normalize: Type = + if (phase.erasedTypes) normalizeImpl + else { + if (normalized eq null) normalized = normalizeImpl + normalized + } + + private var normalized: Type = _ + private def normalizeImpl = { + // TODO see comments around def intersectionType and def merge + def flatten(tps: List[Type]): List[Type] = tps flatMap { case RefinedType(parents, ds) if ds.isEmpty => flatten(parents) case tp => List(tp) } + val flattened = flatten(parents).distinct + if (decls.isEmpty && flattened.tail.isEmpty) { + flattened.head + } else if (flattened != parents) { + refinedType(flattened, if (typeSymbol eq NoSymbol) NoSymbol else typeSymbol.owner, decls, NoPosition) + } else if (isHigherKinded) { + // MO to AM: This is probably not correct + // If they are several higher-kinded parents with different bounds we need + // to take the intersection of their bounds typeFun( typeParams, RefinedType( @@ -1625,8 +1639,7 @@ trait Types extends api.Types { self: SymbolTable => }, decls, typeSymbol)) - } - else super.normalize + } else super.normalize } /** A refined type P1 with ... with Pn { decls } is volatile if @@ -3322,7 +3335,7 @@ trait Types extends api.Types { self: SymbolTable => if (phase.erasedTypes) if (parents.isEmpty) ObjectClass.tpe else parents.head else { - val clazz = owner.newRefinementClass(NoPosition) + val clazz = owner.newRefinementClass(pos) // TODO: why were we passing in NoPosition instead of pos? val result = RefinedType(parents, decls, clazz) clazz.setInfo(result) result diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index b51c8baa31..739060d02e 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -774,8 +774,12 @@ abstract class ClassfileParser { // make unbounded Array[T] where T is a type variable into Array[T with Object] // (this is necessary because such arrays have a representation which is incompatible // with arrays of primitive types. - if (elemtp.typeSymbol.isAbstractType && !(elemtp <:< definitions.ObjectClass.tpe)) + // NOTE that the comparison to Object only works for abstract types bounded by classes that are strict subclasses of Object + // if the bound is exactly Object, it will have been converted to Any, and the comparison will fail + // see also RestrictJavaArraysMap (when compiling java sources directly) + if (elemtp.typeSymbol.isAbstractType && !(elemtp <:< definitions.ObjectClass.tpe)) { elemtp = intersectionType(List(elemtp, definitions.ObjectClass.tpe)) + } definitions.arrayType(elemtp) case '(' => diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 45f7d7e618..4e7dac890b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -1347,6 +1347,11 @@ trait Namers extends MethodSynthesis { /** Convert Java generic array type T[] to (T with Object)[] * (this is necessary because such arrays have a representation which is incompatible * with arrays of primitive types.) + * + * @note the comparison to Object only works for abstract types bounded by classes that are strict subclasses of Object + * if the bound is exactly Object, it will have been converted to Any, and the comparison will fail + * + * see also sigToType */ private object RestrictJavaArraysMap extends TypeMap { def apply(tp: Type): Type = tp match { diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala index c3a7f2bbc5..61e02edaff 100644 --- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala +++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala @@ -931,7 +931,7 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL // implements the run-time aspects of (§8.2) (typedPattern has already done the necessary type transformations) // TODO: normalize construction, which yields a combination of a EqualityTestTreeMaker (when necessary) and a TypeTestTreeMaker case class TypeAndEqualityTestTreeMaker(prevBinder: Symbol, patBinder: Symbol, pt: Type, pos: Position) extends CondTreeMaker { - val nextBinderTp = glb(List(patBinder.info.widen, pt)) + val nextBinderTp = glb(List(patBinder.info.widen, pt)).normalize /** Type patterns consist of types, type variables, and wildcards. A type pattern T is of one of the following forms: - A reference to a class C, p.C, or T#C. diff --git a/test/files/neg/override.check b/test/files/neg/override.check index 0336fb2b11..fc152cb3b1 100644 --- a/test/files/neg/override.check +++ b/test/files/neg/override.check @@ -1,5 +1,5 @@ override.scala:9: error: overriding type T in trait A with bounds >: Int <: Int; type T in trait B with bounds >: String <: String has incompatible type lazy val x : A with B = x - ^ + ^ one error found diff --git a/test/files/pos/t5703/Base.java b/test/files/pos/t5703/Base.java new file mode 100644 index 0000000000..fa75cc3bdd --- /dev/null +++ b/test/files/pos/t5703/Base.java @@ -0,0 +1,3 @@ +public abstract class Base { + public abstract void func(Params[] params); +} \ No newline at end of file diff --git a/test/files/pos/t5703/Impl.scala b/test/files/pos/t5703/Impl.scala new file mode 100644 index 0000000000..ee22d8fb4b --- /dev/null +++ b/test/files/pos/t5703/Impl.scala @@ -0,0 +1,3 @@ +class Implementation extends Base[Object] { + def func(params: Array[Object]): Unit = {} +} \ No newline at end of file diff --git a/test/files/run/existentials3-old.check b/test/files/run/existentials3-old.check index e166e53ba8..72abfac637 100644 --- a/test/files/run/existentials3-old.check +++ b/test/files/run/existentials3-old.check @@ -1,22 +1,22 @@ -_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object -_ <: Object with Test$ToS with scala.Product with scala.Serializable -Object with Test$ToS -Object with Test$ToS -Object with Test$ToS -scala.Function0[Object with Test$ToS] -scala.Function0[Object with Test$ToS] -_ <: Object with _ <: Object with Object with Test$ToS -_ <: Object with _ <: Object with _ <: Object with Test$ToS -scala.collection.immutable.List[Object with scala.collection.Seq[Int]] -scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] -_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object -_ <: Object with Test$ToS with scala.Product with scala.Serializable -Object with Test$ToS -Object with Test$ToS -Object with Test$ToS -scala.Function0[Object with Test$ToS] -scala.Function0[Object with Test$ToS] -_ <: Object with _ <: Object with Object with Test$ToS -_ <: Object with _ <: Object with _ <: Object with Test$ToS -scala.collection.immutable.List[Object with scala.collection.Seq[Int]] -scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] +_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with Test$ToS with scala.Product with scala.Serializable +Object with Test$ToS +Object with Test$ToS +Object with Test$ToS +scala.Function0[Object with Test$ToS] +scala.Function0[Object with Test$ToS] +_ <: Object with _ <: Object with Test$ToS +_ <: Object with _ <: Object with _ <: Object with Test$ToS +scala.collection.immutable.List[Object with scala.collection.Seq[Int]] +scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] +_ <: scala.runtime.AbstractFunction0[_ <: Object with Test$ToS with scala.Product with scala.Serializable] with scala.Serializable with java.lang.Object +_ <: Object with Test$ToS with scala.Product with scala.Serializable +Object with Test$ToS +Object with Test$ToS +Object with Test$ToS +scala.Function0[Object with Test$ToS] +scala.Function0[Object with Test$ToS] +_ <: Object with _ <: Object with Test$ToS +_ <: Object with _ <: Object with _ <: Object with Test$ToS +scala.collection.immutable.List[Object with scala.collection.Seq[Int]] +scala.collection.immutable.List[Object with scala.collection.Seq[_ <: Int]] diff --git a/test/files/run/t5688.check b/test/files/run/t5688.check new file mode 100644 index 0000000000..2c84f9e2ef --- /dev/null +++ b/test/files/run/t5688.check @@ -0,0 +1 @@ +Vector(ta, tb, tab) diff --git a/test/files/run/t5688.scala b/test/files/run/t5688.scala new file mode 100644 index 0000000000..f99bfb47d3 --- /dev/null +++ b/test/files/run/t5688.scala @@ -0,0 +1,23 @@ +object Test extends App { + trait T + + trait TA + trait TB + + class A extends T with TA + class B extends T with TB + class AB extends T with TA with TB + // Matching on _: TA with TB + + val li: Vector[T] = Vector(new A, new B, new AB) + + val matched = (for (l <- li) yield { + l match { + case _: TA with TB => "tab" + case _: TA => "ta" + case _: TB => "tb" + } + }) + + println(matched) +} \ No newline at end of file -- cgit v1.2.3 From 44797916bd4437729e1f13333eee7a2a2cb8ca58 Mon Sep 17 00:00:00 2001 From: Kato Kazuyoshi Date: Thu, 3 May 2012 23:44:48 +0900 Subject: Fix SI-4976 partially If a package have a package object, generate the package's "linearization" from the object. --- src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | 14 +++++++++++--- test/scaladoc/resources/package-object-res.scala | 14 ++++++++++++++ test/scaladoc/run/package-object.check | 2 ++ test/scaladoc/run/package-object.scala | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 test/scaladoc/resources/package-object-res.scala create mode 100644 test/scaladoc/run/package-object.check create mode 100644 test/scaladoc/run/package-object.scala (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala index a6728654cd..9062203dcd 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -231,9 +231,10 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { Some(makeType(RefinedType(tps, EmptyScope), inTpl)) } } - val linearization: List[(TemplateEntity, TypeEntity)] = { - sym.ancestors map { ancestor => - val typeEntity = makeType(sym.info.baseType(ancestor), this) + + protected def linearizationFromSymbol(symbol: Symbol) = { + symbol.ancestors map { ancestor => + val typeEntity = makeType(symbol.info.baseType(ancestor), this) val tmplEntity = makeTemplate(ancestor) match { case tmpl: DocTemplateImpl => tmpl registerSubClass this ; tmpl case tmpl => tmpl @@ -242,6 +243,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { } } + val linearization = linearizationFromSymbol(sym) def linearizationTemplates = linearization map { _._1 } def linearizationTypes = linearization map { _._2 } @@ -282,6 +284,12 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { abstract class PackageImpl(sym: Symbol, inTpl: => PackageImpl) extends DocTemplateImpl(sym, inTpl) with Package { override def inTemplate = inTpl override def toRoot: List[PackageImpl] = this :: inTpl.toRoot + override val linearization = { + val symbol = sym.info.members.find { + s => s.isPackageObject + } getOrElse sym + linearizationFromSymbol(symbol) + } val packages = members collect { case p: Package => p } } diff --git a/test/scaladoc/resources/package-object-res.scala b/test/scaladoc/resources/package-object-res.scala new file mode 100644 index 0000000000..17d5c0a499 --- /dev/null +++ b/test/scaladoc/resources/package-object-res.scala @@ -0,0 +1,14 @@ +/** This package have A and B. + */ +package test { + trait A { def hi = "hello" } + trait B { def bye = "bye!" } +} + +/** This package object extends A and B. + */ +package object test extends A with B { + override def hi = "good morning!" + override def bye = "good bye!" + protected def thank = "thank you!" +} diff --git a/test/scaladoc/run/package-object.check b/test/scaladoc/run/package-object.check new file mode 100644 index 0000000000..4297847e73 --- /dev/null +++ b/test/scaladoc/run/package-object.check @@ -0,0 +1,2 @@ +List((test.B,B), (test.A,A), (scala.AnyRef,AnyRef), (scala.Any,Any)) +Done. diff --git a/test/scaladoc/run/package-object.scala b/test/scaladoc/run/package-object.scala new file mode 100644 index 0000000000..fd36a8df7b --- /dev/null +++ b/test/scaladoc/run/package-object.scala @@ -0,0 +1,15 @@ +import scala.tools.nsc.doc.model._ +import scala.tools.partest.ScaladocModelTest +import language._ + +object Test extends ScaladocModelTest { + override def resourceFile = "package-object-res.scala" + override def scaladocSettings = "" + def testModel(root: Package) = { + import access._ + + val p = root._package("test") + println(p.linearization) + } +} + -- cgit v1.2.3