rename filename, class to use TextEncoding, address comments

Author: abhina-sree

llvm/CMakeLists.txt

@@ -592,9 +592,9 @@ else()
   option(LLVM_ENABLE_THREADS "Use threads if available." ON)
 endif()
 
-set(LLVM_ENABLE_ICU "OFF" CACHE STRING "Use ICU for character conversion support if available. Can be ON, OFF, or FORCE_ON")
+set(LLVM_ENABLE_ICU "OFF" CACHE STRING "Use ICU for text encoding conversion support if available. Can be ON, OFF, or FORCE_ON")
 
-set(LLVM_ENABLE_ICONV "OFF" CACHE STRING "Use iconv for character conversion support if available. Can be ON, OFF, or FORCE_ON")
+set(LLVM_ENABLE_ICONV "OFF" CACHE STRING "Use iconv for text encoding conversion support if available. Can be ON, OFF, or FORCE_ON")
 
 set(LLVM_ENABLE_ZLIB "ON" CACHE STRING "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON")
 

llvm/cmake/config-ix.cmake

@@ -314,7 +314,7 @@ if(LLVM_ENABLE_ICU AND NOT(LLVM_ENABLE_ICONV STREQUAL FORCE_ON))
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${LIBRARY_SUFFIXES})
 endif()
 
-# Check for builtin iconv to avoid licensing issues.
+# Check only for builtin iconv to avoid licensing issues.
 if(LLVM_ENABLE_ICONV AND NOT HAVE_ICU)
   if (LLVM_ENABLE_ICONV STREQUAL FORCE_ON)
     find_package(Iconv REQUIRED)

llvm/include/llvm/Support/EncodingConverter.h renamed to llvm/include/llvm/Support/TextEncoding.h

