Skip to content

Commit 540b18f

Browse files
adriaanmadriaanm
committed
Merge pull request scala#4461 from adriaanm/rebase-4446
Fix many typos
2 parents 20f7389 + a4c68e9 commit 540b18f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+69
-69
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ trait Reifiers { self: Quasiquotes =>
317317
* Reification of non-trivial list is done in two steps:
318318
*
319319
* 1. split the list into groups where every placeholder is always
320-
* put in a group of it's own and all subsquent non-holeMap are
320+
* put in a group of its own and all subsquent non-holeMap are
321321
* grouped together; element is considered to be a placeholder if it's
322322
* in the domain of the fill function;
323323
*

‎src/compiler/scala/tools/nsc/PhaseAssembly.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ trait PhaseAssembly {
127127
}
128128

129129
/* Find all edges in the given graph that are hard links. For each hard link we
130-
* need to check that its the only dependency. If not, then we will promote the
130+
* need to check that it's the only dependency. If not, then we will promote the
131131
* other dependencies down
132132
*/
133133
def validateAndEnforceHardlinks() {

‎src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ self =>
12591259
atPos(start) { Apply(t3, exprsBuf.toList) }
12601260
}
12611261
if (inPattern) stringCheese
1262-
else withPlaceholders(stringCheese, isAny = true) // strinterpolator params are Any* by definition
1262+
else withPlaceholders(stringCheese, isAny = true) // string interpolator params are Any* by definition
12631263
}
12641264

12651265
/* ------------- NEW LINES ------------------------------------------------- */

‎src/compiler/scala/tools/nsc/backend/icode/ICodeCheckers.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ abstract class ICodeCheckers {
109109

110110
/** Only called when m1 < m2, so already known that (m1 ne m2).
111111
*/
112-
private def isConfict(m1: IMember, m2: IMember, canOverload: Boolean) = (
112+
private def isConflict(m1: IMember, m2: IMember, canOverload: Boolean) = (
113113
(m1.symbol.name == m2.symbol.name) &&
114114
(!canOverload || (m1.symbol.tpe =:= m2.symbol.tpe))
115115
)
@@ -119,11 +119,11 @@ abstract class ICodeCheckers {
119119
clasz = cls
120120

121121
for (f1 <- cls.fields ; f2 <- cls.fields ; if f1 < f2)
122-
if (isConfict(f1, f2, canOverload = false))
122+
if (isConflict(f1, f2, canOverload = false))
123123
icodeError("Repetitive field name: " + f1.symbol.fullName)
124124

125125
for (m1 <- cls.methods ; m2 <- cls.methods ; if m1 < m2)
126-
if (isConfict(m1, m2, canOverload = true))
126+
if (isConflict(m1, m2, canOverload = true))
127127
icodeError("Repetitive method: " + m1.symbol.fullName)
128128

129129
clasz.methods foreach check
@@ -471,7 +471,7 @@ abstract class ICodeCheckers {
471471
pushStack(local.kind)
472472

473473
case LOAD_FIELD(field, isStatic) =>
474-
// the symbol's owner should contain it's field, but
474+
// the symbol's owner should contain its field, but
475475
// this is already checked by the type checker, no need
476476
// to redo that here
477477
if (isStatic) ()

‎src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ abstract class TypeFlowAnalysis {
572572
573573
- `inlined` : These blocks were spliced into the method's CFG as part of inlining. Being new blocks, they haven't been visited yet by the typeflow analysis.
574574
575-
- `staleIn` : These blocks are what `doInline()` calls `afterBlock`s, ie the new home for instructions that previously appearead
575+
- `staleIn` : These blocks are what `doInline()` calls `afterBlock`s, ie the new home for instructions that previously appeared
576576
after a callsite in a `staleOut` block.
577577
578578
Based on the above information, we have to bring up-to-date the caches that `forwardAnalysis` and `blockTransfer` use to skip blocks and instructions.

‎src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ abstract class BTypes {
315315
case ArrayBType(component) =>
316316
if (other == ObjectReference || other == jlCloneableReference || other == jioSerializableReference) true
317317
else other match {
318-
case ArrayBType(otherComponoent) => component.conformsTo(otherComponoent).orThrow
318+
case ArrayBType(otherComponent) => component.conformsTo(otherComponent).orThrow
319319
case _ => false
320320
}
321321

‎src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ abstract class DeadCodeElimination extends SubComponent {
173173
moveToWorkList()
174174

175175
case LOAD_FIELD(sym, isStatic) if isStatic || !inliner.isClosureClass(sym.owner) =>
176-
// static load may trigger static initization.
176+
// static load may trigger static initialization.
177177
// non-static load can throw NPE (but we know closure fields can't be accessed via a
178178
// null reference.
179179
moveToWorkList()
@@ -191,7 +191,7 @@ abstract class DeadCodeElimination extends SubComponent {
191191
case LOAD_EXCEPTION(_) | DUP(_) | LOAD_MODULE(_) => true
192192
case _ =>
193193
dropOf((bb1, idx1)) = (bb,idx) :: dropOf.getOrElse((bb1, idx1), Nil)
194-
debuglog("DROP is innessential: " + i + " because of: " + bb1(idx1) + " at " + bb1 + ":" + idx1)
194+
debuglog("DROP is inessential: " + i + " because of: " + bb1(idx1) + " at " + bb1 + ":" + idx1)
195195
false
196196
}
197197
}

‎src/compiler/scala/tools/nsc/transform/Constructors.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ abstract class Constructors extends Statics with Transform with ast.TreeDSL {
315315
}
316316

317317
def rewriteDelayedInit() {
318-
/* XXX This is not corect: remainingConstrStats.nonEmpty excludes too much,
318+
/* XXX This is not correct: remainingConstrStats.nonEmpty excludes too much,
319319
* but excluding it includes too much. The constructor sequence being mimicked
320320
* needs to be reproduced with total fidelity.
321321
*

‎src/compiler/scala/tools/nsc/transform/Delambdafy.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre
7777

7878
// the result of the transformFunction method.
7979
sealed abstract class TransformedFunction
80-
// A class definition for the lambda, an expression insantiating the lambda class
80+
// A class definition for the lambda, an expression instantiating the lambda class
8181
case class DelambdafyAnonClass(lambdaClassDef: ClassDef, newExpr: Tree) extends TransformedFunction
8282

8383
// here's the main entry point of the transform
@@ -86,7 +86,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre
8686
case fun @ Function(_, _) =>
8787
transformFunction(fun) match {
8888
case DelambdafyAnonClass(lambdaClassDef, newExpr) =>
89-
// a lambda beccomes a new class, an instantiation expression
89+
// a lambda becomes a new class, an instantiation expression
9090
val pkg = lambdaClassDef.symbol.owner
9191

9292
// we'll add the lambda class to the package later

‎src/compiler/scala/tools/nsc/transform/LazyVals.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ abstract class LazyVals extends Transform with TypingTransformers with ast.TreeD
219219
* l$
220220
* } or
221221
* <rhs> when the lazy value has type Unit (for which there is no field
222-
* to cache it's value.
222+
* to cache its value.
223223
*
224224
* Similarly as for normal lazy val members (see Mixin), the result will be a tree of the form
225225
* { if ((bitmap&n & MASK) == 0) this.l$compute()

0 commit comments

Comments
 (0)