diff --git a/docs/LibraryEvolution.rst b/docs/LibraryEvolution.rst index 1bb7bc71a95e1..9e03b655ebec5 100644 --- a/docs/LibraryEvolution.rst +++ b/docs/LibraryEvolution.rst @@ -207,7 +207,7 @@ Closed Enums By default, a library owner may add new cases to a public enum between releases without breaking binary compatibility. As with structs, this results in a fair amount of indirection when dealing with enum values, in order to potentially -accomodate new values. +accommodate new values. .. note:: diff --git a/docs/proposals/rejected/Constructors.rst b/docs/proposals/rejected/Constructors.rst index 015676f073be3..69fcb9660217f 100644 --- a/docs/proposals/rejected/Constructors.rst +++ b/docs/proposals/rejected/Constructors.rst @@ -480,7 +480,7 @@ the leading ``init`` keyword, including (e.g.) methods starting with tagged as being in the ``init`` family in Objective-C (via the ``objc_method_family`` attribute in Clang). We consider these cases to be rare enough that we don't want to pessimize the conventional -``init`` methods to accomodate them. +``init`` methods to accommodate them. Designated Initializers ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/include/swift/AST/TypeRefinementContext.h b/include/swift/AST/TypeRefinementContext.h index 292700dfa3224..14186ca77dd07 100644 --- a/include/swift/AST/TypeRefinementContext.h +++ b/include/swift/AST/TypeRefinementContext.h @@ -239,7 +239,7 @@ class TypeRefinementContext { Children.push_back(Child); } - /// Returns the inner-most TypeRefinementContext descendent of this context + /// Returns the inner-most TypeRefinementContext descendant of this context /// for the given source location. TypeRefinementContext *findMostRefinedSubContext(SourceLoc Loc, SourceManager &SM); diff --git a/include/swift/IDE/SyntaxModel.h b/include/swift/IDE/SyntaxModel.h index abb2f806b8659..ccdcd6f67b487 100644 --- a/include/swift/IDE/SyntaxModel.h +++ b/include/swift/IDE/SyntaxModel.h @@ -44,11 +44,11 @@ enum class SyntaxNodeKind : uint8_t { CommentMarker, CommentURL, TypeId, - /// #if/#else/#endif occurence. + /// #if/#else/#endif occurrence. BuildConfigKeyword, /// An identifier in a #if condition. BuildConfigId, - /// Any occurence of '@' anywhere. + /// Any occurrence of '@' anywhere. AttributeId, /// A "resolved/active" attribute. Mis-applied attributes will be AttributeId. AttributeBuiltin, diff --git a/include/swift/SILAnalysis/LoopRegionAnalysis.h b/include/swift/SILAnalysis/LoopRegionAnalysis.h index 05a8a279ff61b..12207027fc995 100644 --- a/include/swift/SILAnalysis/LoopRegionAnalysis.h +++ b/include/swift/SILAnalysis/LoopRegionAnalysis.h @@ -887,9 +887,9 @@ class LoopRegionFunctionInfo { LoopTy *L, PostOrderFunctionInfo *PI); - /// Recursively visit all the descendents of Parent. If there is a non-local + /// Recursively visit all the descendants of Parent. If there is a non-local /// successor edge path that points to a dead edge in Parent, mark the - /// descendent non-local successor edge as dead. + /// descendant non-local successor edge as dead. void propagateLivenessDownNonLocalSuccessorEdges(LoopRegion *Parent); }; diff --git a/lib/SIL/Projection.cpp b/lib/SIL/Projection.cpp index 3b1c8754f0b21..2e4bc63adb699 100644 --- a/lib/SIL/Projection.cpp +++ b/lib/SIL/Projection.cpp @@ -943,7 +943,7 @@ ProjectionTree::computeUsesAndLiveness(SILValue Base) { // If this node is live due to a non projection user, propagate down its // liveness to its children and its children with an empty value to the - // worklist so we propagate liveness down to any further descendents. + // worklist so we propagate liveness down to any further descendants. if (Node->IsLive) { DEBUG(llvm::dbgs() << "Node Is Live. Marking Children Live!\n"); for (unsigned ChildIdx : Node->ChildProjections) { diff --git a/lib/SILAnalysis/LoopRegionAnalysis.cpp b/lib/SILAnalysis/LoopRegionAnalysis.cpp index eb6e37147008d..f0dbf36feec00 100644 --- a/lib/SILAnalysis/LoopRegionAnalysis.cpp +++ b/lib/SILAnalysis/LoopRegionAnalysis.cpp @@ -650,9 +650,9 @@ initializeFunctionRegion(iterator_range SubLoops) { initializeLoopFunctionRegion(getRegion(F), SubLoops); } -/// Recursively visit all the descendents of Parent. If there is a non-local +/// Recursively visit all the descendants of Parent. If there is a non-local /// successor edge path that points to a dead edge in Parent, mark the -/// descendent non-local successor edge as dead. +/// descendant non-local successor edge as dead. void LoopRegionFunctionInfo:: propagateLivenessDownNonLocalSuccessorEdges(LoopRegion *Parent) { llvm::SmallVector Worklist; diff --git a/lib/SILPasses/Scalar/SILSROA.cpp b/lib/SILPasses/Scalar/SILSROA.cpp index 04b36a074ef44..429d39aa96675 100644 --- a/lib/SILPasses/Scalar/SILSROA.cpp +++ b/lib/SILPasses/Scalar/SILSROA.cpp @@ -167,7 +167,7 @@ bool SROAMemoryUseAnalyzer::analyze() { } // If the use is a struct_element_addr, add it to the worklist so we check - // if it or one of its descendents escape. + // if it or one of its descendants escape. if (auto *ASI = dyn_cast(User)) { DEBUG(llvm::dbgs() << " Found a struct subprojection!\n"); ExtractInsts.push_back(ASI); @@ -175,7 +175,7 @@ bool SROAMemoryUseAnalyzer::analyze() { } // If the use is a tuple_element_addr, add it to the worklist so we check - // if it or one of its descendents escape. + // if it or one of its descendants escape. if (auto *TSI = dyn_cast(User)) { DEBUG(llvm::dbgs() << " Found a tuple subprojection!\n"); ExtractInsts.push_back(TSI); diff --git a/test/1_stdlib/NSStringAPI.swift b/test/1_stdlib/NSStringAPI.swift index 3867c0de3c823..a266d1fc62d15 100644 --- a/test/1_stdlib/NSStringAPI.swift +++ b/test/1_stdlib/NSStringAPI.swift @@ -679,7 +679,7 @@ NSStringAPIs.test("getBytes(_:maxLength:usedLength:encoding:options:range:remain NSStringAPIs.test("getCString(_:maxLength:encoding:)") { var s = "abc あかさた" if true { - // The largest buffer that can not accomodate the string plus null terminator. + // The largest buffer that can not accommodate the string plus null terminator. let bufferLength = 16 var buffer = Array( count: bufferLength, repeatedValue: CChar(bitPattern: 0xff)) diff --git a/test/SourceKit/SourceDocInfo/cursor_callargs.swift b/test/SourceKit/SourceDocInfo/cursor_callargs.swift index 8e74a1ca3a7f8..5ff35fbeb4662 100644 --- a/test/SourceKit/SourceDocInfo/cursor_callargs.swift +++ b/test/SourceKit/SourceDocInfo/cursor_callargs.swift @@ -17,7 +17,7 @@ c1.meth(0, passFloat: 0) // RUN: %sourcekitd-test -req=cursor -pos=7:14 %s -- %s | FileCheck -check-prefix=CHECK-METH %s // CHECK-METH: source.lang.swift.ref.function.method.instance (4:8-4:38) -// Make sure we don't highlight all "meth" occurences when pointing at "withFloat:". +// Make sure we don't highlight all "meth" occurrences when pointing at "withFloat:". // RUN: %sourcekitd-test -req=related-idents -pos=7:15 %s -- %s | FileCheck -check-prefix=CHECK-IDS %s // CHECK-IDS: START RANGES // CHECK-IDS-NEXT: END RANGES