@@ -1,4 +1,4 @@
-//===-- EncodingConverter.h - Encoding conversion class -----------*- C++ -*-=//
+//===-- TextEncodingConverter.h - Encoding conversion class -------*- C++ -*-=//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -28,7 +28,7 @@ namespace llvm {
 template <typename T> class SmallVectorImpl;
 
 namespace details {
-class EncodingConverterImplBase {
+class TextEncodingConverterImplBase {
 
 private:
   /// Converts a string.
@@ -57,7 +57,7 @@ class EncodingConverterImplBase {
   virtual void reset() = 0;
 
 public:
-  virtual ~EncodingConverterImplBase() = default;
+  virtual ~TextEncodingConverterImplBase() = default;
 
   /// Converts a string and resets the converter to the initial state.
   std::error_code convert(StringRef Source, SmallVectorImpl<char> &Result) {
@@ -78,43 +78,44 @@ enum class TextEncoding {
 };
 
 /// Utility class to convert between different character encodings.
-class EncodingConverter {
-  std::unique_ptr<details::EncodingConverterImplBase> Converter;
+class TextEncodingConverter {
+  std::unique_ptr<details::TextEncodingConverterImplBase> Converter;
 
-  EncodingConverter(
-      std::unique_ptr<details::EncodingConverterImplBase> Converter)
+  TextEncodingConverter(
+      std::unique_ptr<details::TextEncodingConverterImplBase> Converter)
       : Converter(std::move(Converter)) {}
 
 public:
-  /// Creates a EncodingConverter instance.
+  /// Creates a TextEncodingConverter instance.
   /// Returns std::errc::invalid_argument in case the requested conversion is
   /// not supported.
   /// \param[in] From the source character encoding
   /// \param[in] To the target character encoding
-  /// \return a EncodingConverter instance or an error code
-  static ErrorOr<EncodingConverter> create(TextEncoding From, TextEncoding To);
+  /// \return a TextEncodingConverter instance or an error code
+  static ErrorOr<TextEncodingConverter> create(TextEncoding From,
+                                               TextEncoding To);
 
-  /// Creates a EncodingConverter instance.
+  /// Creates a TextEncodingConverter instance.
   /// Returns std::errc::invalid_argument in case the requested conversion is
   /// not supported.
   /// \param[in] From name of the source character encoding
   /// \param[in] To name of the target character encoding
-  /// \return a EncodingConverter instance or an error code
-  static ErrorOr<EncodingConverter> create(StringRef From, StringRef To);
+  /// \return a TextEncodingConverter instance or an error code
+  static ErrorOr<TextEncodingConverter> create(StringRef From, StringRef To);
 
-  EncodingConverter(const EncodingConverter &) = delete;
-  EncodingConverter &operator=(const EncodingConverter &) = delete;
+  TextEncodingConverter(const TextEncodingConverter &) = delete;
+  TextEncodingConverter &operator=(const TextEncodingConverter &) = delete;
 
-  EncodingConverter(EncodingConverter &&Other)
+  TextEncodingConverter(TextEncodingConverter &&Other)
       : Converter(std::move(Other.Converter)) {}
 
-  EncodingConverter &operator=(EncodingConverter &&Other) {
+  TextEncodingConverter &operator=(TextEncodingConverter &&Other) {
     if (this != &Other)
       Converter = std::move(Other.Converter);
     return *this;
   }
 
-  ~EncodingConverter() = default;
+  ~TextEncodingConverter() = default;
 
   /// Converts a string.
   /// \param[in] Source source string

llvm/lib/Support/CMakeLists.txt

@@ -186,7 +186,6 @@ add_llvm_component_library(LLVMSupport
   ELFAttributes.cpp
   ELFAttrParserCompact.cpp
   ELFAttrParserExtended.cpp
-  EncodingConverter.cpp
   Error.cpp
   ErrorHandling.cpp
   ExponentialBackoff.cpp
@@ -258,6 +257,7 @@ add_llvm_component_library(LLVMSupport
   SuffixTree.cpp
   SystemUtils.cpp
   TarWriter.cpp
+  TextEncoding.cpp
   ThreadPool.cpp
   TimeProfiler.cpp
   Timer.cpp

llvm/lib/Support/EncodingConverter.cpp renamed to llvm/lib/Support/TextEncoding.cpp

@@ -1,4 +1,4 @@
-//===-- EncodingConverter.cpp - Encoding conversion class ---------*- C++ -*-=//
+//===-- TextEncoding.cpp - Encoding conversion class --------------*- C++ -*-=//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/EncodingConverter.h"
+#include "llvm/Support/TextEncoding.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
@@ -82,11 +82,12 @@ enum ConversionType {
 // aforementioned encodings. The use of tables for conversion is only
 // possible because EBCDIC 1047 is a single-byte, stateless encoding; other
 // encodings are not supported.
-class EncodingConverterTable : public details::EncodingConverterImplBase {
+class TextEncodingConverterTable
+    : public details::TextEncodingConverterImplBase {
   const ConversionType ConvType;
 
 public:
-  EncodingConverterTable(ConversionType ConvType) : ConvType(ConvType) {}
+  TextEncodingConverterTable(ConversionType ConvType) : ConvType(ConvType) {}
 
   std::error_code convertString(StringRef Source,
                                 SmallVectorImpl<char> &Result) override;
@@ -95,8 +96,8 @@ class EncodingConverterTable : public details::EncodingConverterImplBase {
 };
 
 std::error_code
-EncodingConverterTable::convertString(StringRef Source,
-                                      SmallVectorImpl<char> &Result) {
+TextEncodingConverterTable::convertString(StringRef Source,
+                                          SmallVectorImpl<char> &Result) {
   switch (ConvType) {
   case IBM1047ToUTF8:
     ConverterEBCDIC::convertToUTF8(Source, Result);
@@ -117,13 +118,13 @@ struct UConverterDeleter {
 };
 using UConverterUniquePtr = std::unique_ptr<UConverter, UConverterDeleter>;
 
-class EncodingConverterICU : public details::EncodingConverterImplBase {
+class TextEncodingConverterICU : public details::TextEncodingConverterImplBase {
   UConverterUniquePtr FromConvDesc;
   UConverterUniquePtr ToConvDesc;
 
 public:
-  EncodingConverterICU(UConverterUniquePtr FromConverter,
-                       UConverterUniquePtr ToConverter)
+  TextEncodingConverterICU(UConverterUniquePtr FromConverter,
+                           UConverterUniquePtr ToConverter)
       : FromConvDesc(std::move(FromConverter)),
         ToConvDesc(std::move(ToConverter)) {}
 
@@ -138,8 +139,8 @@ class EncodingConverterICU : public details::EncodingConverterImplBase {
 // insufficient buffer size. In the future, it would better to save the partial
 // result and redo the conversion for the remaining string.
 std::error_code
-EncodingConverterICU::convertString(StringRef Source,
-                                    SmallVectorImpl<char> &Result) {
+TextEncodingConverterICU::convertString(StringRef Source,
+                                        SmallVectorImpl<char> &Result) {
   // Setup the input in case it has no backing data.
   size_t InputLength = Source.size();
   const char *In = InputLength ? const_cast<char *>(Source.data()) : "";
@@ -183,13 +184,14 @@ EncodingConverterICU::convertString(StringRef Source,
   return std::error_code();
 }
 
-void EncodingConverterICU::reset() {
+void TextEncodingConverterICU::reset() {
   ucnv_reset(&*FromConvDesc);
   ucnv_reset(&*ToConvDesc);
 }
 
 #elif HAVE_ICONV
-class EncodingConverterIconv : public details::EncodingConverterImplBase {
+class TextEncodingConverterIconv
+    : public details::TextEncodingConverterImplBase {
   class UniqueIconvT {
     iconv_t ConvDesc;
 
@@ -216,7 +218,7 @@ class EncodingConverterIconv : public details::EncodingConverterImplBase {
   UniqueIconvT ConvDesc;
 
 public:
-  EncodingConverterIconv(UniqueIconvT ConvDesc)
+  TextEncodingConverterIconv(UniqueIconvT ConvDesc)
       : ConvDesc(std::move(ConvDesc)) {}
 
   std::error_code convertString(StringRef Source,
@@ -230,8 +232,8 @@ class EncodingConverterIconv : public details::EncodingConverterImplBase {
 // insufficient buffer size. In the future, it would better to save the partial
 // result and redo the conversion for the remaining string.
 std::error_code
-EncodingConverterIconv::convertString(StringRef Source,
-                                      SmallVectorImpl<char> &Result) {
+TextEncodingConverterIconv::convertString(StringRef Source,
+                                          SmallVectorImpl<char> &Result) {
   // Setup the output. We directly write into the SmallVector.
   size_t Capacity = Result.capacity();
   char *Output = static_cast<char *>(Result.data());
@@ -289,15 +291,15 @@ EncodingConverterIconv::convertString(StringRef Source,
   return std::error_code();
 }
 
-void EncodingConverterIconv::reset() {
+void TextEncodingConverterIconv::reset() {
   iconv(ConvDesc, nullptr, nullptr, nullptr, nullptr);
 }
 
 #endif // HAVE_ICONV
 } // namespace
 
-ErrorOr<EncodingConverter> EncodingConverter::create(TextEncoding CPFrom,
-                                                     TextEncoding CPTo) {
+ErrorOr<TextEncodingConverter>
+TextEncodingConverter::create(TextEncoding CPFrom, TextEncoding CPTo) {
 
   // Text encodings should be distinct.
   if (CPFrom == CPTo)
@@ -311,16 +313,17 @@ ErrorOr<EncodingConverter> EncodingConverter::create(TextEncoding CPFrom,
   else
     return std::error_code(errno, std::generic_category());
 
-  return EncodingConverter(
-      std::make_unique<EncodingConverterTable>(Conversion));
+  return TextEncodingConverter(
+      std::make_unique<TextEncodingConverterTable>(Conversion));
 }
 
-ErrorOr<EncodingConverter> EncodingConverter::create(StringRef From,
-                                                     StringRef To) {
+ErrorOr<TextEncodingConverter> TextEncodingConverter::create(StringRef From,
+                                                             StringRef To) {
   std::optional<TextEncoding> FromEncoding = getKnownEncoding(From);
   std::optional<TextEncoding> ToEncoding = getKnownEncoding(To);
   if (FromEncoding && ToEncoding) {
-    ErrorOr<EncodingConverter> Converter = create(*FromEncoding, *ToEncoding);
+    ErrorOr<TextEncodingConverter> Converter =
+        create(*FromEncoding, *ToEncoding);
     if (Converter)
       return Converter;
   }
@@ -334,15 +337,16 @@ ErrorOr<EncodingConverter> EncodingConverter::create(StringRef From,
   if (U_FAILURE(EC)) {
     return std::error_code(errno, std::generic_category());
   }
-  std::unique_ptr<details::EncodingConverterImplBase> Converter =
-      std::make_unique<EncodingConverterICU>(std::move(FromConvDesc),
-                                             std::move(ToConvDesc));
-  return EncodingConverter(std::move(Converter));
+  std::unique_ptr<details::TextEncodingConverterImplBase> Converter =
+      std::make_unique<TextEncodingConverterICU>(std::move(FromConvDesc),
+                                                 std::move(ToConvDesc));
+  return TextEncodingConverter(std::move(Converter));
 #elif HAVE_ICONV
   iconv_t ConvDesc = iconv_open(To.str().c_str(), From.str().c_str());
   if (ConvDesc == (iconv_t)-1)
     return std::error_code(errno, std::generic_category());
-  return EncodingConverter(std::make_unique<EncodingConverterIconv>(ConvDesc));
+  return TextEncodingConverter(
+      std::make_unique<TextEncodingConverterIconv>(ConvDesc));
 #else
   return std::make_error_code(std::errc::invalid_argument);
 #endif

llvm/unittests/Support/CMakeLists.txt

@@ -39,7 +39,6 @@ add_llvm_unittest(SupportTests
   ErrnoTest.cpp
   ErrorOrTest.cpp
   ErrorTest.cpp
-  EncodingConverterTest.cpp
   ExponentialBackoffTest.cpp
   ExtensibleRTTITest.cpp
   FileCollectorTest.cpp
@@ -89,6 +88,7 @@ add_llvm_unittest(SupportTests
   SuffixTreeTest.cpp
   SwapByteOrderTest.cpp
   TarWriterTest.cpp
+  TextEncodingTest.cpp
   ThreadPool.cpp
   ThreadSafeAllocatorTest.cpp
   Threading.cpp