[Localization] Extract def-to-yaml conversion logic into DefToYAMLConverter to ease testing

Author: xedin

include/swift/Localization/LocalizationFormat.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_LOCALIZATIONFORMAT_H
 #define SWIFT_LOCALIZATIONFORMAT_H
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
@@ -42,6 +43,20 @@ namespace diag {
 
 using namespace llvm::support;
 
+class DefToYAMLConverter {
+  llvm::ArrayRef<const char *> IDs;
+  llvm::ArrayRef<const char *> Messages;
+
+public:
+  DefToYAMLConverter(llvm::ArrayRef<const char *> ids,
+                     llvm::ArrayRef<const char *> messages)
+      : IDs(ids), Messages(messages) {
+    assert(IDs.size() == Messages.size());
+  }
+
+  void convert(llvm::raw_ostream &out);
+};
+
 class LocalizationWriterInfo {
 public:
   using key_type = uint32_t;

lib/Localization/LocalizationFormat.cpp

@@ -14,6 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/Basic/Range.h"
 #include "swift/Localization/LocalizationFormat.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
@@ -190,5 +191,28 @@ operator>>(LocalizationInput &yin, T &diagnostics) {
   return yin;
 }
 
+void DefToYAMLConverter::convert(llvm::raw_ostream &out) {
+  for (auto i : swift::indices(IDs)) {
+    out << "- id: " << IDs[i] << "\n";
+
+    const std::string &msg = Messages[i];
+
+    out << "  msg: \"";
+    // Add an escape character before a double quote `"` or a backslash `\`.
+    for (unsigned j = 0; j < msg.length(); ++j) {
+      if (msg[j] == '"') {
+        out << '\\';
+        out << '"';
+      } else if (msg[j] == '\\') {
+        out << '\\';
+        out << '\\';
+      } else {
+        out << msg[j];
+      }
+    }
+    out << "\"\r\n";
+  }
+}
+
 } // namespace diag
 } // namespace swift

tools/swift-def-to-yaml-converter/swift-def-to-yaml-converter.cpp

@@ -15,6 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Basic/LLVMInitialize.h"
+#include "swift/Localization/LocalizationFormat.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/CommandLine.h"
@@ -89,25 +91,12 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
 
-  for (unsigned i = 0; i < LocalDiagID::NumDiags; ++i) {
-    OS << "- id: " << diagnosticID[i] << "\n";
-    std::string msg = diagnosticMessages[i];
-    std::string finalMsg = "";
-
-    // Add an escape character before a double quote `"` or a backslash `\`.
-    for (unsigned j = 0; j < msg.length(); ++j) {
-      if (msg[j] == '"') {
-        finalMsg += '\\';
-        finalMsg += '"';
-      } else if (msg[j] == '\\') {
-        finalMsg += '\\';
-        finalMsg += '\\';
-      } else {
-        finalMsg += msg[j];
-      }
-    }
-    OS << "  msg: \"" << finalMsg << "\"\r\n";
-  }
+  llvm::ArrayRef<const char *> ids(diagnosticID, LocalDiagID::NumDiags);
+  llvm::ArrayRef<const char *> messages(diagnosticMessages,
+                                        LocalDiagID::NumDiags);
+
+  swift::diag::DefToYAMLConverter converter(ids, messages);
+  converter.convert(OS);
 
   return EXIT_SUCCESS;
 }