Merge pull request #2534 from practicalswift/typo-fixes-20160514

Author: swift-ci

include/swift/Reflection/ReflectionContext.h

@@ -149,7 +149,7 @@ class ReflectionContext
       return nullptr;
 
     case MetadataKind::ErrorObject:
-      // ErrorProtocol boxed existential on non-Objective C runtime target
+      // ErrorProtocol boxed existential on non-Objective-C runtime target
       return nullptr;
 
     default:

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This pass looks for similar functions that are mergable and folds them.
+// This pass looks for similar functions that are mergeable and folds them.
 // The implementation is similar to LLVM's MergeFunctions pass. Instead of
 // merging identical functions, it merges functions which only differ by a few
 // constants in certain instructions.
@@ -243,7 +243,7 @@ class FunctionComparator {
   int cmpConstants(const Constant *L, const Constant *R);
 
   /// Compares two global values by number. Uses the GlobalNumbersState to
-  /// identify the same gobals across function calls.
+  /// identify the same globals across function calls.
   int cmpGlobalValues(GlobalValue *L, GlobalValue *R);
 
   /// Assign or look up previously assigned numbers for the two values, and
@@ -482,7 +482,7 @@ int FunctionComparator::cmpRangeMetadata(const MDNode* L,
   // TODO: Note that as this is metadata, it is possible to drop and/or merge
   // this data when considering functions to merge. Thus this comparison would
   // return 0 (i.e. equivalent), but merging would become more complicated
-  // because the ranges would need to be unioned. It is not likely that
+  // because the ranges would need to be combined. It is not likely that
   // functions differ ONLY in this metadata if they are actually the same
   // function semantically.
   if (int Res = cmpNumbers(L->getNumOperands(), R->getNumOperands()))
@@ -607,8 +607,8 @@ int FunctionComparator::cmpConstants(const Constant *L, const Constant *R) {
     const auto *SeqR = cast<ConstantDataSequential>(R);
     // This handles ConstantDataArray and ConstantDataVector. Note that we
     // compare the two raw data arrays, which might differ depending on the host
-    // endianness. This isn't a problem though, because the endiness of a module
-    // will affect the order of the constants, but this order is the same
+    // endianness. This isn't a problem though, because the endianness of a
+    // module will affect the order of the constants, but this order is the same
     // for a given input module and host platform.
     return cmpMem(SeqL->getRawDataValues(), SeqR->getRawDataValues());
   }
@@ -1383,7 +1383,7 @@ class SwiftMergeFunctions : public ModulePass {
     /// first entry.
     int numUnhandledCallees;
 
-    /// The iterator of the functions's equivalence class in the FnTree.
+    /// The iterator of the function's equivalence class in the FnTree.
     /// It's FnTree.end() if the function is not in an equivalence class.
     FnTreeType::iterator TreeIter;
 
@@ -1796,7 +1796,7 @@ bool SwiftMergeFunctions::tryMergeEquivalenceClass(FunctionEntry *FirstInClass)
   // Merged or not: in any case we remove the equivalence class from the FnTree.
   removeEquivalenceClassFromTree(FirstInClass);
 
-  // Containes functions which differ too much from the first function (i.e.
+  // Contains functions which differ too much from the first function (i.e.
   // would need too many parameters).
   FunctionInfos Removed;
 

stdlib/public/core/CompilerProtocols.swift

@@ -287,7 +287,7 @@ public protocol BooleanLiteralConvertible {
   /// A type that can represent a Boolean literal, such as `Bool`.
   associatedtype BooleanLiteralType : _BuiltinBooleanLiteralConvertible
 
-  /// Creates an instance initialized to to the given Boolean value.
+  /// Creates an instance initialized to the given Boolean value.
   ///
   /// Do not call this initializer directly. Instead, initialize a variable or
   /// constant using one of the Boolean literals `true` and `false`. For

stdlib/public/core/FloatingPoint.swift.gyb

@@ -66,7 +66,7 @@ public protocol FloatingPoint: Comparable, IntegerLiteralConvertible,
   /// This initializer implements the IEEE 754 `scaleB` operation.
   init(sign: FloatingPointSign, exponent: Exponent, significand: Self)
 
-  /// A floating point value whose exponent and signficand are taken from
+  /// A floating point value whose exponent and significand are taken from
   /// `magnitude` and whose sign is taken from `signOf`.  Implements the
   /// IEEE 754 `copysign` operation.
   init(signOf: Self, magnitudeOf: Self)
@@ -77,7 +77,7 @@ public protocol FloatingPoint: Comparable, IntegerLiteralConvertible,
 
 % end
   /*  TODO: Implement the following APIs once a revised integer protocol is
-      introduced that allows for them to be implemeneted.  In particular, we
+      introduced that allows for them to be implemented.  In particular, we
       need to have an "index of most significant bit" operation and "get
       absolute value as unsigned type" operation on the Integer protocol.
 
@@ -158,7 +158,7 @@ public protocol FloatingPoint: Comparable, IntegerLiteralConvertible,
   /// This quantity, or a related quantity is sometimes called "epsilon" or
   /// "machine epsilon".  We avoid that name because it has different meanings
   /// in different languages, which can lead to confusion, and because it
-  /// suggests that it is an good tolerance to use for comparisons,
+  /// suggests that it is a good tolerance to use for comparisons,
   /// which is almost never is.
   ///
   /// (See https://en.wikipedia.org/wiki/Machine_epsilon for more detail)
@@ -424,7 +424,7 @@ public protocol FloatingPoint: Comparable, IntegerLiteralConvertible,
   @warn_unused_result
   func isLessThanOrEqualTo(_ other: Self) -> Bool
 
-  /// True if and only if `self` preceeds `other` in the IEEE 754 total order
+  /// True if and only if `self` precedes `other` in the IEEE 754 total order
   /// relation.
   ///
   /// This relation is a refinement of `<=` that provides a total order on all

stdlib/public/core/Optional.swift

@@ -181,7 +181,7 @@ public enum Optional<Wrapped> : NilLiteralConvertible {
   ///     print(nonOverflowingSquare)
   ///     // Prints "Optional(1746)"
   ///
-  /// - Parameter f: A closure that takes the unwrapped value of the intance.
+  /// - Parameter f: A closure that takes the unwrapped value of the instance.
   /// - Returns: The result of the given closure. If this instance is `nil`,
   ///   returns `nil`.
   @warn_unused_result
@@ -505,7 +505,7 @@ public func ?? <T> (optional: T?, defaultValue: @autoclosure () throws -> T)
 /// value, you can chain default values by using `??` multiple times. The
 /// first optional value that isn't `nil` stops the chain and becomes the
 /// result of the whole expression. The next example tries to find the correct
-/// text for a greeting in two sepearate dictionaries before falling back to a
+/// text for a greeting in two separate dictionaries before falling back to a
 /// static default.
 ///
 ///     let greeting = userPrefs[greetingKey] ??

stdlib/public/core/Policy.swift

@@ -21,7 +21,7 @@
 /// When declaring a function or method, you don't need to specify a return
 /// type if no value will be returned. However, the type of a function,
 /// method, or closure always includes a return type, which is `Void` if
-/// otherwise unspeficied.
+/// otherwise unspecified.
 ///
 /// Use `Void` or an empty tuple as the return type when declaring a
 /// closure, function, or method that doesn't return a value.
@@ -115,7 +115,7 @@ public typealias _MaxBuiltinFloatType = Builtin.FPIEEE64
 /// `as!`). 
 /// 
 /// For example, use `as?` to conditionally downcast the first object
-/// in an heterogenous array to a `String`.
+/// in a heterogeneous array to a `String`.
 ///
 ///     let mixed: [Any] = ["one", "two", 3, true, {(x: Int) -> Int in x * 2 }]
 ///

test/SILGen/specialize_attr.swift

@@ -37,7 +37,7 @@ public class CC<T : PP> {
 // CHECK-LABEL: sil [noinline] [_specialize <RR, Float, SS, Int>] @_TFC15specialize_attr2CC3foouRd__S_2QQrfTqd__1gGVS_2GGx__Tqd__GS2_x__ : $@convention(method) <T where T : PP><U where U : QQ> (@in U, GG<T>, @guaranteed CC<T>) -> (@out U, GG<T>) {
 
 // -----------------------------------------------------------------------------
-// Test user-specialized subscript accesors.
+// Test user-specialized subscript accessors.
 
 public protocol TestSubscriptable {
   associatedtype Element

test/SILOptimizer/optimize_never.sil

@@ -431,7 +431,7 @@ bb0(%0 : $Derived2):
 }
 
 // Check that class_method is not speculatively devirtualized, because the
-// method foo in the class Base, which mentioned in the the class_method
+// method foo in the class Base, which mentioned in the class_method
 // instruction is marked with @_semantics("optimize.sil.never").
 //
 // CHECK-LABEL: sil @_TF14optimize_never19testDoNotDevirtBaseFT1oCS_4Base_Vs5Int32

test/SILOptimizer/sink.sil

@@ -219,12 +219,12 @@ public protocol P : class {
 
 // Check that open_existential is not moved after its uses and still
 // dominates them after a run of a code sinking pass.
-// CHECK-LABEL: sil @dont_sink_open_existenial
+// CHECK-LABEL: sil @dont_sink_open_existential
 // CHECK-NOT: metatype
 // CHECK-NOT: witness_method
 // CHECK: open_existential_ref
 // CHECK: metatype
-sil @dont_sink_open_existenial : $@convention(thin) (@owned P) -> () {
+sil @dont_sink_open_existential : $@convention(thin) (@owned P) -> () {
 bb0(%0 : $P):
   %1 = open_existential_ref %0 : $P to $@opened("C4960DBA-02C5-11E6-BE1B-B8E856428C60") P
   %2 = metatype $@thick (@opened("C4960DBA-02C5-11E6-BE1B-B8E856428C60") P).Type

test/expr/unary/selector/property.swift

@@ -113,7 +113,7 @@ func testNonObjCMembers(nonObjCInstance: NonObjCClass) {
   let _ = #selector(getter: myObjcInstance.undefinedProperty) // expected-error{{value of type 'ObjCClass' has no member 'undefinedProperty'}}
 }
 
-// Ambigous expressions
+// Ambiguous expressions
 func testAmbiguous(myObjcInstance: ObjCClass) { // expected-note{{'myObjcInstance' declared here}}
 
   // Referring to a properties not within a type.
@@ -212,7 +212,7 @@ class InstanceStaticTestClass {
   }
 }
 
-// Acccessibility
+// Accessibility
 let otherObjCInstance = OtherObjCClass()
 
 let v11 = #selector(getter: OtherObjCClass.privateVar) // expected-error{{'privateVar' is inaccessible due to 'private' protection level}}