[interop] NFC, refactor printNullability to ClangSyntaxPrinter

This way it can be reused from ClangFunctionPrinter

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -35,3 +35,44 @@ void ClangSyntaxPrinter::printNamespace(
     llvm::function_ref<void(raw_ostream &OS)> bodyPrinter) const {
   printNamespace([&](raw_ostream &os) { os << name; }, bodyPrinter);
 }
+
+void ClangSyntaxPrinter::printNullability(
+    Optional<OptionalTypeKind> kind, NullabilityPrintKind printKind) const {
+  if (!kind)
+    return;
+
+  switch (printKind) {
+  case NullabilityPrintKind::ContextSensitive:
+    switch (*kind) {
+    case OTK_None:
+      os << "nonnull";
+      break;
+    case OTK_Optional:
+      os << "nullable";
+      break;
+    case OTK_ImplicitlyUnwrappedOptional:
+      os << "null_unspecified";
+      break;
+    }
+    break;
+  case NullabilityPrintKind::After:
+    os << ' ';
+    LLVM_FALLTHROUGH;
+  case NullabilityPrintKind::Before:
+    switch (*kind) {
+    case OTK_None:
+      os << "_Nonnull";
+      break;
+    case OTK_Optional:
+      os << "_Nullable";
+      break;
+    case OTK_ImplicitlyUnwrappedOptional:
+      os << "_Null_unspecified";
+      break;
+    }
+    break;
+  }
+
+  if (printKind != NullabilityPrintKind::After)
+    os << ' ';
+}

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -14,6 +14,7 @@
 #define SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 
 #include "swift/Basic/LLVM.h"
+#include "swift/ClangImporter/ClangImporter.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -41,7 +42,18 @@ class ClangSyntaxPrinter {
   printNamespace(StringRef name,
                  llvm::function_ref<void(raw_ostream &OS)> bodyPrinter) const;
 
-private:
+  /// Where nullability information should be printed.
+  enum class NullabilityPrintKind {
+    Before,
+    After,
+    ContextSensitive,
+  };
+
+  void printNullability(
+      Optional<OptionalTypeKind> kind,
+      NullabilityPrintKind printKind = NullabilityPrintKind::After) const;
+
+protected:
   raw_ostream &os;
 };
 

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -122,17 +122,14 @@ static bool looksLikeInitMethod(ObjCSelector selector) {
 }
 
 class DeclAndTypePrinter::Implementation
-  : private DeclVisitor<DeclAndTypePrinter::Implementation>,
-    private TypeVisitor<DeclAndTypePrinter::Implementation, void,
-                        Optional<OptionalTypeKind>>
-{
+    : private DeclVisitor<DeclAndTypePrinter::Implementation>,
+      private TypeVisitor<DeclAndTypePrinter::Implementation, void,
+                          Optional<OptionalTypeKind>>,
+      private ClangSyntaxPrinter {
   using PrinterImpl = Implementation;
   friend ASTVisitor;
   friend TypeVisitor;
 
-  // The output stream is accessible through 'owningPrinter',
-  // but it makes the code simpler to have it here too.
-  raw_ostream &os;
   DeclAndTypePrinter &owningPrinter;
   OutputLanguageMode outputLang;
 
@@ -150,7 +147,7 @@ class DeclAndTypePrinter::Implementation
 public:
   explicit Implementation(raw_ostream &out, DeclAndTypePrinter &owner,
                           OutputLanguageMode outputLang)
-      : os(out), owningPrinter(owner), outputLang(outputLang) {}
+      : ClangSyntaxPrinter(out), owningPrinter(owner), outputLang(outputLang) {}
 
   void print(const Decl *D) {
     PrettyStackTraceDecl trace("printing", D);
@@ -1389,55 +1386,6 @@ class DeclAndTypePrinter::Implementation
     TypeVisitor::visit(ty, optionalKind);
   }
 
-  /// Where nullability information should be printed.
-  enum class NullabilityPrintKind {
-    Before,
-    After,
-    ContextSensitive,
-  };
-
-  void printNullability(Optional<OptionalTypeKind> kind,
-                        NullabilityPrintKind printKind
-                          = NullabilityPrintKind::After) {
-    if (!kind)
-      return;
-
-    switch (printKind) {
-    case NullabilityPrintKind::ContextSensitive:
-      switch (*kind) {
-      case OTK_None:
-        os << "nonnull";
-        break;
-      case OTK_Optional:
-        os << "nullable";
-        break;
-      case OTK_ImplicitlyUnwrappedOptional:
-        os << "null_unspecified";
-        break;
-      }
-      break;
-    case NullabilityPrintKind::After:
-      os << ' ';
-      LLVM_FALLTHROUGH;
-    case NullabilityPrintKind::Before:
-      switch (*kind) {
-      case OTK_None:
-        os << "_Nonnull";
-        break;
-      case OTK_Optional:
-        os << "_Nullable";
-        break;
-      case OTK_ImplicitlyUnwrappedOptional:
-        os << "_Null_unspecified";
-        break;
-      }
-      break;
-    }
-
-    if (printKind != NullabilityPrintKind::After)
-      os << ' ';
-  }
-
   /// Determine whether this generic Swift nominal type maps to a
   /// generic Objective-C class.
   static bool hasGenericObjCType(const NominalTypeDecl *nominal) {