[interop] NFC, create ClangSyntaxPrinter class

Author: hyp

lib/PrintAsClang/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_swift_host_library(swiftPrintAsClang STATIC
-  CxxSynthesis.cpp
+  ClangSyntaxPrinter.cpp
   DeclAndTypePrinter.cpp
   ModuleContentsWriter.cpp
   PrimitiveTypeMapping.cpp

lib/PrintAsClang/CxxSynthesis.cpp lib/PrintAsClang/ClangSyntaxPrinter.cpplib/PrintAsClang/CxxSynthesis.cpp renamed to lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -1,4 +1,4 @@
-//===--- CxxSynthesis.cpp - Rules for synthesizing C++ code -----*- C++ -*-===//
+//===--- ClangSyntaxPrinter.cpp - Printer for C and C++ code ----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,15 +10,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CxxSynthesis.h"
+#include "ClangSyntaxPrinter.h"
 
 using namespace swift;
 using namespace cxx_synthesis;
 
 StringRef cxx_synthesis::getCxxImplNamespaceName() { return "_impl"; }
 
 /// Print a C++ namespace declaration with the give name and body.
-void CxxPrinter::printNamespace(
+void ClangSyntaxPrinter::printNamespace(
     llvm::function_ref<void(raw_ostream &OS)> namePrinter,
     llvm::function_ref<void(raw_ostream &OS)> bodyPrinter) const {
   os << "namespace ";
@@ -30,7 +30,7 @@ void CxxPrinter::printNamespace(
   os << "\n\n";
 }
 
-void CxxPrinter::printNamespace(
+void ClangSyntaxPrinter::printNamespace(
     StringRef name,
     llvm::function_ref<void(raw_ostream &OS)> bodyPrinter) const {
   printNamespace([&](raw_ostream &os) { os << name; }, bodyPrinter);

lib/PrintAsClang/CxxSynthesis.h lib/PrintAsClang/ClangSyntaxPrinter.hlib/PrintAsClang/CxxSynthesis.h renamed to lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -1,4 +1,4 @@
-//===--- CxxSynthesis.h - Rules for synthesizing C++ code -------*- C++ -*-===//
+//===--- ClangSyntaxPrinter.h - Printer for C and C++ code ------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_PRINTASCLANG_CXXSYNTHESIS_H
-#define SWIFT_PRINTASCLANG_CXXSYNTHESIS_H
+#ifndef SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
+#define SWIFT_PRINTASCLANG_CLANGSYNTAXPRINTER_H
 
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/StringRef.h"
@@ -26,9 +26,11 @@ namespace cxx_synthesis {
 /// module in C++.
 StringRef getCxxImplNamespaceName();
 
-class CxxPrinter {
+} // end namespace cxx_synthesis
+
+class ClangSyntaxPrinter {
 public:
-  CxxPrinter(raw_ostream &os) : os(os) {}
+  ClangSyntaxPrinter(raw_ostream &os) : os(os) {}
 
   /// Print a C++ namespace declaration with the give name and body.
   void
@@ -43,7 +45,6 @@ class CxxPrinter {
   raw_ostream &os;
 };
 
-} // end namespace cxx_synthesis
 } // end namespace swift
 
 #endif

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "DeclAndTypePrinter.h"
-#include "CxxSynthesis.h"
+#include "ClangSyntaxPrinter.h"
 #include "PrimitiveTypeMapping.h"
 #include "PrintClangFunction.h"
 

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -12,7 +12,7 @@
 
 #include "ModuleContentsWriter.h"
 
-#include "CxxSynthesis.h"
+#include "ClangSyntaxPrinter.h"
 #include "DeclAndTypePrinter.h"
 #include "OutputLanguageMode.h"
 #include "PrimitiveTypeMapping.h"
@@ -642,8 +642,6 @@ swift::printModuleContentsAsObjC(raw_ostream &os,
 void swift::printModuleContentsAsCxx(
     raw_ostream &os, llvm::SmallPtrSetImpl<ImportModuleTy> &imports,
     ModuleDecl &M) {
-  using cxx_synthesis::CxxPrinter;
-
   std::string moduleContentsBuf;
   llvm::raw_string_ostream moduleOS{moduleContentsBuf};
   std::string modulePrologueBuf;
@@ -671,7 +669,7 @@ void swift::printModuleContentsAsCxx(
   }
 
   // Construct a C++ namespace for the module.
-  CxxPrinter(os).printNamespace(
+  ClangSyntaxPrinter(os).printNamespace(
       [&](raw_ostream &os) { M.ValueDecl::getName().print(os); },
       [&](raw_ostream &os) { os << moduleOS.str(); });
 }