summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-04-30 20:00:39 +0000
committerPaul Phillips <paulp@improving.org>2011-04-30 20:00:39 +0000
commitacc5311c157358c99420ba5a8be4231ffae9fc8e (patch)
treec99d20bb582b9474bc7520a6afca7fb2f7cb6296 /src
parent95ae7765e85fb7942ce8724170e72fa8c3076aa0 (diff)
downloadscala-acc5311c157358c99420ba5a8be4231ffae9fc8e.tar.gz
scala-acc5311c157358c99420ba5a8be4231ffae9fc8e.tar.bz2
scala-acc5311c157358c99420ba5a8be4231ffae9fc8e.zip
After having to update the code for someone els...
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.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala2
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/Members.scala4
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala2
-rw-r--r--src/compiler/scala/tools/nsc/doc/model/Entity.scala4
-rw-r--r--src/compiler/scala/tools/nsc/interactive/Global.scala2
-rw-r--r--src/compiler/scala/tools/nsc/interpreter/ILoop.scala2
-rw-r--r--src/compiler/scala/tools/nsc/io/Lexer.scala4
-rw-r--r--src/compiler/scala/tools/nsc/io/Pickler.scala2
-rw-r--r--src/compiler/scala/tools/nsc/settings/MutableSettings.scala2
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala2
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Infer.scala6
-rw-r--r--src/detach/plugin/scala/tools/detach/Detach.scala2
-rw-r--r--src/library/scala/App.scala2
-rw-r--r--src/library/scala/Array.scala2
-rw-r--r--src/library/scala/collection/JavaConversions.scala2
-rwxr-xr-xsrc/library/scala/collection/JavaConverters.scala2
-rw-r--r--src/library/scala/collection/TraversableProxy.scala2
-rw-r--r--src/library/scala/collection/mutable/SetLike.scala2
-rw-r--r--src/library/scala/collection/package.scala2
-rw-r--r--src/library/scala/math/Ordered.scala4
-rw-r--r--src/library/scala/sys/process/Process.scala4
-rw-r--r--src/library/scala/xml/factory/LoggedNodeFactory.scala2
-rw-r--r--src/swing/scala/swing/UIElement.scala2
23 files changed, 30 insertions, 30 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
index 2c29bf9f1f..70bbd85330 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
@@ -351,7 +351,7 @@ trait BasicBlocks {
def exceptionSuccessorsForBlock(block: BasicBlock): List[BasicBlock] =
method.exh collect { case x if x covers block => x.startBlock }
- /** Cached value of successors. Must be recomputed whenver a block in the current method is changed. */
+ /** Cached value of successors. Must be recomputed whenever a block in the current method is changed. */
private var succs: List[BasicBlock] = Nil
private def updateSuccs() {
resetFlag(DIRTYSUCCS)
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
index 92107565f9..630f109bb6 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
@@ -262,10 +262,10 @@ trait Members { self: ICodes =>
class Local(val sym: Symbol, val kind: TypeKind, val arg: Boolean) {
var index: Int = -1
- /** Starting PC for this local's visbility range. */
+ /** Starting PC for this local's visibility range. */
var start: Int = _
- /** Ending PC for this local's visbility range. */
+ /** Ending PC for this local's visibility range. */
var end: Int = _
/** PC-based ranges for this local variable's visibility */
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index a7c2b2abd3..76e0162593 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -752,7 +752,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with
if (!jmethod.isAbstract() && !method.native) {
val jcode = jmethod.getCode().asInstanceOf[JExtendedCode]
- // add a fake local for debugging purpuses
+ // add a fake local for debugging purposes
if (emitVars && isClosureApply(method.symbol)) {
val outerField = clasz.symbol.info.decl(nme.OUTER_LOCAL)
if (outerField != NoSymbol) {
diff --git a/src/compiler/scala/tools/nsc/doc/model/Entity.scala b/src/compiler/scala/tools/nsc/doc/model/Entity.scala
index 86de011e68..a09194c2dd 100644
--- a/src/compiler/scala/tools/nsc/doc/model/Entity.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/Entity.scala
@@ -161,7 +161,7 @@ trait MemberEntity extends Entity {
/** Whether this member is implicit. */
def isImplicit: Boolean
- /** Whether this member is abtract. */
+ /** Whether this member is abstract. */
def isAbstract: Boolean
}
@@ -260,7 +260,7 @@ trait Class extends Trait with HigherKinded {
def constructors: List[Constructor]
/** The value parameters of this case class, or an empty list if this class is not a case class. As case class value
- * paramters cannot be curried, the outer list has exactly one element. */
+ * parameters cannot be curried, the outer list has exactly one element. */
def valueParams: List[List[ValueParam]]
}
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index d8f43fd209..da97e10584 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -144,7 +144,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "")
unitOfFile.getOrElse(source.file, { println("precondition violated: "+source+" is not loaded"); new Exception().printStackTrace(); new RichCompilationUnit(source) })
/** Work through toBeRemoved list to remove any units.
- * Then return optionlly unit associated with given source.
+ * Then return optionally unit associated with given source.
*/
protected[interactive] def getUnit(s: SourceFile): Option[RichCompilationUnit] = {
toBeRemoved.synchronized {
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index b4b2f097d2..74a23d119d 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -682,7 +682,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
}
def transcript(start: String) = {
- // Printing this message doesn't work very well becaues it's buried in the
+ // Printing this message doesn't work very well because it's buried in the
// transcript they just pasted. Todo: a short timer goes off when
// lines stop coming which tells them to hit ctrl-D.
//
diff --git a/src/compiler/scala/tools/nsc/io/Lexer.scala b/src/compiler/scala/tools/nsc/io/Lexer.scala
index 262aac7809..8f103f9b98 100644
--- a/src/compiler/scala/tools/nsc/io/Lexer.scala
+++ b/src/compiler/scala/tools/nsc/io/Lexer.scala
@@ -30,10 +30,10 @@ object Lexer {
/** A subclass of token representing integer literals */
case class IntLit(override val str: String) extends Token(str)
- /** A subclass of token representaing floating point literals */
+ /** A subclass of token representing floating point literals */
case class FloatLit(override val str: String) extends Token(str)
- /** A subclass of token represenating string literals */
+ /** A subclass of token representing string literals */
case class StringLit(override val str: String) extends Token(str) {
override def toString = quoted(str)
}
diff --git a/src/compiler/scala/tools/nsc/io/Pickler.scala b/src/compiler/scala/tools/nsc/io/Pickler.scala
index 78c1369b64..fe9aa3b9c0 100644
--- a/src/compiler/scala/tools/nsc/io/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/io/Pickler.scala
@@ -5,7 +5,7 @@ import Lexer._
import java.io.Writer
/** An abstract class for writing and reading Scala objects to and
- * from a legible representation. The presesentation follows the folloing grammar:
+ * from a legible representation. The presesentation follows the following grammar:
* {{{
* Pickled = `true' | `false' | `null' | NumericLit | StringLit |
* Labelled | Pickled `,' Pickled
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
index 5772d9f7b1..87398e4117 100644
--- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
@@ -382,7 +382,7 @@ class MutableSettings(val errorFn: String => Unit) extends AbsSettings with Scal
// Helper to validate an input
private def isInputValid(k: Int): Boolean = (min <= k) && (k <= max)
- // Helper to generate a textual explaination of valid inputs
+ // Helper to generate a textual explanation of valid inputs
private def getValidText: String = (min, max) match {
case (IntMin, IntMax) => "can be any integer"
case (IntMin, x) => "must be less than or equal to "+x
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index b2a4b34b32..53b4f0dac6 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -1117,7 +1117,7 @@ trait Implicits {
object ImplicitNotFoundMsg {
def unapply(sym: Symbol): Option[(Message)] = sym.implicitNotFoundMsg map (m => (new Message(sym, m)))
- // check the message's syntax: should be a string literal that may contain occurences of the string "${X}",
+ // check the message's syntax: should be a string literal that may contain occurrences of the string "${X}",
// where `X` refers to a type parameter of `sym`
def check(sym: Symbol): Option[String] =
sym.getAnnotation(ImplicitNotFoundClass).flatMap(_.stringArg(0) match {
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index 0b1a9f6187..6c27bcace6 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -1066,7 +1066,7 @@ trait Infer {
}
errorMessages.toList
}
- /** Substitite free type variables `undetparams' of polymorphic argument
+ /** Substitute free type variables `undetparams' of polymorphic argument
* expression `tree', given two prototypes `strictPt', and `lenientPt'.
* `strictPt' is the first attempt prototype where type parameters
* are left unchanged. `lenientPt' is the fall-back prototype where type
@@ -1113,7 +1113,7 @@ trait Infer {
}
}
- /** Substitite free type variables `undetparams' of polymorphic argument
+ /** Substitute free type variables `undetparams' of polymorphic argument
* expression <code>tree</code> to `targs', Error if `targs' is null
*
* @param tree ...
@@ -1195,7 +1195,7 @@ trait Infer {
tp
}
- /** Substitite free type variables <code>undetparams</code> of type constructor
+ /** Substitute free type variables <code>undetparams</code> of type constructor
* <code>tree</code> in pattern, given prototype <code>pt</code>.
*
* @param tree ...
diff --git a/src/detach/plugin/scala/tools/detach/Detach.scala b/src/detach/plugin/scala/tools/detach/Detach.scala
index 45342c96cf..56433cd33e 100644
--- a/src/detach/plugin/scala/tools/detach/Detach.scala
+++ b/src/detach/plugin/scala/tools/detach/Detach.scala
@@ -1179,7 +1179,7 @@ abstract class Detach extends PluginComponent
* closures;</li>
* <li>it then adds proxies for free objects;</li>
* <li>finally, if transforms detached closures (both definition and
- * instantation).</li>
+ * instantiation).</li>
* </ol>
*/
override def transformUnit(unit: CompilationUnit) {
diff --git a/src/library/scala/App.scala b/src/library/scala/App.scala
index 59c6fccec3..826278ade0 100644
--- a/src/library/scala/App.scala
+++ b/src/library/scala/App.scala
@@ -51,7 +51,7 @@ trait App extends DelayedInit {
/** The main method.
* This stores all argument so that they can be retrieved with `args`
- * and the executes all initialization code segements in the order they were
+ * and the executes all initialization code segments in the order they were
* passed to `delayedInit`
* @param args the arguments passed to the main method
*/
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala
index 66ce9320bd..07cf9e039f 100644
--- a/src/library/scala/Array.scala
+++ b/src/library/scala/Array.scala
@@ -26,7 +26,7 @@ class FallbackArrayBuilding {
* does not have a class manifest. Note that fallbackBuilder factory
* needs an implicit parameter (otherwise it would not be dominated in implicit search
* by Array.canBuildFrom). We make sure that that implicit search is always
- * successfull.
+ * successful.
*/
implicit def fallbackCanBuildFrom[T](implicit m: DummyImplicit): CanBuildFrom[Array[_], T, ArraySeq[T]] =
new CanBuildFrom[Array[_], T, ArraySeq[T]] {
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index fdb77a48c1..8b98f10875 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -504,7 +504,7 @@ object JavaConversions {
* Scala ConcurrentMap will be returned.
*
* @param m The ConcurrentMap to be converted.
- * @return A Scala mutable ConcurrrentMap view of the argument.
+ * @return A Scala mutable ConcurrentMap view of the argument.
*/
implicit def asScalaConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]): mutable.ConcurrentMap[A, B] = m match {
case cmw: ConcurrentMapWrapper[a, b] => cmw.underlying
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index 4bb61b960a..0b55f54810 100755
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -454,7 +454,7 @@ object JavaConverters {
* Scala <code>ConcurrentMap</code> will be returned.
*
* @param m The <code>ConcurrentMap</code> to be converted.
- * @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrrentMap</code> view of the argument.
+ * @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrentMap</code> view of the argument.
*/
implicit def asScalaConcurrentMapConverter[A, B](m: juc.ConcurrentMap[A, B]): AsScala[mutable.ConcurrentMap[A, B]] =
new AsScala(asScalaConcurrentMap(m))
diff --git a/src/library/scala/collection/TraversableProxy.scala b/src/library/scala/collection/TraversableProxy.scala
index e965523ab2..215cf086d9 100644
--- a/src/library/scala/collection/TraversableProxy.scala
+++ b/src/library/scala/collection/TraversableProxy.scala
@@ -10,7 +10,7 @@
package scala.collection
-// Methods could be printed by cat TraverableLike.scala | egrep '^ (override )?def'
+// Methods could be printed by cat TraversableLike.scala | egrep '^ (override )?def'
/** This trait implements a proxy for traversable objects. It forwards
diff --git a/src/library/scala/collection/mutable/SetLike.scala b/src/library/scala/collection/mutable/SetLike.scala
index a74f904aa3..c3bc106153 100644
--- a/src/library/scala/collection/mutable/SetLike.scala
+++ b/src/library/scala/collection/mutable/SetLike.scala
@@ -173,7 +173,7 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]]
* $addDuplicates
*
* @param xs the traversable object.
- * @return a new set cconsisting of elements of this set and those in `xs`.
+ * @return a new set consisting of elements of this set and those in `xs`.
*/
@migration(2, 8,
"As of 2.8, this operation creates a new set. To add the elements as a\n"+
diff --git a/src/library/scala/collection/package.scala b/src/library/scala/collection/package.scala
index f951f22057..f0a0c40bcd 100644
--- a/src/library/scala/collection/package.scala
+++ b/src/library/scala/collection/package.scala
@@ -5,7 +5,7 @@ package scala
*
* == Guide ==
*
- * A detailed guide for the collections library is avaialble
+ * A detailed guide for the collections library is available
* at [[http://www.scala-lang.org/docu/files/collections-api]].
*
* == Using Collections ==
diff --git a/src/library/scala/math/Ordered.scala b/src/library/scala/math/Ordered.scala
index 5a07451f4a..64cbd5e8f2 100644
--- a/src/library/scala/math/Ordered.scala
+++ b/src/library/scala/math/Ordered.scala
@@ -20,14 +20,14 @@ package scala.math
* there is no reasonable way to provide a default implementation
* of equality for instances of Ordered[A]. Therefore, if you need
* to be able to use equality on an instance of Ordered[A] you must
- * provide it yourself either when inheiriting or instantiating.
+ * provide it yourself either when inheriting or instantiating.
*
* It is important that the hashCode method for an instance of
* Ordered[A] be consistent with the compare method. However,
* it is not possible to provide a sensible default implementation.
* Therefore, if you need to be able compute the hash of an
* instance of Ordered[A] you must provide it yourself either when
- * inheiriting or instantiating.
+ * inheriting or instantiating.
*
* @author Martin Odersky
* @version 1.1, 2006-07-24
diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala
index 983fc8309c..01fbaf19e3 100644
--- a/src/library/scala/sys/process/Process.scala
+++ b/src/library/scala/sys/process/Process.scala
@@ -38,7 +38,7 @@ trait ProcessCreation {
def apply(command: Seq[String], cwd: File, extraEnv: (String, String)*): ProcessBuilder =
apply(command, Some(cwd), extraEnv: _*)
- /** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+ /** create ProcessBuilder with working dir optionally set to File and extra environment variables */
def apply(command: String, cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
apply(command.split("""\s+"""), cwd, extraEnv : _*)
// not smart to use this on windows, because CommandParser uses \ to escape ".
@@ -48,7 +48,7 @@ trait ProcessCreation {
}*/
}
- /** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+ /** create ProcessBuilder with working dir optionally set to File and extra environment variables */
def apply(command: Seq[String], cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
val jpb = new JProcessBuilder(command.toArray: _*)
cwd foreach (jpb directory _)
diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala
index 6a777f4605..c15a9ebe7b 100644
--- a/src/library/scala/xml/factory/LoggedNodeFactory.scala
+++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala
@@ -37,7 +37,7 @@ trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] with scala.util.loggin
final val NONE = 0
final val CACHE = 1
final val FULL = 2
- /** 0 = no loggging, 1 = cache hits, 2 = detail */
+ /** 0 = no logging, 1 = cache hits, 2 = detail */
val logCompressLevel = 1
// methods of NodeFactory
diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala
index 38bc6308fd..9c5120a342 100644
--- a/src/swing/scala/swing/UIElement.scala
+++ b/src/swing/scala/swing/UIElement.scala
@@ -99,7 +99,7 @@ trait UIElement extends Proxy with LazyPublisher {
def location = peer.getLocation
def bounds = peer.getBounds
def size = peer.getSize
- @deprecated("Explicit size assignement for UIElements is not supported anymore. " +
+ @deprecated("Explicit size assignment for UIElements is not supported anymore. " +
"Use a layout manager or subclass Window.", "2.8.0")
def size_=(dim: Dimension) = peer.setSize(dim)