Merge pull request #787 from practicalswift/typos-in-code

Fix typos in code (non-comment typos)

Author: lattner

include/swift/SILOptimizer/Analysis/EscapeAnalysis.h

@@ -192,7 +192,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
     }
 
     /// Finds a successor node in the outgoing defer edges.
-    llvm::SmallVectorImpl<CGNode *>::iterator findDefered(CGNode *Def) {
+    llvm::SmallVectorImpl<CGNode *>::iterator findDeferred(CGNode *Def) {
       return std::find(defersTo.begin(), defersTo.end(), Def);
     }
 
@@ -209,7 +209,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
     }
 
     /// Adds a defer-edge to another node \p To. Not done if \p To is this node.
-    bool addDefered(CGNode *To) {
+    bool addDeferred(CGNode *To) {
       assert(!To->isMerged);
       if (To == this)
         return false;

lib/AST/Pattern.cpp

@@ -25,7 +25,7 @@ using namespace swift;
 llvm::raw_ostream &swift::operator<<(llvm::raw_ostream &OS, PatternKind kind) {
   switch (kind) {
   case PatternKind::Paren:
-    return OS << "parethesized pattern";
+    return OS << "parenthesized pattern";
   case PatternKind::Tuple:
     return OS << "tuple pattern";
   case PatternKind::Named:

lib/IRGen/GenProto.cpp

@@ -2728,7 +2728,7 @@ llvm::Value *MetadataPath::followComponent(IRGenFunction &IGF,
     llvm_unreachable("following an impossible path!");
 
   } 
-  llvm_unreachable("bad metata path component");
+  llvm_unreachable("bad metadata path component");
 }
 
 /// Collect any required metadata for a witness method from the end of

lib/SILOptimizer/ARC/GlobalLoopARCSequenceDataflow.cpp

@@ -171,7 +171,7 @@ void LoopARCSequenceDataflowEvaluator::mergeSuccessors(const LoopRegion *Region,
     }
 
     // Otherwise, we treat it as unknown control flow.
-    DEBUG(llvm::dbgs() << "        Cleaing state b/c of early exit\n");
+    DEBUG(llvm::dbgs() << "        Clearing state b/c of early exit\n");
     State.clear();
     break;
   }

lib/SILOptimizer/Analysis/EscapeAnalysis.cpp

@@ -126,7 +126,7 @@ EscapeAnalysis::CGNode *EscapeAnalysis::ConnectionGraph::getContentNode(
 }
 
 bool EscapeAnalysis::ConnectionGraph::addDeferEdge(CGNode *From, CGNode *To) {
-  if (!From->addDefered(To))
+  if (!From->addDeferred(To))
     return false;
 
   CGNode *FromPointsTo = From->pointsTo;
@@ -167,7 +167,7 @@ void EscapeAnalysis::ConnectionGraph::mergeAllScheduledNodes() {
           PredNode->setPointsTo(To);
       } else {
         assert(PredNode != From);
-        auto Iter = PredNode->findDefered(From);
+        auto Iter = PredNode->findDeferred(From);
         assert(Iter != PredNode->defersTo.end() &&
                "Incoming defer-edge not found in predecessor's defer list");
         PredNode->defersTo.erase(Iter);
@@ -280,10 +280,10 @@ updatePointsTo(CGNode *InitialNode, CGNode *pointsTo) {
     }
 
     // Add all adjacent nodes to the WorkList.
-    for (auto *Defered : Node->defersTo) {
-      if (!Defered->isInWorkList) {
-        WorkList.push_back(Defered);
-        Defered->isInWorkList = true;
+    for (auto *Deferred : Node->defersTo) {
+      if (!Deferred->isInWorkList) {
+        WorkList.push_back(Deferred);
+        Deferred->isInWorkList = true;
       }
     }
     for (Predecessor Pred : Node->Preds) {
@@ -506,10 +506,10 @@ bool EscapeAnalysis::ConnectionGraph::mergeFrom(ConnectionGraph *SourceGraph,
         DestFrom = DestFrom->getMergeTarget();
       }
 
-      for (auto *Defered : SourceReachable->defersTo) {
-        if (!Defered->isInWorkList) {
-          WorkList.push_back(Defered);
-          Defered->isInWorkList = true;
+      for (auto *Deferred : SourceReachable->defersTo) {
+        if (!Deferred->isInWorkList) {
+          WorkList.push_back(Deferred);
+          Deferred->isInWorkList = true;
         }
       }
     }
@@ -572,7 +572,7 @@ struct CGForDotView {
 
   enum EdgeTypes {
     PointsTo,
-    Defered
+    Deferred
   };
 
   struct Node {
@@ -629,7 +629,7 @@ CGForDotView::CGForDotView(const EscapeAnalysis::ConnectionGraph *CG) :
     }
     for (auto *Def : OrigNode->defersTo) {
       Nd.Children.push_back(Orig2Node[Def]);
-      Nd.ChildrenTypes.push_back(Defered);
+      Nd.ChildrenTypes.push_back(Deferred);
     }
   }
 }
@@ -767,7 +767,7 @@ namespace llvm {
       unsigned ChildIdx = I - Node->Children.begin();
       switch (Node->ChildrenTypes[ChildIdx]) {
         case CGForDotView::PointsTo: return "";
-        case CGForDotView::Defered: return "color=\"gray\"";
+        case CGForDotView::Deferred: return "color=\"gray\"";
       }
     }
   };
@@ -930,7 +930,7 @@ void EscapeAnalysis::ConnectionGraph::verifyStructure() const {
     for (Predecessor Pred : Nd->Preds) {
       CGNode *PredNode = Pred.getPointer();
       if (Pred.getInt() == EdgeType::Defer) {
-        assert(PredNode->findDefered(Nd) != PredNode->defersTo.end());
+        assert(PredNode->findDeferred(Nd) != PredNode->defersTo.end());
       } else {
         assert(Pred.getInt() == EdgeType::PointsTo);
         assert(PredNode->getPointsToEdge() == Nd);

lib/Sema/TypeCheckDecl.cpp

@@ -5618,7 +5618,7 @@ bool TypeChecker::isAvailabilitySafeForConformance(
     return true;
 
   NominalTypeDecl *conformingDecl = DC->isNominalTypeOrNominalTypeExtensionContext();
-  assert(conformingDecl && "Must have conformining declaration");
+  assert(conformingDecl && "Must have conforming declaration");
 
   // Make sure that any access of the witness through the protocol
   // can only occur when the witness is available. That is, make sure that

stdlib/public/core/Index.swift

@@ -350,7 +350,7 @@ public protocol _RandomAccessAmbiguity {
 extension _RandomAccessAmbiguity {
   @warn_unused_result
   public func advancedBy(n: Distance) -> Self {
-    fatalError("advancedBy(n) not implememented")
+    fatalError("advancedBy(n) not implemented")
   }
 }
 

tools/SourceKit/docs/Protocol.txt

@@ -173,7 +173,7 @@ response for the cursor-info request will have an entry for the module name:
   key.modulename: "<module-name>"
 
 Also if there is already a generated-interface document for this module
-previously opened, there will be an entry with the "virtual name" assosiated
+previously opened, there will be an entry with the "virtual name" associated
 with this document (from the previous 'editor.open.interface' request):
 
   key.module_interface_name: "<virtual name for interface document>"

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -450,7 +450,7 @@ bool SwiftToSourceKitCompletionAdapter::handleResult(
       llvm::SmallString<64> LogMessage;
       llvm::raw_svector_ostream LogMessageOs(LogMessage);
 
-      LogMessageOs << "Code cpompletion result with empty name and/or "
+      LogMessageOs << "Code completion result with empty name and/or "
                       "description was ignored: \n";
       Result->print(LogMessageOs);