Fix some typos (a-c)

janekdb · janekdb · commit ce7d2e95ce1f · 2015-06-18T08:43:09.000+01:00
diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -773,7 +773,7 @@ abstract class Inliners extends SubComponent {
 
         staleOut += block
 
-        tfa.remainingCALLs.remove(instr) // this bookkpeeping is done here and not in MTFAGrowable.reinit due to (1st) convenience and (2nd) necessity.
+        tfa.remainingCALLs.remove(instr) // this bookkeeping is done here and not in MTFAGrowable.reinit due to (1st) convenience and (2nd) necessity.
         tfa.isOnWatchlist.remove(instr)  // ditto
         tfa.warnIfInlineFails.remove(instr)
 
diff --git a/src/compiler/scala/tools/nsc/classpath/ZipAndJarFileLookupFactory.scala b/src/compiler/scala/tools/nsc/classpath/ZipAndJarFileLookupFactory.scala
@@ -61,7 +61,7 @@ object ZipAndJarFlatClassPathFactory extends ZipAndJarFileLookupFactory {
   }
 
   /**
-   * This type of classpath is closly related to the support for JSR-223.
+   * This type of classpath is closely related to the support for JSR-223.
    * Its usage can be observed e.g. when running:
    * jrunscript -classpath scala-compiler.jar;scala-reflect.jar;scala-library.jar -l scala
    * with a particularly prepared scala-library.jar. It should have all classes listed in the manifest like e.g. this entry:
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -373,7 +373,7 @@ abstract class SymbolLoaders {
     protected def doComplete(root: Symbol) { root.sourceModule.initialize }
   }
 
-  /** used from classfile parser to avoid cyclies */
+  /** used from classfile parser to avoid cycles */
   var parentsLevel = 0
   var pendingLoadActions: List[() => Unit] = Nil
 }
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
@@ -248,7 +248,7 @@ trait MatchTranslation {
       if (caseDefs forall treeInfo.isCatchCase) caseDefs
       else {
         val swatches = { // switch-catches
-          // SI-7459 must duplicate here as we haven't commited to switch emission, and just figuring out
+          // SI-7459 must duplicate here as we haven't committed to switch emission, and just figuring out
           //         if we can ends up mutating `caseDefs` down in the use of `substituteSymbols` in
           //         `TypedSubstitution#Substitution`. That is called indirectly by `emitTypeSwitch`.
           val bindersAndCases = caseDefs.map(_.duplicate) map { caseDef =>
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4443,7 +4443,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
         def onError(typeErrors: Seq[AbsTypeError], warnings: Seq[(Position, String)]): Tree = {
           if (Statistics.canEnable) Statistics.stopTimer(failedApplyNanos, start)
 
-          // If the problem is with raw types, copnvert to existentials and try again.
+          // If the problem is with raw types, convert to existentials and try again.
           // See #4712 for a case where this situation arises,
           if ((fun.symbol ne null) && fun.symbol.isJavaDefined) {
             val newtpe = rawToExistential(fun.tpe)
diff --git a/src/reflect/scala/reflect/internal/AnnotationCheckers.scala b/src/reflect/scala/reflect/internal/AnnotationCheckers.scala
@@ -60,7 +60,7 @@ trait AnnotationCheckers {
      * mode (see method adapt in trait Typers).
      *
      * An implementation cannot rely on canAdaptAnnotations being called before. If the implementing
-     * class cannot do the adaptiong, it should return the tree unchanged.
+     * class cannot do the adapting, it should return the tree unchanged.
      */
     @deprecated("Create an AnalyzerPlugin and use adaptAnnotations", "2.10.1")
     def adaptAnnotations(tree: Tree, mode: Mode, pt: Type): Tree = tree
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -987,7 +987,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
           || isLocalToBlock
          )
     )
-    /** Is this symbol effectively final or a concrete term member of sealed class whose childred do not override it */
+    /** Is this symbol effectively final or a concrete term member of sealed class whose children do not override it */
     final def isEffectivelyFinalOrNotOverridden: Boolean = isEffectivelyFinal || (isTerm && !isDeferred && isNotOverridden)
 
     /** Is this symbol owned by a package? */
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/model/Entity.scala
@@ -484,10 +484,10 @@ trait ImplicitConversion {
   /** The entity for the method that performed the conversion, if it's documented (or just its name, otherwise) */
   def convertorMethod: Either[MemberEntity, String]
 
-  /** A short name of the convertion */
+  /** A short name of the conversion */
   def conversionShortName: String
 
-  /** A qualified name uniquely identifying the convertion (currently: the conversion method's qualified name) */
+  /** A qualified name uniquely identifying the conversion (currently: the conversion method's qualified name) */
   def conversionQualifiedName: String
 
   /** The entity that performed the conversion */
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
@@ -475,7 +475,7 @@ trait ModelFactoryImplicitSupport {
     }
 
   /**
-   *  Make implicits explicit - Not used curently
+   *  Make implicits explicit - Not used currently
    */
   // object implicitToExplicit extends TypeMap {
   //   def apply(tp: Type): Type = mapOver(tp) match {
diff --git a/test/files/jvm/bytecode-test-example/Test.scala b/test/files/jvm/bytecode-test-example/Test.scala
@@ -17,7 +17,7 @@ object Test extends BytecodeTest {
   def countNullChecks(insnList: InsnList): Int = {
     /** Is given instruction a null check?
      *  NOTE
-     *   This will detect direct null compparsion as in
+     *   This will detect direct null comparison as in
      *    if (x == null) ...
      *   and not indirect as in
      *     val foo = null
diff --git a/test/files/jvm/t7006/Foo_1.scala b/test/files/jvm/t7006/Foo_1.scala
@@ -5,6 +5,6 @@ class Foo_1 {
     } finally {
       print("hello")
     }
-    while(true){} // ensure infinite loop doesn't break the algoirthm
+    while(true){} // ensure infinite loop doesn't break the algorithm
   }
 }
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
@@ -64,7 +64,7 @@ names-defaults-neg.scala:49: error: ambiguous reference to overloaded definition
 both method g in object t7 of type (a: B)String
 and  method g in object t7 of type (a: C, b: Int*)String
 match argument types (C)
-  t7.g(new C()) // ambigous reference
+  t7.g(new C()) // ambiguous reference
      ^
 names-defaults-neg.scala:53: error: parameter 'b' is already specified at parameter position 2
   test5(a = 1, b = "dkjl", b = "dkj")
@@ -79,7 +79,7 @@ names-defaults-neg.scala:61: error: ambiguous reference to overloaded definition
 both method f in object t8 of type (b: String, a: Int)String
 and  method f in object t8 of type (a: Int, b: Object)String
 match argument types (a: Int,b: String) and expected result type Any
-  println(t8.f(a = 0, b = "1")) // ambigous reference
+  println(t8.f(a = 0, b = "1")) // ambiguous reference
              ^
 names-defaults-neg.scala:69: error: wrong number of arguments for pattern A1(x: Int,y: String)
   A1() match { case A1(_) => () }
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
@@ -46,7 +46,7 @@ object Test extends App {
     def g(a: C, b: Int*) = "third"
     def g(a: B) = "fourth"
   }
-  t7.g(new C()) // ambigous reference
+  t7.g(new C()) // ambiguous reference
 
   // vararg
   def test5(a: Int, b: String*) = a
@@ -58,7 +58,7 @@ object Test extends App {
     def f(a: Int, b: Object) = "first"
     def f(b: String, a: Int) = "second"
   }
-  println(t8.f(a = 0, b = "1")) // ambigous reference
+  println(t8.f(a = 0, b = "1")) // ambiguous reference
 
 
   // case class copy does not exist if there's a vararg
diff --git a/test/files/pos/t6575b.scala b/test/files/pos/t6575b.scala
@@ -1,5 +1,5 @@
 // inferred types were okay here as Function nodes aren't
-// translated into anoymous subclasses of AbstractFunctionN
+// translated into anonymous subclasses of AbstractFunctionN
 // until after the typer.
 //
 // So this test is just confirmation.
diff --git a/test/files/run/t6502.scala b/test/files/run/t6502.scala
@@ -123,7 +123,7 @@ object Test extends StoreReporterDirectTest {
   }
 
   def test6(): Unit = {
-    // Avoid java.lang.NoClassDefFoundError triggered by the old appoach of using a Java
+    // Avoid java.lang.NoClassDefFoundError triggered by the old approach of using a Java
     // classloader to parse .class files in order to read their names.
     val jar = "test6.jar"
     compileCode(app6, jar)
diff --git a/test/pending/pos/t1786.scala b/test/pending/pos/t1786.scala
@@ -1,5 +1,5 @@
 /** This a consequence of the current type checking algorithm, where bounds are checked only after variables are instantiated.
- * I believe this will change once we go to contraint-based type inference.
+ * I believe this will change once we go to constraint-based type inference.
  * Alternatively, we can pursue a more extensive fix to SI-6169
  *
  * The below code shows a compiler flaw in that the wildcard "_" as value for a bounded type parameter either
diff --git a/test/pending/run/idempotency-partial-functions.scala b/test/pending/run/idempotency-partial-functions.scala
@@ -6,7 +6,7 @@ import scala.tools.reflect.Eval
 // Related to SI-6187
 //
 // Moved to pending as we are currently blocked by the inability
-// to reify the parent types of the anoymous function class,
+// to reify the parent types of the anonymous function class,
 // which are not part of the tree, but rather only part of the
 // ClassInfoType.
 object Test extends App {
diff --git a/test/scaladoc/resources/implicits-base-res.scala b/test/scaladoc/resources/implicits-base-res.scala
@@ -52,7 +52,7 @@ object A {
  * def convToGtColonDoubleA(x: Double)      // enrichA3: no constraints
  * def convToManifestA(x: Double)           // enrichA7: no constraints
  * def convToMyNumericA(x: Double)          // enrichA6: (if showAll is set) with a constraint that there is x: MyNumeric[Double] implicit in scope
- * def convToNumericA(x: Double)            // enrichA1: no constraintsd
+ * def convToNumericA(x: Double)            // enrichA1: no constraints
  * def convToEnrichedA(x: Bar[Foo[Double]]) // enrichA5: no constraints, SHADOWED
  * def convToEnrichedA(x: Double)           // enrichA0: no constraints, SHADOWED
  * def convToTraversableOps(x: Double)      // enrichA7: no constraints

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ object ZipAndJarFlatClassPathFactory extends ZipAndJarFileLookupFactory {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`64`		`- * This type of classpath is closly related to the support for JSR-223.`
	`64`	`+ * This type of classpath is closely related to the support for JSR-223.`
`65`	`65`	`* Its usage can be observed e.g. when running:`
`66`	`66`	`* jrunscript -classpath scala-compiler.jar;scala-reflect.jar;scala-library.jar -l scala`
`67`	`67`	`* with a particularly prepared scala-library.jar. It should have all classes listed in the manifest like e.g. this entry:`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ abstract class SymbolLoaders {`
`373`	`373`	`protected def doComplete(root: Symbol) { root.sourceModule.initialize }`
`374`	`374`	`}`
`375`	`375`
`376`		`- /** used from classfile parser to avoid cyclies */`
	`376`	`+ /** used from classfile parser to avoid cycles */`
`377`	`377`	`var parentsLevel = 0`
`378`	`378`	`var pendingLoadActions: List[() => Unit] = Nil`
`379`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ trait AnnotationCheckers {`
`60`	`60`	`* mode (see method adapt in trait Typers).`
`61`	`61`	`*`
`62`	`62`	`* An implementation cannot rely on canAdaptAnnotations being called before. If the implementing`
`63`		`- * class cannot do the adaptiong, it should return the tree unchanged.`
	`63`	`+ * class cannot do the adapting, it should return the tree unchanged.`
`64`	`64`	`*/`
`65`	`65`	`@deprecated("Create an AnalyzerPlugin and use adaptAnnotations", "2.10.1")`
`66`	`66`	`def adaptAnnotations(tree: Tree, mode: Mode, pt: Type): Tree = tree`
Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>`
`987`	`987`	`\|\| isLocalToBlock`
`988`	`988`	`)`
`989`	`989`	`)`
`990`		`- /** Is this symbol effectively final or a concrete term member of sealed class whose childred do not override it */`
	`990`	`+ /** Is this symbol effectively final or a concrete term member of sealed class whose children do not override it */`
`991`	`991`	`final def isEffectivelyFinalOrNotOverridden: Boolean = isEffectivelyFinal \|\| (isTerm && !isDeferred && isNotOverridden)`
`992`	`992`
`993`	`993`	`/** Is this symbol owned by a package? */`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ trait ModelFactoryImplicitSupport {`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`/**`
`478`		`- * Make implicits explicit - Not used curently`
	`478`	`+ * Make implicits explicit - Not used currently`
`479`	`479`	`*/`
`480`	`480`	`// object implicitToExplicit extends TypeMap {`
`481`	`481`	`// def apply(tp: Type): Type = mapOver(tp) match {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ class Foo_1 {`
`5`	`5`	`} finally {`
`6`	`6`	`print("hello")`
`7`	`7`	`}`
`8`		`- while(true){} // ensure infinite loop doesn't break the algoirthm`
	`8`	`+ while(true){} // ensure infinite loop doesn't break the algorithm`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ object Test extends App {`
`46`	`46`	`def g(a: C, b: Int*) = "third"`
`47`	`47`	`def g(a: B) = "fourth"`
`48`	`48`	`}`
`49`		`- t7.g(new C()) // ambigous reference`
	`49`	`+ t7.g(new C()) // ambiguous reference`
`50`	`50`
`51`	`51`	`// vararg`
`52`	`52`	`def test5(a: Int, b: String*) = a`
`@@ -58,7 +58,7 @@ object Test extends App {`
`58`	`58`	`def f(a: Int, b: Object) = "first"`
`59`	`59`	`def f(b: String, a: Int) = "second"`
`60`	`60`	`}`
`61`		`- println(t8.f(a = 0, b = "1")) // ambigous reference`
	`61`	`+ println(t8.f(a = 0, b = "1")) // ambiguous reference`
`62`	`62`
`63`	`63`
`64`	`64`	`// case class copy does not exist if there's a vararg`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ object Test extends StoreReporterDirectTest {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`def test6(): Unit = {`
`126`		`- // Avoid java.lang.NoClassDefFoundError triggered by the old appoach of using a Java`
	`126`	`+ // Avoid java.lang.NoClassDefFoundError triggered by the old approach of using a Java`
`127`	`127`	`// classloader to parse .class files in order to read their names.`
`128`	`128`	`val jar = "test6.jar"`
`129`	`129`	`compileCode(app6, jar)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/** This a consequence of the current type checking algorithm, where bounds are checked only after variables are instantiated.`
`2`		`- * I believe this will change once we go to contraint-based type inference.`
	`2`	`+ * I believe this will change once we go to constraint-based type inference.`
`3`	`3`	`* Alternatively, we can pursue a more extensive fix to SI-6169`
`4`	`4`	`*`
`5`	`5`	`* The below code shows a compiler flaw in that the wildcard "_" as value for a bounded type parameter either`