[NFC] Centralize ObjCSelector helper

Author: beccadax

include/swift/AST/Identifier.h

@@ -820,6 +820,13 @@ class ObjCSelector {
   /// Construct an invalid ObjCSelector.
   ObjCSelector() : Storage() {}
 
+  /// Split \p string into selector pieces on colons to create an ObjCSelector.
+  ///
+  /// This should not be used to parse selectors written directly in Swift
+  /// source source code (e.g. the argument of an @objc attribute). Use the
+  /// parser for that.
+  static llvm::Optional<ObjCSelector> parse(ASTContext &ctx, StringRef string);
+
   /// Convert to true if the decl name is valid.
   explicit operator bool() const { return (bool)Storage; }
 

lib/AST/AccessNotes.cpp

@@ -24,42 +24,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/YAMLTraits.h"
 
-// FIXME: Copied from MiscDiagnostics--don't do that.
-static llvm::Optional<swift::ObjCSelector>
-parseObjCSelector(swift::ASTContext &ctx, llvm::StringRef string) {
-  using namespace swift;
-
-  // Find the first colon.
-  auto colonPos = string.find(':');
-
-  // If there is no colon, we have a nullary selector.
-  if (colonPos == StringRef::npos) {
-    if (string.empty() || !Lexer::isIdentifier(string)) return None;
-    return ObjCSelector(ctx, 0, { ctx.getIdentifier(string) });
-  }
-
-  SmallVector<Identifier, 2> pieces;
-  do {
-    // Check whether we have a valid selector piece.
-    auto piece = string.substr(0, colonPos);
-    if (piece.empty()) {
-      pieces.push_back(Identifier());
-    } else {
-      if (!Lexer::isIdentifier(piece)) return None;
-      pieces.push_back(ctx.getIdentifier(piece));
-    }
-
-    // Move to the next piece.
-    string = string.substr(colonPos+1);
-    colonPos = string.find(':');
-  } while (colonPos != StringRef::npos);
-
-  // If anything remains of the string, it's not a selector.
-  if (!string.empty()) return None;
-
-  return ObjCSelector(ctx, pieces.size(), pieces);
-}
-
 namespace swift {
 
 AccessNoteDeclName::AccessNoteDeclName()
@@ -237,7 +201,7 @@ AccessNotes::load(ASTContext &ctx, llvm::MemoryBuffer *buffer) {
   AccessNotes notes;
   yamlIn >> notes;
 
-  if (yamlIn.error())
+  if (errors)
     return llvm::Expected<AccessNotes>(std::move(errors));
 
   return notes;
@@ -275,7 +239,7 @@ StringRef ScalarTraits<ObjCSelector>::input(StringRef str, void *ctxPtr,
                                             ObjCSelector &selector) {
   ASTContext &ctx = *static_cast<ASTContext *>(ctxPtr);
 
-  if (auto sel = parseObjCSelector(ctx, str)) {
+  if (auto sel = ObjCSelector::parse(ctx, str)) {
     selector = *sel;
     return "";
   }

lib/AST/Identifier.cpp

@@ -14,7 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/AST/ASTContext.h"
 #include "swift/AST/Identifier.h"
+#include "swift/Parse/Lexer.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/ConvertUTF.h"
@@ -228,6 +230,39 @@ ObjCSelector::ObjCSelector(ASTContext &ctx, unsigned numArgs,
   Storage = DeclName(ctx, Identifier(), pieces);
 }
 
+llvm::Optional<ObjCSelector>
+ObjCSelector::parse(ASTContext &ctx, StringRef string) {
+  // Find the first colon.
+  auto colonPos = string.find(':');
+
+  // If there is no colon, we have a nullary selector.
+  if (colonPos == StringRef::npos) {
+    if (string.empty() || !Lexer::isIdentifier(string)) return None;
+    return ObjCSelector(ctx, 0, { ctx.getIdentifier(string) });
+  }
+
+  SmallVector<Identifier, 2> pieces;
+  do {
+    // Check whether we have a valid selector piece.
+    auto piece = string.substr(0, colonPos);
+    if (piece.empty()) {
+      pieces.push_back(Identifier());
+    } else {
+      if (!Lexer::isIdentifier(piece)) return None;
+      pieces.push_back(ctx.getIdentifier(piece));
+    }
+
+    // Move to the next piece.
+    string = string.substr(colonPos+1);
+    colonPos = string.find(':');
+  } while (colonPos != StringRef::npos);
+
+  // If anything remains of the string, it's not a selector.
+  if (!string.empty()) return None;
+
+  return ObjCSelector(ctx, pieces.size(), pieces);
+}
+
 ObjCSelectorFamily ObjCSelector::getSelectorFamily() const {
   StringRef text = getSelectorPieces().front().get();
   while (!text.empty() && text[0] == '_') text = text.substr(1);

lib/Sema/MiscDiagnostics.cpp

@@ -3427,39 +3427,6 @@ static void checkStmtConditionTrailingClosure(ASTContext &ctx, const Stmt *S) {
   }
 }
 
-static Optional<ObjCSelector>
-parseObjCSelector(ASTContext &ctx, StringRef string) {
-  // Find the first colon.
-  auto colonPos = string.find(':');
-
-  // If there is no colon, we have a nullary selector.
-  if (colonPos == StringRef::npos) {
-    if (string.empty() || !Lexer::isIdentifier(string)) return None;
-    return ObjCSelector(ctx, 0, { ctx.getIdentifier(string) });
-  }
-
-  SmallVector<Identifier, 2> pieces;
-  do {
-    // Check whether we have a valid selector piece.
-    auto piece = string.substr(0, colonPos);
-    if (piece.empty()) {
-      pieces.push_back(Identifier());
-    } else {
-      if (!Lexer::isIdentifier(piece)) return None;
-      pieces.push_back(ctx.getIdentifier(piece));
-    }
-
-    // Move to the next piece.
-    string = string.substr(colonPos+1);
-    colonPos = string.find(':');
-  } while (colonPos != StringRef::npos);
-
-  // If anything remains of the string, it's not a selector.
-  if (!string.empty()) return None;
-
-  return ObjCSelector(ctx, pieces.size(), pieces);
-}
-
 
 namespace {
 
@@ -3627,7 +3594,7 @@ class ObjCSelectorWalker : public ASTWalker {
 
     // Try to parse the string literal as an Objective-C selector, and complain
     // if it isn't one.
-    auto selector = parseObjCSelector(Ctx, stringLiteral->getValue());
+    auto selector = ObjCSelector::parse(Ctx, stringLiteral->getValue());
     if (!selector) {
       auto diag = Ctx.Diags.diagnose(stringLiteral->getLoc(),
                                      diag::selector_literal_invalid);