Remove USE_LOCALE, no longer necessary with C++20

Author: Grumbel

CMakeLists.txt

@@ -26,12 +26,6 @@ include(GNUInstallDirs)
 include(MaximumWarnings)
 include(ClangTidy)
 
-option(USE_LOCALE "Use C++ locale support" OFF)
-
-if(USE_LOCALE)
-  add_definitions(-DSEXP_USE_LOCALE)
-endif()
-
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

src/value.cpp

@@ -27,9 +27,6 @@ std::string
 Value::str() const
 {
   std::ostringstream os;
-#ifdef SEXP_USE_LOCALE
-  os.imbue(std::locale::classic());
-#endif
   os << *this;
   return os.str();
 }

tests/io_test.cpp

@@ -38,17 +38,21 @@ TEST(IOTest, roundtrip)
   }
 }
 
-#ifdef SEXP_USE_LOCALE
-
 TEST(IOLocaleTest, locale_safe_output)
 {
   auto sx = sexp::Value::real(0.015625f);
   std::stringstream out;
-  out.imbue(std::locale("de_DE.UTF-8"));
+
+  try {
+    // This will fail when the locale is not installed on the system,
+    // just ignore the test it in that case and let the test succeed.
+    out.imbue(std::locale("de_DE.UTF-8"));
+  } catch (std::exception const& err) {
+    std::cerr << "warning: failed to setup locale: " << err.what() << std::endl;
+  }
+
   out << sx;
   ASSERT_EQ("0.015625", out.str());
 }
 
-#endif
-
 /* EOF */

tests/parser_test.cpp

@@ -16,6 +16,7 @@
 
 #include <gtest/gtest.h>
 
+#include <iostream>
 #include <sstream>
 
 #include "sexp/io.hpp"
@@ -192,9 +193,6 @@ TEST(ParserTest, line_numbers)
   ASSERT_EQ(3, sexp::list_ref(sx, 2).get_line());
 }
 
-
-#ifdef SEXP_USE_LOCALE
-
 // C++ locale support comes in the form of ugly global state that
 // spreads over most string formating functions, changing locale can
 // break a lot of stuff.
@@ -209,7 +207,13 @@ class ParserLocaleTest : public ::testing::Test
 
   virtual void SetUp() override
   {
-    std::locale::global(std::locale("de_DE.UTF-8"));
+    try {
+      // This will fail when the locale is not installed on the system,
+      // just ignore the test it in that case and let the test succeed.
+      std::locale::global(std::locale("de_DE.UTF-8"));
+    } catch (std::exception const& err) {
+      std::cerr << "warning: failed to setup locale: " << err.what() << std::endl;
+    }
   }
 
   virtual void TearDown() override
@@ -230,6 +234,4 @@ TEST_F(ParserLocaleTest, locale_safe_output)
   ASSERT_EQ("0.015625", sx.str());
 }
 
-#endif
-
 /* EOF */