Skip to content

Commit b633e4f

Browse files
authored
Merge pull request scala#7015 from seratch/minor-typo
Fix several minor typos in comments
2 parents decbe79 + bc0b8dc commit b633e4f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
314314
// Rewrite This(enclModuleClass) to Ident(enclModuleClass) to avoid unnecessary capture of the module
315315
// class, which might hamper serializability.
316316
//
317-
// Analagous to this special case in ExplicitOuter: https://github.com/scala/scala/blob/d2d33ddf8c/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala#L410-L412
317+
// Analogous to this special case in ExplicitOuter: https://github.com/scala/scala/blob/d2d33ddf8c/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala#L410-L412
318318
// that understands that such references shouldn't give rise to outer params.
319319
val enclosingStaticModules = owner.enclClassChain.filter(x => !x.hasPackageFlag && x.isModuleClass && x.isStatic)
320320
enclosingStaticModules.foldLeft(tree)((tree, moduleClass) => tree.substituteThis(moduleClass, gen.mkAttributedIdent(moduleClass.sourceModule)) )

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
568568
}
569569
}
570570

571-
// scala/bug#10290: qual can be `this.$outer()` (not just `this`), so we call genLoad (not jsut ALOAD_0)
571+
// scala/bug#10290: qual can be `this.$outer()` (not just `this`), so we call genLoad (not just ALOAD_0)
572572
genLoad(superQual)
573573
genLoadArguments(args, paramTKs(app))
574574
generatedType = genCallMethod(fun.symbol, InvokeStyle.Super, app.pos, sup.tpe.typeSymbol)

src/compiler/scala/tools/nsc/transform/patmat/Solving.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ trait Solving extends Logic {
528528
*
529529
* See also [[https://en.wikipedia.org/wiki/DPLL_algorithm]].
530530
*
531-
* This implementation uses a `List` to reify the seach stack, thus making
531+
* This implementation uses a `List` to reify the search stack, thus making
532532
* it run in constant stack space. The stack is composed of pairs of
533533
* `(remaining clauses, variable assignments)`, and depth-first search
534534
* is achieved by using a stack rather than a queue.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,7 +4172,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
41724172
}
41734173

41744174
//
4175-
// START: applyDynamic suport
4175+
// START: applyDynamic support
41764176
//
41774177
import treeInfo.{isApplyDynamicName, DynamicUpdate, DynamicApplicationNamed}
41784178

@@ -5963,10 +5963,10 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
59635963

59645964
for (sym <- classes) {
59655965
for ((ownAcc, superAcc) <- superConstructorCalls.getOrElse(sym, Nil)) {
5966-
// We have a corresponding paramter in the super class.
5966+
// We have a corresponding parameter in the super class.
59675967
val superClazz = sym.superClass
59685968
val alias = (
5969-
superAcc.initialize.alias // Is the param accessor is an alias for a field further up the class heirarchy?
5969+
superAcc.initialize.alias // Is the param accessor is an alias for a field further up the class hierarchy?
59705970
orElse (superAcc getterIn superAcc.owner) // otherwise, lookup the accessor for the super
59715971
filter (alias => superClazz.info.nonPrivateMember(alias.name) == alias) // the accessor must be public
59725972
)

src/scalacheck/org/scalacheck/Prop.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ object Prop {
496496

497497
/**
498498
* This handles situations where we have a starting seed in our
499-
* paramters.
499+
* parameters.
500500
*
501501
* If we do, then we remove it from parameters and return it. If
502502
* not, we create a new random seed. The new parameters from this

src/scalacheck/org/scalacheck/Test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ object Test {
128128
/** Test parameters used by the check methods. Default
129129
* parameters are defined by [[Test.Parameters.default]]. */
130130
object Parameters {
131-
/** Default test parameters. Can be overriden if you need to
131+
/** Default test parameters. Can be overridden if you need to
132132
* tweak the parameters:
133133
*
134134
* {{{

src/scalacheck/org/scalacheck/commands/Commands.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ trait Commands {
7777
def destroySut(sut: Sut): Unit
7878

7979
/** The precondition for the initial state, when no commands yet have
80-
* run. This is used by ScalaCheck when command sequences are shrinked
80+
* run. This is used by ScalaCheck when command sequences are shrunk
8181
* and the first state might differ from what is returned from
8282
* [[genInitialState]]. */
8383
def initialPreCondition(state: State): Boolean

0 commit comments

Comments
 (0)