Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit aed140b

Browse files
committed
Merge pull request scala#4642 from janekdb/2.11.x-typos-w-z
Fix 6 typos (w-z)
2 parents 8f2509e + f48393e commit aed140b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
443443
* which rethrows the caught exception once it's done with the cleanup code.
444444
*
445445
* A particular cleanup may in general contain LabelDefs. Care is needed when duplicating such jump-targets,
446-
* so as to preserve agreement wit the (also duplicated) jump-sources.
446+
* so as to preserve agreement with the (also duplicated) jump-sources.
447447
* This is achieved based on the bookkeeping provided by two maps:
448448
* - `labelDefsAtOrUnder` lists all LabelDefs enclosed by a given Tree node (the key)
449449
* - `labelDef` provides the LabelDef node whose symbol is used as key.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3031,7 +3031,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { self =>
30313031
*
30323032
* Rationale for this normalization:
30333033
* test/files/run/private-inline.scala after -optimize is chock full of
3034-
* BasicBlocks containing just JUMP(whereTo), where no exception handler straddles them.
3034+
* BasicBlocks containing just JUMP(whereto), where no exception handler straddles them.
30353035
* They should be collapsed by IMethod.normalize() but aren't.
30363036
* That was fine in FJBG times when by the time the exception table was emitted,
30373037
* it already contained "anchored" labels (ie instruction offsets were known)

src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ abstract class InlineExceptionHandlers extends SubComponent {
343343
/**
344344
* This function takes care of duplicating the basic block code for inlining the handler
345345
*
346-
* Note: This function does not duplicate the same basic block twice. It wil contain a map of the duplicated
346+
* Note: This function does not duplicate the same basic block twice. It will contain a map of the duplicated
347347
* basic blocks
348348
*/
349349
private def duplicateExceptionHandlerCache(handler: BasicBlock) =

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,13 @@ trait Contexts { self: Analyzer =>
168168
* fine grained control is needed based on the kind of error; ambiguity errors are often
169169
* suppressed during exploratory typing, such as determining whether `a == b` in an argument
170170
* position is an assignment or a named argument, when `Inferencer#isApplicableSafe` type checks
171-
* applications with and without an expected type, or whtn `Typer#tryTypedApply` tries to fit arguments to
171+
* applications with and without an expected type, or when `Typer#tryTypedApply` tries to fit arguments to
172172
* a function type with/without implicit views.
173173
*
174-
* When the error policies entails error/warning buffering, the mutable [[ReportBuffer]] records
174+
* When the error policies entail error/warning buffering, the mutable [[ReportBuffer]] records
175175
* everything that is issued. It is important to note, that child Contexts created with `make`
176176
* "inherit" the very same `ReportBuffer` instance, whereas children spawned through `makeSilent`
177-
* receive an separate, fresh buffer.
177+
* receive a separate, fresh buffer.
178178
*
179179
* @param tree Tree associated with this context
180180
* @param owner The current owner

0 commit comments

Comments
 (0)