Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 65fa73d

Browse files
committed
Merge pull request scala#4669 from janekdb/2.11.x-scaladoc-reflect
ScalaDoc fixes for reflect
2 parents 8e7e3b4 + e206a18 commit 65fa73d

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

src/reflect/scala/reflect/api/Trees.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ trait Trees { self: Universe =>
143143
/** Find all subtrees matching predicate `p`. Same as `withFilter` */
144144
def filter(f: Tree => Boolean): List[Tree]
145145

146-
/** Apply `pf' to each subtree on which the function is defined and collect the results.
146+
/** Apply `pf` to each subtree on which the function is defined and collect the results.
147147
*/
148148
def collect[T](pf: PartialFunction[Tree, T]): List[T]
149149

src/reflect/scala/reflect/api/TypeTags.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import java.io.ObjectStreamException
5353
* Each of these methods constructs a `TypeTag[T]` or `ClassTag[T]` for the given
5454
* type argument `T`.
5555
*
56-
* === #2 Using an implicit parameter of type `TypeTag[T]`, `ClassTag[T]`, or `WeakTypeTag[T]
56+
* === #2 Using an implicit parameter of type `TypeTag[T]`, `ClassTag[T]`, or `WeakTypeTag[T]`
5757
*
5858
* For example:
5959
* {{{

src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ trait ExistentialsAndSkolems {
110110
/**
111111
* Compute an existential type from hidden symbols `hidden` and type `tp`.
112112
* @param hidden The symbols that will be existentially abstracted
113-
* @param hidden The original type
113+
* @param tp The original type
114114
* @param rawOwner The owner for Java raw types.
115115
*/
116116
final def packSymbols(hidden: List[Symbol], tp: Type, rawOwner: Symbol = NoSymbol): Type =

src/reflect/scala/reflect/internal/SymbolPairs.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ abstract class SymbolPairs {
217217
bs(nshifted) |= nmask
218218
}
219219

220-
/** Implements `bs1 * bs2 * {0..n} != 0.
220+
/** Implements `bs1 * bs2 * {0..n} != 0`.
221221
* Used in hasCommonParentAsSubclass */
222222
private def intersectionContainsElementLeq(bs1: BitSet, bs2: BitSet, n: Int): Boolean = {
223223
val nshifted = n >> 5

src/reflect/scala/reflect/internal/TreeGen.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,12 @@ abstract class TreeGen {
594594
* TupleN(x_1, ..., x_N)
595595
* } ...)
596596
*
597-
* If any of the P_i are variable patterns, the corresponding `x_i @ P_i' is not generated
597+
* If any of the P_i are variable patterns, the corresponding `x_i @ P_i` is not generated
598598
* and the variable constituting P_i is used instead of x_i
599599
*
600-
* @param mapName The name to be used for maps (either map or foreach)
601-
* @param flatMapName The name to be used for flatMaps (either flatMap or foreach)
602600
* @param enums The enumerators in the for expression
603-
* @param body The body of the for expression
601+
* @param sugarBody The body of the for expression
602+
* @param fresh A source of new names
604603
*/
605604
def mkFor(enums: List[Tree], sugarBody: Tree)(implicit fresh: FreshNameCreator): Tree = {
606605
val (mapName, flatMapName, body) = sugarBody match {

src/reflect/scala/reflect/internal/Types.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ trait Types
732732
*
733733
* `SubstThisAndSymMap` performs a breadth-first map over this type, which meant that
734734
* symbol substitution occurred before `ThisType` substitution. Consequently, in substitution
735-
* of a `SingleType(ThisType(`from`), sym), symbols were rebound to `from` rather than `to`.
735+
* of a `SingleType(ThisType(from), sym)`, symbols were rebound to `from` rather than `to`.
736736
*/
737737
def substThisAndSym(from: Symbol, to: Type, symsFrom: List[Symbol], symsTo: List[Symbol]): Type =
738738
if (symsFrom eq symsTo) substThis(from, to)
@@ -756,7 +756,7 @@ trait Types
756756
/** Apply `f` to each part of this type */
757757
def foreach(f: Type => Unit) { new ForEachTypeTraverser(f).traverse(this) }
758758

759-
/** Apply `pf' to each part of this type on which the function is defined */
759+
/** Apply `pf` to each part of this type on which the function is defined */
760760
def collect[T](pf: PartialFunction[Type, T]): List[T] = new CollectTypeCollector(pf).collect(this)
761761

762762
/** Apply `f` to each part of this type; children get mapped before their parents */
@@ -2045,7 +2045,7 @@ trait Types
20452045
/** SI-3731, SI-8177: when prefix is changed to `newPre`, maintain consistency of prefix and sym
20462046
* (where the symbol refers to a declaration "embedded" in the prefix).
20472047
*
2048-
* @returns newSym so that `newPre` binds `sym.name` to `newSym`,
2048+
* @return newSym so that `newPre` binds `sym.name` to `newSym`,
20492049
* to remain consistent with `pre` previously binding `sym.name` to `sym`.
20502050
*
20512051
* `newSym` and `sym` are conceptually the same symbols, but some change to our `prefix`

src/reflect/scala/reflect/internal/pickling/UnPickler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ abstract class UnPickler {
168168
}
169169

170170
/** If entry at `i` is undefined, define it by performing
171-
* operation `op` with `readIndex at start of i'th
171+
* operation `op` with `readIndex` at start of i'th
172172
* entry. Restore `readIndex` afterwards.
173173
*/
174174
protected def at[T <: AnyRef](i: Int, op: () => T): T = {

src/reflect/scala/reflect/internal/util/AbstractFileClassLoader.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.security.cert.Certificate
1212
import java.security.{ ProtectionDomain, CodeSource }
1313
import java.util.{ Collections => JCollections, Enumeration => JEnumeration }
1414

15-
/** A class loader that loads files from a {@link scala.tools.nsc.io.AbstractFile}.
15+
/** A class loader that loads files from a [[scala.reflect.io.AbstractFile]].
1616
*
1717
* @author Lex Spoon
1818
*/

0 commit comments

Comments
 (0)