[interop] NFC, extract out isClangKeyword into ClangSyntaxPrinter

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -17,6 +17,26 @@ using namespace cxx_synthesis;
 
 StringRef cxx_synthesis::getCxxImplNamespaceName() { return "_impl"; }
 
+bool ClangSyntaxPrinter::isClangKeyword(StringRef name) {
+  static const llvm::DenseSet<StringRef> keywords = [] {
+    llvm::DenseSet<StringRef> set;
+    // FIXME: clang::IdentifierInfo /nearly/ has the API we need to do this
+    // in a more principled way, but not quite.
+#define KEYWORD(SPELLING, FLAGS) set.insert(#SPELLING);
+#define CXX_KEYWORD_OPERATOR(SPELLING, TOK) set.insert(#SPELLING);
+#include "clang/Basic/TokenKinds.def"
+    return set;
+  }();
+
+  return keywords.contains(name);
+}
+
+bool ClangSyntaxPrinter::isClangKeyword(Identifier name) {
+  if (name.empty())
+    return false;
+  return ClangSyntaxPrinter::isClangKeyword(name.str());
+}
+
 /// Print a C++ namespace declaration with the give name and body.
 void ClangSyntaxPrinter::printNamespace(
     llvm::function_ref<void(raw_ostream &OS)> namePrinter,

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -53,6 +53,10 @@ class ClangSyntaxPrinter {
       Optional<OptionalTypeKind> kind,
       NullabilityPrintKind printKind = NullabilityPrintKind::After) const;
 
+  /// Returns true if \p name matches a keyword in any Clang language mode.
+  static bool isClangKeyword(StringRef name);
+  static bool isClangKeyword(Identifier name);
+
 protected:
   raw_ostream &os;
 };

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -57,33 +57,6 @@ static bool isAnyObjectOrAny(Type type) {
   return type->isAnyObject() || type->isAny();
 }
 
-/// Returns true if \p name matches a keyword in any Clang language mode.
-static bool isClangKeyword(StringRef name) {
-  static const llvm::DenseSet<StringRef> keywords = []{
-    llvm::DenseSet<StringRef> set;
-    // FIXME: clang::IdentifierInfo /nearly/ has the API we need to do this
-    // in a more principled way, but not quite.
-#define KEYWORD(SPELLING, FLAGS) \
-    set.insert(#SPELLING);
-#define CXX_KEYWORD_OPERATOR(SPELLING, TOK) \
-    set.insert(#SPELLING);
-#include "clang/Basic/TokenKinds.def"
-    return set;
-  }();
-
-  return keywords.contains(name);
-}
-
-static bool isClangKeyword(Identifier name) {
-  if (name.empty())
-    return false;
-  return isClangKeyword(name.str());
-}
-
-bool DeclAndTypePrinter::isStrClangKeyword(StringRef name) {
-  return ::isClangKeyword(name);
-}
-
 // For a given Decl and Type, if the type is not an optional return
 // the type and OTK_None as the optionality. If the type is
 // optional, return the underlying object type, and an optionality

lib/PrintAsClang/DeclAndTypePrinter.h

@@ -92,9 +92,6 @@ class DeclAndTypePrinter {
 
   static std::pair<Type, OptionalTypeKind>
   getObjectTypeAndOptionality(const ValueDecl *D, Type ty);
-
-  /// Returns true if \p name matches a keyword in any Clang language mode.
-  static bool isStrClangKeyword(StringRef name);
 };
 
 } // end namespace swift

lib/PrintAsClang/PrintClangFunction.cpp

@@ -97,7 +97,7 @@ void DeclAndTypeClangFunctionPrinter::printFunctionDeclAsCFunctionDecl(
 
     if (!name.empty()) {
       os << ' ' << name;
-      if (DeclAndTypePrinter::isStrClangKeyword(name))
+      if (ClangSyntaxPrinter::isClangKeyword(name))
         os << '_';
     }
   };