diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-23 12:20:41 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-23 12:20:41 -0700 |
commit | 1187c9896c097e6e591e5655b35f52c06b3c900a (patch) | |
tree | 63bc88a56e412cf0fa7d33ff7d43a3c04941af7f /src/library | |
parent | c8cd187b8ea5cef1fad6f42f4f276e19c99b317e (diff) | |
parent | 2ba065f0ae434944566ca8fe76232af32ab8e21a (diff) | |
download | scala-1187c9896c097e6e591e5655b35f52c06b3c900a.tar.gz scala-1187c9896c097e6e591e5655b35f52c06b3c900a.tar.bz2 scala-1187c9896c097e6e591e5655b35f52c06b3c900a.zip |
Merge pull request #2285 from vigdorchik/silence_scaladoc
Remove unrecognized doc comments
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/Iterator.scala | 2 | ||||
-rw-r--r-- | src/library/scala/collection/SeqLike.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/NumericRange.scala | 8 | ||||
-rw-r--r-- | src/library/scala/concurrent/SyncVar.scala | 6 | ||||
-rwxr-xr-x | src/library/scala/xml/parsing/MarkupParser.scala | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala index 43db7c55e0..c85a4fb6e7 100644 --- a/src/library/scala/collection/Iterator.scala +++ b/src/library/scala/collection/Iterator.scala @@ -555,7 +555,7 @@ trait Iterator[+A] extends TraversableOnce[A] { def span(p: A => Boolean): (Iterator[A], Iterator[A]) = { val self = buffered - /** + /* * Giving a name to following iterator (as opposed to trailing) because * anonymous class is represented as a structural type that trailing * iterator is referring (the finish() method) and thus triggering diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala index a83a6fe6a1..c02ea98914 100644 --- a/src/library/scala/collection/SeqLike.scala +++ b/src/library/scala/collection/SeqLike.scala @@ -210,13 +210,13 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[ if (!hasNext) Iterator.empty.next() - /** Calculate this result. */ + /* Calculate this result. */ val buf = self.newBuilder for(k <- 0 until nums.length; j <- 0 until nums(k)) buf += elms(offs(k)+j) val res = buf.result() - /** Prepare for the next call to next. */ + /* Prepare for the next call to next. */ var idx = nums.length - 1 while (idx >= 0 && nums(idx) == cnts(idx)) idx -= 1 diff --git a/src/library/scala/collection/immutable/NumericRange.scala b/src/library/scala/collection/immutable/NumericRange.scala index 195aeed281..5842ff30e6 100644 --- a/src/library/scala/collection/immutable/NumericRange.scala +++ b/src/library/scala/collection/immutable/NumericRange.scala @@ -220,10 +220,10 @@ object NumericRange { if (!isInclusive && zero == remainder) 0 else 1 ) - /** The edge cases keep coming. Since e.g. - * Long.MaxValue + 1 == Long.MinValue - * we do some more improbable seeming checks lest - * overflow turn up as an empty range. + /* The edge cases keep coming. Since e.g. + * Long.MaxValue + 1 == Long.MinValue + * we do some more improbable seeming checks lest + * overflow turn up as an empty range. */ // The second condition contradicts an empty result. val isOverflow = longCount == 0 && num.lt(num.plus(start, step), end) == upward diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala index 9ab7bcc572..6d25ffe19e 100644 --- a/src/library/scala/concurrent/SyncVar.scala +++ b/src/library/scala/concurrent/SyncVar.scala @@ -41,9 +41,9 @@ class SyncVar[A] { * @return `None` if variable is undefined after `timeout`, `Some(value)` otherwise */ def get(timeout: Long): Option[A] = synchronized { - /** Defending against the system clock going backward - * by counting time elapsed directly. Loop required - * to deal with spurious wakeups. + /* Defending against the system clock going backward + * by counting time elapsed directly. Loop required + * to deal with spurious wakeups. */ var rest = timeout while (!isDefined && rest > 0) { diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index d289414c26..9c7bb60475 100755 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -108,7 +108,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests val ilen = inpStack.length //Console.println(" ilen = "+ilen+ " extIndex = "+extIndex); if ((ilen != extIndex) && (ilen > 0)) { - /** for external source, inpStack == Nil ! need notify of eof! */ + /* for external source, inpStack == Nil ! need notify of eof! */ pop() } else { reachedEof = true @@ -880,7 +880,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests externalID() } else if (ch == 'P') { - /** PublicID (without system, only used in NOTATION) */ + /* PublicID (without system, only used in NOTATION) */ nextch() xToken("UBLIC") xSpace() |