Merge #595

595: Clean up `string_util` module r=msimberg a=aurianer Part of #16 Co-authored-by: aurianer <aurianer@cscs.ch>
pika-org · Feb 14, 2023 · 1250cbe · 1250cbe
2 parents 8273635 + 750ce6b
commit 1250cbe
Show file tree

Hide file tree

Showing 29 changed files with 275 additions and 304 deletions.
diff --git a/.inshpect.toml b/.inshpect.toml
@@ -335,8 +335,8 @@ patterns = [
     { pattern = '\bstd::error_(code|condition|category)\b', include = 'system_error' },
     { pattern = '\bstd::system_error\b', include = 'system_error' },
     { pattern = '\bpika::intrusive_ptr\b', include = 'pika/memory/intrusive_ptr.hpp' },
-    { pattern = '\bpika::util::from_string\b', include = 'pika/string_util/from_string.hpp' },
-    { pattern = '\bpika::util::to_string\b', include = 'pika/string_util/to_string.hpp' },
+    { pattern = '\bpika::detail::from_string\b', include = 'pika/string_util/from_string.hpp' },
+    { pattern = '\bpika::detail::to_string\b', include = 'pika/string_util/to_string.hpp' },
     { pattern = '\bPIKA_PP_CAT\b', include = 'pika/preprocessor/cat.hpp' },
     { pattern = '\bPIKA_PP_EXPAND\b', include = 'pika/preprocessor/expand.hpp' },
     { pattern = '\bPIKA_PP_NARGS\b', include = 'pika/preprocessor/nargs.hpp' },

diff --git a/examples/quickstart/pipeline1.cpp b/examples/quickstart/pipeline1.cpp
@@ -25,7 +25,7 @@ struct pipeline
             if (std::regex_match(item, regex))
             {
                 auto trim = [](std::string const& s) {
-                    return pika::string_util::trim_copy(s);
+                    return pika::detail::trim_copy(s);
                 };
 
                 pika::async(trim, std::move(item))

diff --git a/libs/pika/command_line_handling/src/command_line_handling.cpp b/libs/pika/command_line_handling/src/command_line_handling.cpp
@@ -273,7 +273,8 @@ namespace pika::detail {
         }
         else
         {
-            default_threads = pika::util::from_string<std::size_t>(threads_str);
+            default_threads =
+                pika::detail::from_string<std::size_t>(threads_str);
         }
 
         std::size_t threads =
@@ -292,7 +293,7 @@ namespace pika::detail {
             }
             else
             {
-                threads = pika::util::from_string<std::size_t>(threads_str);
+                threads = pika::detail::from_string<std::size_t>(threads_str);
             }
 
             if (threads == 0)
@@ -368,7 +369,7 @@ namespace pika::detail {
             }
             else
             {
-                num_cores = pika::util::from_string<std::size_t>(cores_str);
+                num_cores = pika::detail::from_string<std::size_t>(cores_str);
             }
         }
 

diff --git a/libs/pika/command_line_handling/src/late_command_line_handling.cpp b/libs/pika/command_line_handling/src/late_command_line_handling.cpp
@@ -121,7 +121,7 @@ namespace pika::detail {
                 if (vm.count("pika:print-bind"))
                 {
                     std::size_t num_threads =
-                        pika::util::from_string<std::size_t>(
+                        pika::detail::from_string<std::size_t>(
                             ini.get_entry("pika.os_threads", 1));
                     handle_print_bind(num_threads);
                 }

diff --git a/libs/pika/ini/include/pika/ini/ini.hpp b/libs/pika/ini/include/pika/ini/ini.hpp
@@ -197,7 +197,7 @@ namespace pika::util {
         std::string get_entry(std::string const& key, T dflt) const
         {
             std::unique_lock<mutex_type> l(mtx_);
-            return get_entry(l, key, pika::util::to_string(dflt));
+            return get_entry(l, key, pika::detail::to_string(dflt));
         }
 
         void add_notification_callback(

diff --git a/libs/pika/ini/src/ini.cpp b/libs/pika/ini/src/ini.cpp
@@ -678,8 +678,7 @@ namespace pika::util {
         using string_vector = std::vector<std::string>;
 
         string_vector split_key;
-        pika::string_util::split(
-            split_key, key, pika::string_util::is_any_of("."));
+        pika::detail::split(split_key, key, pika::detail::is_any_of("."));
 
         std::string sk = split_key.back();
         split_key.pop_back();

diff --git a/libs/pika/init_runtime/tests/unit/config_entry.cpp b/libs/pika/init_runtime/tests/unit/config_entry.cpp
@@ -16,11 +16,11 @@ void test_get_entry()
 {
     std::string val = pika::get_config_entry("pika.localities", "42");
     PIKA_TEST(!val.empty());
-    PIKA_TEST_EQ(pika::util::from_string<int>(val), 1);
+    PIKA_TEST_EQ(pika::detail::from_string<int>(val), 1);
 
     val = pika::get_config_entry("pika.localities", 42);
     PIKA_TEST(!val.empty());
-    PIKA_TEST_EQ(pika::util::from_string<int>(val), 1);
+    PIKA_TEST_EQ(pika::detail::from_string<int>(val), 1);
 }
 
 std::atomic<bool> invoked_callback(false);

diff --git a/libs/pika/logging/src/logging.cpp b/libs/pika/logging/src/logging.cpp
@@ -39,7 +39,7 @@ namespace pika::util {
         {
             try
             {
-                int env_val = pika::util::from_string<int>(env);
+                int env_val = pika::detail::from_string<int>(env);
                 if (env_val < 0)
                     return pika::util::logging::level::disable_all;
 
@@ -62,7 +62,7 @@ namespace pika::util {
                 }
                 return pika::util::logging::level::debug;
             }
-            catch (pika::util::bad_lexical_cast const&)
+            catch (pika::detail::bad_lexical_cast const&)
             {
                 return pika::util::logging::level::disable_all;
             }

diff --git a/libs/pika/prefix/src/find_prefix.cpp b/libs/pika/prefix/src/find_prefix.cpp
@@ -105,9 +105,9 @@ namespace pika::util {
             {
                 std::vector<std::string> path_dirs;
 
-                pika::string_util::split(path_dirs, epath,
-                    pika::string_util::is_any_of(":"),
-                    pika::string_util::token_compress_mode::on);
+                pika::detail::split(path_dirs, epath,
+                    pika::detail::is_any_of(":"),
+                    pika::detail::token_compress_mode::on);
 
                 for (std::uint64_t i = 0; i < path_dirs.size(); ++i)
                 {

diff --git a/libs/pika/program_options/examples/regex.cpp b/libs/pika/program_options/examples/regex.cpp
@@ -70,7 +70,7 @@ void validate(
     std::smatch match;
     if (regex_match(s, match, r))
     {
-        v = std::any(magic_number(pika::util::from_string<int>(match[1])));
+        v = std::any(magic_number(pika::detail::from_string<int>(match[1])));
     }
     else
     {

diff --git a/libs/pika/program_options/include/pika/program_options/detail/value_semantic.hpp b/libs/pika/program_options/include/pika/program_options/detail/value_semantic.hpp
@@ -107,9 +107,9 @@ namespace pika::program_options {
         std::basic_string<Char> s(validators::get_single_string(xs));
         try
         {
-            v = std::any(pika::util::from_string<T>(s));
+            v = std::any(pika::detail::from_string<T>(s));
         }
-        catch (const pika::util::bad_lexical_cast&)
+        catch (const pika::detail::bad_lexical_cast&)
         {
             throw invalid_option_value(s);
         }
@@ -154,7 +154,7 @@ namespace pika::program_options {
                 validate(a, cv, (T*) nullptr, 0);
                 tv->push_back(std::any_cast<T>(a));
             }
-            catch (const pika::util::bad_lexical_cast& /*e*/)
+            catch (const pika::detail::bad_lexical_cast& /*e*/)
             {
                 throw invalid_option_value(s[i]);
             }

diff --git a/libs/pika/program_options/include/pika/program_options/value_semantic.hpp b/libs/pika/program_options/include/pika/program_options/value_semantic.hpp
@@ -210,7 +210,7 @@ namespace pika::program_options {
         typed_value* default_value(const T& v)
         {
             m_default_value = std::any(v);
-            m_default_value_as_text = pika::util::to_string(v);
+            m_default_value_as_text = pika::detail::to_string(v);
             return this;
         }
 
@@ -234,7 +234,7 @@ namespace pika::program_options {
         typed_value* implicit_value(const T& v)
         {
             m_implicit_value = std::any(v);
-            m_implicit_value_as_text = pika::util::to_string(v);
+            m_implicit_value_as_text = pika::detail::to_string(v);
             return this;
         }
 

diff --git a/libs/pika/resource_partitioner/src/detail_partitioner.cpp b/libs/pika/resource_partitioner/src/detail_partitioner.cpp
@@ -240,7 +240,7 @@ namespace pika::resource::detail {
         if (!default_scheduler_mode_str.empty())
         {
             default_scheduler_mode_ =
-                threads::scheduler_mode(pika::util::from_string<std::size_t>(
+                threads::scheduler_mode(pika::detail::from_string<std::size_t>(
                     default_scheduler_mode_str));
             PIKA_ASSERT_MSG((default_scheduler_mode_ &
                                 ~threads::scheduler_mode::all_flags) ==

diff --git a/libs/pika/runtime/src/custom_exception_info.cpp b/libs/pika/runtime/src/custom_exception_info.cpp
@@ -64,7 +64,7 @@ namespace pika {
     // return a string holding a formatted message.
     std::string diagnostic_information(pika::exception_info const& xi)
     {
-        int const verbosity = util::from_string<int>(
+        int const verbosity = detail::from_string<int>(
             get_config_entry("pika.exception_verbosity", "1"));
 
         std::ostringstream strm;
@@ -377,7 +377,7 @@ namespace pika {
             std::int64_t pid = ::getpid();
 
             std::size_t const trace_depth =
-                util::from_string<std::size_t>(get_config_entry(
+                detail::from_string<std::size_t>(get_config_entry(
                     "pika.trace_depth", PIKA_HAVE_THREAD_BACKTRACE_DEPTH));
 
             pika::debug::detail::backtrace bt(trace_depth);

diff --git a/libs/pika/runtime/src/runtime.cpp b/libs/pika/runtime/src/runtime.cpp
@@ -77,7 +77,7 @@ namespace pika {
 
         if (get_config_entry("pika.diagnostics_on_terminate", "1") == "1")
         {
-            int const verbosity = util::from_string<int>(
+            int const verbosity = detail::from_string<int>(
                 get_config_entry("pika.exception_verbosity", "1"));
 
             if (verbosity >= 2)
@@ -89,7 +89,7 @@ namespace pika {
             if (verbosity >= 1)
             {
                 std::size_t const trace_depth =
-                    util::from_string<std::size_t>(get_config_entry(
+                    detail::from_string<std::size_t>(get_config_entry(
                         "pika.trace_depth", PIKA_HAVE_THREAD_BACKTRACE_DEPTH));
                 std::cerr << "{stack-trace}: "
                           << pika::debug::detail::trace(trace_depth) << "\n";
@@ -150,7 +150,7 @@ namespace pika {
 
         if (get_config_entry("pika.diagnostics_on_terminate", "1") == "1")
         {
-            int const verbosity = util::from_string<int>(
+            int const verbosity = detail::from_string<int>(
                 get_config_entry("pika.exception_verbosity", "1"));
 
             char* reason = strsignal(signum);
@@ -164,7 +164,7 @@ namespace pika {
             if (verbosity >= 1)
             {
                 std::size_t const trace_depth =
-                    util::from_string<std::size_t>(get_config_entry(
+                    detail::from_string<std::size_t>(get_config_entry(
                         "pika.trace_depth", PIKA_HAVE_THREAD_BACKTRACE_DEPTH));
                 std::cerr << "{stack-trace}: "
                           << pika::debug::detail::trace(trace_depth) << "\n";

diff --git a/libs/pika/string_util/include/pika/string_util/bad_lexical_cast.hpp b/libs/pika/string_util/include/pika/string_util/bad_lexical_cast.hpp
@@ -12,7 +12,7 @@
 
 #include <pika/config/warnings_prefix.hpp>
 
-namespace pika::util {
+namespace pika::detail {
     class PIKA_EXPORT bad_lexical_cast : public std::bad_cast
     {
     public:
@@ -50,19 +50,15 @@ namespace pika::util {
         std::type_info const* target;
     };
 
-    namespace detail {
+    [[noreturn]] PIKA_EXPORT void throw_bad_lexical_cast(
+        std::type_info const& source_type, std::type_info const& target_type);
 
-        [[noreturn]] PIKA_EXPORT void throw_bad_lexical_cast(
-            std::type_info const& source_type,
-            std::type_info const& target_type);
-
-        template <typename Source, typename Target>
-        [[noreturn]] inline Target throw_bad_lexical_cast()
-        {
-            detail::throw_bad_lexical_cast(typeid(Source), typeid(Target));
-        }
-    }    // namespace detail
+    template <typename Source, typename Target>
+    [[noreturn]] inline Target throw_bad_lexical_cast()
+    {
+        throw_bad_lexical_cast(typeid(Source), typeid(Target));
+    }
 
-}    // namespace pika::util
+}    // namespace pika::detail
 
 #include <pika/config/warnings_suffix.hpp>
diff --git a/libs/pika/string_util/include/pika/string_util/case_conv.hpp b/libs/pika/string_util/include/pika/string_util/case_conv.hpp
@@ -10,11 +10,11 @@
 #include <cctype>
 #include <string>
 
-namespace pika::string_util {
+namespace pika::detail {
     template <typename CharT, class Traits, class Alloc>
     void to_lower(std::basic_string<CharT, Traits, Alloc>& s)
     {
         std::transform(std::begin(s), std::end(s), std::begin(s),
             [](int c) { return std::tolower(c); });
     }
-}    // namespace pika::string_util
+}    // namespace pika::detail
diff --git a/libs/pika/string_util/include/pika/string_util/classification.hpp b/libs/pika/string_util/include/pika/string_util/classification.hpp
@@ -9,38 +9,29 @@
 #include <cctype>
 #include <string>
 
-namespace pika::string_util {
-    namespace detail {
-        template <typename CharT, typename Traits, typename Allocator>
-        struct is_any_of_pred
+namespace pika::detail {
+    template <typename CharT, typename Traits, typename Allocator>
+    struct is_any_of_pred
+    {
+        bool operator()(int c) const noexcept
         {
-            bool operator()(int c) const noexcept
-            {
-                return chars.find(c) != std::string::npos;
-            }
+            return chars.find(c) != std::string::npos;
+        }
 
-            std::basic_string<CharT, Traits, Allocator> chars;
-        };
-    }    // namespace detail
+        std::basic_string<CharT, Traits, Allocator> chars;
+    };
 
     template <typename CharT, typename Traits, typename Allocator>
-    detail::is_any_of_pred<CharT, Traits, Allocator>
+    is_any_of_pred<CharT, Traits, Allocator>
     is_any_of(std::basic_string<CharT, Traits, Allocator> const& chars)
     {
-        return detail::is_any_of_pred<CharT, Traits, Allocator>{chars};
+        return is_any_of_pred<CharT, Traits, Allocator>{chars};
     }
 
     inline auto is_any_of(char const* chars)
     {
-        return detail::is_any_of_pred<char, std::char_traits<char>,
+        return is_any_of_pred<char, std::char_traits<char>,
             std::allocator<char>>{std::string{chars}};
     }
 
-    struct is_space
-    {
-        bool operator()(int c) const noexcept
-        {
-            return std::isspace(c);
-        }
-    };
-}    // namespace pika::string_util
+}    // namespace pika::detail