Skip to content

Commit f44f4a5

Browse files
committed
Merge pull request swiftlang#81 from jordanekay/fix-misspellings
Fix misspellings
2 parents 5d21900 + 008a42f commit f44f4a5

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

Diff for: docs/proposals/rejected/Constructors.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ the leading ``init`` keyword, including (e.g.) methods starting with
480480
tagged as being in the ``init`` family in Objective-C (via the
481481
``objc_method_family`` attribute in Clang). We consider these cases to
482482
be rare enough that we don't want to pessimize the conventional
483-
``init`` methods to accomodate them.
483+
``init`` methods to accommodate them.
484484

485485
Designated Initializers
486486
~~~~~~~~~~~~~~~~~~~~~~~

Diff for: include/swift/AST/TypeRefinementContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class TypeRefinementContext {
239239
Children.push_back(Child);
240240
}
241241

242-
/// Returns the inner-most TypeRefinementContext descendent of this context
242+
/// Returns the inner-most TypeRefinementContext descendant of this context
243243
/// for the given source location.
244244
TypeRefinementContext *findMostRefinedSubContext(SourceLoc Loc,
245245
SourceManager &SM);

Diff for: include/swift/IDE/SyntaxModel.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ enum class SyntaxNodeKind : uint8_t {
4444
CommentMarker,
4545
CommentURL,
4646
TypeId,
47-
/// #if/#else/#endif occurence.
47+
/// #if/#else/#endif occurrence.
4848
BuildConfigKeyword,
4949
/// An identifier in a #if condition.
5050
BuildConfigId,
51-
/// Any occurence of '@<attribute-name>' anywhere.
51+
/// Any occurrence of '@<attribute-name>' anywhere.
5252
AttributeId,
5353
/// A "resolved/active" attribute. Mis-applied attributes will be AttributeId.
5454
AttributeBuiltin,

Diff for: include/swift/SILAnalysis/LoopRegionAnalysis.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -887,9 +887,9 @@ class LoopRegionFunctionInfo {
887887
LoopTy *L,
888888
PostOrderFunctionInfo *PI);
889889

890-
/// Recursively visit all the descendents of Parent. If there is a non-local
890+
/// Recursively visit all the descendants of Parent. If there is a non-local
891891
/// successor edge path that points to a dead edge in Parent, mark the
892-
/// descendent non-local successor edge as dead.
892+
/// descendant non-local successor edge as dead.
893893
void propagateLivenessDownNonLocalSuccessorEdges(LoopRegion *Parent);
894894
};
895895

Diff for: lib/SIL/Projection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ ProjectionTree::computeUsesAndLiveness(SILValue Base) {
943943

944944
// If this node is live due to a non projection user, propagate down its
945945
// liveness to its children and its children with an empty value to the
946-
// worklist so we propagate liveness down to any further descendents.
946+
// worklist so we propagate liveness down to any further descendants.
947947
if (Node->IsLive) {
948948
DEBUG(llvm::dbgs() << "Node Is Live. Marking Children Live!\n");
949949
for (unsigned ChildIdx : Node->ChildProjections) {

Diff for: lib/SILAnalysis/LoopRegionAnalysis.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,9 @@ initializeFunctionRegion(iterator_range<LoopInfoTy::iterator> SubLoops) {
650650
initializeLoopFunctionRegion(getRegion(F), SubLoops);
651651
}
652652

653-
/// Recursively visit all the descendents of Parent. If there is a non-local
653+
/// Recursively visit all the descendants of Parent. If there is a non-local
654654
/// successor edge path that points to a dead edge in Parent, mark the
655-
/// descendent non-local successor edge as dead.
655+
/// descendant non-local successor edge as dead.
656656
void LoopRegionFunctionInfo::
657657
propagateLivenessDownNonLocalSuccessorEdges(LoopRegion *Parent) {
658658
llvm::SmallVector<LoopRegion *, 4> Worklist;

Diff for: lib/SILPasses/Scalar/SILSROA.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ bool SROAMemoryUseAnalyzer::analyze() {
167167
}
168168

169169
// If the use is a struct_element_addr, add it to the worklist so we check
170-
// if it or one of its descendents escape.
170+
// if it or one of its descendants escape.
171171
if (auto *ASI = dyn_cast<StructElementAddrInst>(User)) {
172172
DEBUG(llvm::dbgs() << " Found a struct subprojection!\n");
173173
ExtractInsts.push_back(ASI);
174174
continue;
175175
}
176176

177177
// If the use is a tuple_element_addr, add it to the worklist so we check
178-
// if it or one of its descendents escape.
178+
// if it or one of its descendants escape.
179179
if (auto *TSI = dyn_cast<TupleElementAddrInst>(User)) {
180180
DEBUG(llvm::dbgs() << " Found a tuple subprojection!\n");
181181
ExtractInsts.push_back(TSI);

Diff for: test/1_stdlib/NSStringAPI.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ NSStringAPIs.test("getBytes(_:maxLength:usedLength:encoding:options:range:remain
679679
NSStringAPIs.test("getCString(_:maxLength:encoding:)") {
680680
var s = "abc あかさた"
681681
if true {
682-
// The largest buffer that can not accomodate the string plus null terminator.
682+
// The largest buffer that can not accommodate the string plus null terminator.
683683
let bufferLength = 16
684684
var buffer = Array(
685685
count: bufferLength, repeatedValue: CChar(bitPattern: 0xff))

Diff for: test/SourceKit/SourceDocInfo/cursor_callargs.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ c1.meth(0, passFloat: 0)
1717
// RUN: %sourcekitd-test -req=cursor -pos=7:14 %s -- %s | FileCheck -check-prefix=CHECK-METH %s
1818
// CHECK-METH: source.lang.swift.ref.function.method.instance (4:8-4:38)
1919

20-
// Make sure we don't highlight all "meth" occurences when pointing at "withFloat:".
20+
// Make sure we don't highlight all "meth" occurrences when pointing at "withFloat:".
2121
// RUN: %sourcekitd-test -req=related-idents -pos=7:15 %s -- %s | FileCheck -check-prefix=CHECK-IDS %s
2222
// CHECK-IDS: START RANGES
2323
// CHECK-IDS-NEXT: END RANGES

0 commit comments

Comments
 (0)