Merge pull request scala#4605 from janekdb/2.11.x-typos-s

Fix 25 typos (s) - LGTM - thanks, smiles

Author: dickwall

src/compiler/scala/reflect/quasiquotes/Reifiers.scala

@@ -317,7 +317,7 @@ trait Reifiers { self: Quasiquotes =>
      *  Reification of non-trivial list is done in two steps:
      *
      *  1. split the list into groups where every placeholder is always
-     *     put in a group of its own and all subsquent non-holeMap are
+     *     put in a group of its own and all subsequent non-holeMap are
      *     grouped together; element is considered to be a placeholder if it's
      *     in the domain of the fill function;
      *

src/compiler/scala/tools/nsc/ast/TreeGen.scala

@@ -233,7 +233,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
   }
 
   /** Return the synchronized part of the double-checked locking idiom around the syncBody tree. It guards with `cond` and
-   *  synchronizez on `clazz.this`. Additional statements can be included after initialization,
+   *  synchronizes on `clazz.this`. Additional statements can be included after initialization,
    *  (outside the synchronized block).
    *
    *  The idiom works only if the condition is using a volatile field.

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

@@ -846,7 +846,7 @@ trait Implicits {
           errors.collectFirst { case err: DivergentImplicitTypeError => err } foreach saveDivergent
 
           if (search.isDivergent && divergentError.isEmpty) {
-            // Divergence triggered by `i` at this level of the implicit serach. We haven't
+            // Divergence triggered by `i` at this level of the implicit search. We haven't
             // seen divergence so far, we won't issue this error just yet, and instead temporarily
             // treat `i` as a failed candidate.
             saveDivergent(DivergentImplicitTypeError(tree, pt, i.sym))

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

@@ -436,7 +436,7 @@ trait MethodSynthesis {
           if (tree.symbol.owner.isTrait || hasUnitType(basisSym)) rhs1
           else gen.mkAssignAndReturn(basisSym, rhs1)
         )
-        derivedSym setPos tree.pos // cannot set it at createAndEnterSymbol because basisSym can possible stil have NoPosition
+        derivedSym setPos tree.pos // cannot set it at createAndEnterSymbol because basisSym can possibly still have NoPosition
         val ddefRes = DefDef(derivedSym, new ChangeOwnerAndModuleClassTraverser(basisSym, derivedSym)(body))
         // ValDef will have its position focused whereas DefDef will have original correct rangepos
         // ideally positions would be correct at the creation time but lazy vals are really a special case

src/reflect/scala/reflect/internal/Definitions.scala

@@ -103,7 +103,7 @@ trait Definitions extends api.StandardDefinitions {
     def isNumericValueClass(sym: Symbol) = ScalaNumericValueClasses contains sym
 
     def isGetClass(sym: Symbol) = (
-         sym.name == nme.getClass_ // this condition is for performance only, this is called from `Typer#stabliize`.
+         sym.name == nme.getClass_ // this condition is for performance only, this is called from `Typer#stabilize`.
       && getClassMethods(sym)
     )
 

src/reflect/scala/reflect/internal/StdNames.scala

@@ -870,7 +870,7 @@ trait StdNames {
     val toFloat: NameType  = "toFloat"
     val toDouble: NameType = "toDouble"
 
-    // primitive operation methods for structual types mostly
+    // primitive operation methods for structural types mostly
     // overlap with the above, but not for these two.
     val toCharacter: NameType = "toCharacter"
     val toInteger: NameType   = "toInteger"

src/reflect/scala/reflect/runtime/SynchronizedTypes.scala

@@ -82,9 +82,9 @@ private[reflect] trait SynchronizedTypes extends internal.Types { self: SymbolTa
   override def toStringSubjects = _toStringSubjects.get
 
   /* The idea of caches is as follows.
-   * When in reflexive mode, a cache is either null, or one sentinal
+   * When in reflexive mode, a cache is either null, or one sentinel
    * value representing undefined or the final defined
-   * value. Hence, we can ask in non-synchronized ode whether the cache field
+   * value. Hence, we can ask in non-synchronized mode whether the cache field
    * is non null and different from the sentinel (if a sentinel exists).
    * If that's true, the cache value is current.
    * Otherwise we arrive in one of the defined... methods listed below

src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala

@@ -15,7 +15,7 @@ import scala.tools.nsc.interpreter
 import scala.tools.nsc.interpreter.session.{History, SimpleHistory}
 
 
-/** A straight scalification of the jline interface which mixes
+/** A straight scalafication of the jline interface which mixes
  *  in the sparse jline-independent one too.
  */
 trait JLineHistory extends JHistory with History {

test/disabled/presentation/akka/src/akka/actor/ActorRef.scala

@@ -1384,7 +1384,7 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef =>
       "\n\tYou have probably: " +
       "\n\t\t1. Sent a message to an Actor from an instance that is NOT an Actor." +
       "\n\t\t2. Invoked a method on an TypedActor from an instance NOT an TypedActor." +
-      "\n\tElse you might want to use 'reply_?' which returns Boolean(true) if succes and Boolean(false) if no sender in scope")
+      "\n\tElse you might want to use 'reply_?' which returns Boolean(true) if success and Boolean(false) if no sender in scope")
 
   /**
    * Use <code>reply_?(..)</code> to reply with a message to the original sender of the message currently

test/files/pos/t6601/UsePrivateValueClass_2.scala

@@ -1,5 +1,5 @@
 object Test {
-	// After the first attempt to make seprately compiled value
+	// After the first attempt to make separately compiled value
 	// classes respect the privacy of constructors, we got:
 	//
 	//   exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply

test/files/pos/t8954/t2.scala

@@ -19,7 +19,7 @@ class C {
 }
 
 // 2.1 overriding with a deprecated def should be fine
-// and also shoudln't trigger the "deprecation is useless"
+// and also should not trigger the "deprecation is useless"
 // warning
 class D extends C {
   @deprecated("","") override def foo(): Unit = ???

test/files/presentation/t8941b/IdempotencyTest.scala

@@ -6,9 +6,9 @@ import reporters.{Reporter => CompilerReporter}
 import scala.tools.nsc.interactive.InteractiveReporter
 import scala.reflect.internal.util.SourceFile
 
-/** Determistically interrupts typechecking of `code` when a defintion named
-  * `MagicInterruptionMarker` is typechecked, and then performs a targetted
-  * typecheck of the tree at the specal comment marker marker
+/** Deterministically interrupts typechecking of `code` when a definition named
+  * `MagicInterruptionMarker` is typechecked, and then performs a targeted
+  * typecheck of the tree at the special comment marker marker
   */  
 abstract class IdempotencyTest { self =>
   private val settings = new Settings

test/files/run/classfile-format-51.scala

@@ -14,7 +14,7 @@ import Opcodes._
 //
 // By its nature the test can only work on JDK 7+ because under JDK 6 some of the
 // classes referred to by DynamicInvoker won't be available and DynamicInvoker won't
-// verify. So the test includes a version check that short-circuites the whole test
+// verify. So the test includes a version check that short-circuits the whole test
 // on JDK 6
 object Test extends DirectTest {
   override def extraSettings: String = "-optimise -usejavacp -d " + testOutput.path + " -cp " + testOutput.path

test/files/run/complicatedmatch.scala

@@ -7,7 +7,7 @@ object Even{
 }
 
 object Test extends App{
-  val LongWord = "supercalifragilisticexpialadocious";
+  val LongWord = "supercalifragilisticexpialidocious";
 
   def foo(x : Int, y : String) : Int = (x, y) match {
     case (Even(i), "bar") => 1

test/files/run/nothingTypeNoFramesNoDce.scala

@@ -26,7 +26,7 @@ class C {
   }
 
   def f5(x: Boolean) = {
-    // stack heights need to be the smae. ??? looks to the jvm like returning a value of
+    // stack heights need to be the same. ??? looks to the jvm like returning a value of
     // type Nothing$, need to drop or throw it.
     println(
       if (x) { ???; 10 }

test/files/run/t8010.scala

@@ -5,7 +5,7 @@ trait Base {
   def bt(n: Int) = n
 }
 trait Derived extends Base {
-  // was: double defintion error
+  // was: double definition error
   override def t          = 1 + super.t
   override def t(n: Int)  = 1 + super.t(n)
   override def bt         = 1 + super.bt
@@ -14,7 +14,7 @@ trait Derived extends Base {
 
 object Test extends App {
   val d = new Derived {}
-  // not the focus of thie bug, but let's just check the runtime behaviour while we're here.
+  // not the focus of this bug, but let's just check the runtime behaviour while we're here.
   assert(d.t == 2)
   assert(d.t(1) == 2)
   assert(d.bt == 3)

test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala

@@ -250,8 +250,8 @@ trait ArbitraryTreesAndNames {
                genAppliedTypeTree(size - 1), genTypeBoundsTree(size - 1))
 
   /*  These are marker types that allow to write tests that
-   *  depend specificly on Trees that are terms or types.
-   *  They are transparently tranformed to trees through
+   *  depend specifically on Trees that are terms or types.
+   *  They are transparently transformed to trees through
    *  implicit conversions and liftables for quasiquotes.
    */
 

test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala

@@ -346,7 +346,7 @@ trait MethodConstruction { self: QuasiquoteProperties =>
     }
   }
 
-  property("can't unquote annotations with arguments specificed twice") = test {
+  property("can't unquote annotations with arguments specified twice") = test {
     val a = q"new a(x)"
     assertThrows[IllegalArgumentException] {
       q"@$a(y) def foo"
@@ -370,7 +370,7 @@ trait PackageConstruction { self: QuasiquoteProperties =>
     assertEqAst(q"package $name { }", "package foo.bar { }")
   }
 
-  property("splce name into package name") = test{
+  property("splice name into package name") = test{
     val name = TermName("bippy")
     assertEqAst(q"package $name { }", "package bippy { }")
   }