Skip to content

Commit dae177b

Browse files
author
extempore
committed
After having to update the code for someone else, ran damarau
levenshtein on trunk again. Patchwise, I guess correcting spelling errors in comments is about as safe as it gets. No review. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24853 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
1 parent 282c9f8 commit dae177b

File tree

23 files changed

+30
-30
lines changed

23 files changed

+30
-30
lines changed

src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ trait BasicBlocks {
351351
def exceptionSuccessorsForBlock(block: BasicBlock): List[BasicBlock] =
352352
method.exh collect { case x if x covers block => x.startBlock }
353353

354-
/** Cached value of successors. Must be recomputed whenver a block in the current method is changed. */
354+
/** Cached value of successors. Must be recomputed whenever a block in the current method is changed. */
355355
private var succs: List[BasicBlock] = Nil
356356
private def updateSuccs() {
357357
resetFlag(DIRTYSUCCS)

src/compiler/scala/tools/nsc/backend/icode/Members.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ trait Members { self: ICodes =>
262262
class Local(val sym: Symbol, val kind: TypeKind, val arg: Boolean) {
263263
var index: Int = -1
264264

265-
/** Starting PC for this local's visbility range. */
265+
/** Starting PC for this local's visibility range. */
266266
var start: Int = _
267267

268-
/** Ending PC for this local's visbility range. */
268+
/** Ending PC for this local's visibility range. */
269269
var end: Int = _
270270

271271
/** PC-based ranges for this local variable's visibility */

src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with
752752
if (!jmethod.isAbstract() && !method.native) {
753753
val jcode = jmethod.getCode().asInstanceOf[JExtendedCode]
754754

755-
// add a fake local for debugging purpuses
755+
// add a fake local for debugging purposes
756756
if (emitVars && isClosureApply(method.symbol)) {
757757
val outerField = clasz.symbol.info.decl(nme.OUTER_LOCAL)
758758
if (outerField != NoSymbol) {

src/compiler/scala/tools/nsc/doc/model/Entity.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ trait MemberEntity extends Entity {
161161
/** Whether this member is implicit. */
162162
def isImplicit: Boolean
163163

164-
/** Whether this member is abtract. */
164+
/** Whether this member is abstract. */
165165
def isAbstract: Boolean
166166

167167
}
@@ -260,7 +260,7 @@ trait Class extends Trait with HigherKinded {
260260
def constructors: List[Constructor]
261261

262262
/** The value parameters of this case class, or an empty list if this class is not a case class. As case class value
263-
* paramters cannot be curried, the outer list has exactly one element. */
263+
* parameters cannot be curried, the outer list has exactly one element. */
264264
def valueParams: List[List[ValueParam]]
265265

266266
}

src/compiler/scala/tools/nsc/interactive/Global.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "")
144144
unitOfFile.getOrElse(source.file, { println("precondition violated: "+source+" is not loaded"); new Exception().printStackTrace(); new RichCompilationUnit(source) })
145145

146146
/** Work through toBeRemoved list to remove any units.
147-
* Then return optionlly unit associated with given source.
147+
* Then return optionally unit associated with given source.
148148
*/
149149
protected[interactive] def getUnit(s: SourceFile): Option[RichCompilationUnit] = {
150150
toBeRemoved.synchronized {

src/compiler/scala/tools/nsc/interpreter/ILoop.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
682682
}
683683

684684
def transcript(start: String) = {
685-
// Printing this message doesn't work very well becaues it's buried in the
685+
// Printing this message doesn't work very well because it's buried in the
686686
// transcript they just pasted. Todo: a short timer goes off when
687687
// lines stop coming which tells them to hit ctrl-D.
688688
//

src/compiler/scala/tools/nsc/io/Lexer.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ object Lexer {
3030
/** A subclass of token representing integer literals */
3131
case class IntLit(override val str: String) extends Token(str)
3232

33-
/** A subclass of token representaing floating point literals */
33+
/** A subclass of token representing floating point literals */
3434
case class FloatLit(override val str: String) extends Token(str)
3535

36-
/** A subclass of token represenating string literals */
36+
/** A subclass of token representing string literals */
3737
case class StringLit(override val str: String) extends Token(str) {
3838
override def toString = quoted(str)
3939
}

src/compiler/scala/tools/nsc/io/Pickler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Lexer._
55
import java.io.Writer
66

77
/** An abstract class for writing and reading Scala objects to and
8-
* from a legible representation. The presesentation follows the folloing grammar:
8+
* from a legible representation. The presesentation follows the following grammar:
99
* {{{
1010
* Pickled = `true' | `false' | `null' | NumericLit | StringLit |
1111
* Labelled | Pickled `,' Pickled

src/compiler/scala/tools/nsc/settings/MutableSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal
382382
// Helper to validate an input
383383
private def isInputValid(k: Int): Boolean = (min <= k) && (k <= max)
384384

385-
// Helper to generate a textual explaination of valid inputs
385+
// Helper to generate a textual explanation of valid inputs
386386
private def getValidText: String = (min, max) match {
387387
case (IntMin, IntMax) => "can be any integer"
388388
case (IntMin, x) => "must be less than or equal to "+x

src/compiler/scala/tools/nsc/typechecker/Implicits.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ trait Implicits {
11171117

11181118
object ImplicitNotFoundMsg {
11191119
def unapply(sym: Symbol): Option[(Message)] = sym.implicitNotFoundMsg map (m => (new Message(sym, m)))
1120-
// check the message's syntax: should be a string literal that may contain occurences of the string "${X}",
1120+
// check the message's syntax: should be a string literal that may contain occurrences of the string "${X}",
11211121
// where `X` refers to a type parameter of `sym`
11221122
def check(sym: Symbol): Option[String] =
11231123
sym.getAnnotation(ImplicitNotFoundClass).flatMap(_.stringArg(0) match {

src/compiler/scala/tools/nsc/typechecker/Infer.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ trait Infer {
10661066
}
10671067
errorMessages.toList
10681068
}
1069-
/** Substitite free type variables `undetparams' of polymorphic argument
1069+
/** Substitute free type variables `undetparams' of polymorphic argument
10701070
* expression `tree', given two prototypes `strictPt', and `lenientPt'.
10711071
* `strictPt' is the first attempt prototype where type parameters
10721072
* are left unchanged. `lenientPt' is the fall-back prototype where type
@@ -1113,7 +1113,7 @@ trait Infer {
11131113
}
11141114
}
11151115

1116-
/** Substitite free type variables `undetparams' of polymorphic argument
1116+
/** Substitute free type variables `undetparams' of polymorphic argument
11171117
* expression <code>tree</code> to `targs', Error if `targs' is null
11181118
*
11191119
* @param tree ...
@@ -1195,7 +1195,7 @@ trait Infer {
11951195
tp
11961196
}
11971197

1198-
/** Substitite free type variables <code>undetparams</code> of type constructor
1198+
/** Substitute free type variables <code>undetparams</code> of type constructor
11991199
* <code>tree</code> in pattern, given prototype <code>pt</code>.
12001200
*
12011201
* @param tree ...

src/detach/plugin/scala/tools/detach/Detach.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ abstract class Detach extends PluginComponent
11791179
* closures;</li>
11801180
* <li>it then adds proxies for free objects;</li>
11811181
* <li>finally, if transforms detached closures (both definition and
1182-
* instantation).</li>
1182+
* instantiation).</li>
11831183
* </ol>
11841184
*/
11851185
override def transformUnit(unit: CompilationUnit) {

src/library/scala/App.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ trait App extends DelayedInit {
5151

5252
/** The main method.
5353
* This stores all argument so that they can be retrieved with `args`
54-
* and the executes all initialization code segements in the order they were
54+
* and the executes all initialization code segments in the order they were
5555
* passed to `delayedInit`
5656
* @param args the arguments passed to the main method
5757
*/

src/library/scala/Array.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class FallbackArrayBuilding {
2626
* does not have a class manifest. Note that fallbackBuilder factory
2727
* needs an implicit parameter (otherwise it would not be dominated in implicit search
2828
* by Array.canBuildFrom). We make sure that that implicit search is always
29-
* successfull.
29+
* successful.
3030
*/
3131
implicit def fallbackCanBuildFrom[T](implicit m: DummyImplicit): CanBuildFrom[Array[_], T, ArraySeq[T]] =
3232
new CanBuildFrom[Array[_], T, ArraySeq[T]] {

src/library/scala/collection/JavaConversions.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ object JavaConversions {
504504
* Scala ConcurrentMap will be returned.
505505
*
506506
* @param m The ConcurrentMap to be converted.
507-
* @return A Scala mutable ConcurrrentMap view of the argument.
507+
* @return A Scala mutable ConcurrentMap view of the argument.
508508
*/
509509
implicit def asScalaConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]): mutable.ConcurrentMap[A, B] = m match {
510510
case cmw: ConcurrentMapWrapper[a, b] => cmw.underlying

src/library/scala/collection/JavaConverters.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ object JavaConverters {
454454
* Scala <code>ConcurrentMap</code> will be returned.
455455
*
456456
* @param m The <code>ConcurrentMap</code> to be converted.
457-
* @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrrentMap</code> view of the argument.
457+
* @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrentMap</code> view of the argument.
458458
*/
459459
implicit def asScalaConcurrentMapConverter[A, B](m: juc.ConcurrentMap[A, B]): AsScala[mutable.ConcurrentMap[A, B]] =
460460
new AsScala(asScalaConcurrentMap(m))

src/library/scala/collection/TraversableProxy.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
package scala.collection
1212

13-
// Methods could be printed by cat TraverableLike.scala | egrep '^ (override )?def'
13+
// Methods could be printed by cat TraversableLike.scala | egrep '^ (override )?def'
1414

1515

1616
/** This trait implements a proxy for traversable objects. It forwards

src/library/scala/collection/mutable/SetLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]]
173173
* $addDuplicates
174174
*
175175
* @param xs the traversable object.
176-
* @return a new set cconsisting of elements of this set and those in `xs`.
176+
* @return a new set consisting of elements of this set and those in `xs`.
177177
*/
178178
@migration(2, 8,
179179
"As of 2.8, this operation creates a new set. To add the elements as a\n"+

src/library/scala/collection/package.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package scala
55
*
66
* == Guide ==
77
*
8-
* A detailed guide for the collections library is avaialble
8+
* A detailed guide for the collections library is available
99
* at [[http://www.scala-lang.org/docu/files/collections-api]].
1010
*
1111
* == Using Collections ==

src/library/scala/math/Ordered.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ package scala.math
2020
* there is no reasonable way to provide a default implementation
2121
* of equality for instances of Ordered[A]. Therefore, if you need
2222
* to be able to use equality on an instance of Ordered[A] you must
23-
* provide it yourself either when inheiriting or instantiating.
23+
* provide it yourself either when inheriting or instantiating.
2424
*
2525
* It is important that the hashCode method for an instance of
2626
* Ordered[A] be consistent with the compare method. However,
2727
* it is not possible to provide a sensible default implementation.
2828
* Therefore, if you need to be able compute the hash of an
2929
* instance of Ordered[A] you must provide it yourself either when
30-
* inheiriting or instantiating.
30+
* inheriting or instantiating.
3131
*
3232
* @author Martin Odersky
3333
* @version 1.1, 2006-07-24

src/library/scala/sys/process/Process.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ trait ProcessCreation {
3838
def apply(command: Seq[String], cwd: File, extraEnv: (String, String)*): ProcessBuilder =
3939
apply(command, Some(cwd), extraEnv: _*)
4040

41-
/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
41+
/** create ProcessBuilder with working dir optionally set to File and extra environment variables */
4242
def apply(command: String, cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
4343
apply(command.split("""\s+"""), cwd, extraEnv : _*)
4444
// not smart to use this on windows, because CommandParser uses \ to escape ".
@@ -48,7 +48,7 @@ trait ProcessCreation {
4848
}*/
4949
}
5050

51-
/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
51+
/** create ProcessBuilder with working dir optionally set to File and extra environment variables */
5252
def apply(command: Seq[String], cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
5353
val jpb = new JProcessBuilder(command.toArray: _*)
5454
cwd foreach (jpb directory _)

src/library/scala/xml/factory/LoggedNodeFactory.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] with scala.util.loggin
3737
final val NONE = 0
3838
final val CACHE = 1
3939
final val FULL = 2
40-
/** 0 = no loggging, 1 = cache hits, 2 = detail */
40+
/** 0 = no logging, 1 = cache hits, 2 = detail */
4141
val logCompressLevel = 1
4242

4343
// methods of NodeFactory

src/swing/scala/swing/UIElement.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ trait UIElement extends Proxy with LazyPublisher {
9999
def location = peer.getLocation
100100
def bounds = peer.getBounds
101101
def size = peer.getSize
102-
@deprecated("Explicit size assignement for UIElements is not supported anymore. " +
102+
@deprecated("Explicit size assignment for UIElements is not supported anymore. " +
103103
"Use a layout manager or subclass Window.", "2.8.0")
104104
def size_=(dim: Dimension) = peer.setSize(dim)
105105

0 commit comments

Comments
 (0)