Merge pull request #929 from niermann999/fix-type-printing

fix: type printing version 2

Author: stephenswat

core/include/detray/geometry/shapes/unbounded.hpp

@@ -12,7 +12,7 @@
 #include "detray/definitions/containers.hpp"
 #include "detray/definitions/detail/qualifiers.hpp"
 #include "detray/definitions/indexing.hpp"
-#include "detray/utils/string_view_concat.hpp"
+#include "detray/utils/string_helpers.hpp"
 
 // System include(s)
 #include <limits>
@@ -37,7 +37,7 @@ class unbounded {
     static constexpr std::string_view name_prefix = "unbounded ";
 
     /// The name for this shape
-    static constexpr string_view_concat2 name{name_prefix, shape::name};
+    static constexpr utils::string_view_concat2 name{name_prefix, shape::name};
 
     /// Local coordinate frame for boundary checks
     template <concepts::algebra algebra_t>

core/include/detray/utils/string_helpers.hpp

@@ -0,0 +1,47 @@
+/** Detray library, part of the ACTS project (R&D line)
+ *
+ * (c) 2022-2024 CERN for the benefit of the ACTS project
+ *
+ * Mozilla Public License Version 2.0
+ */
+
+#pragma once
+
+// Project include(s)
+#include "detray/definitions/containers.hpp"
+
+// System include(s)
+#include <ranges>
+#include <string>
+#include <string_view>
+
+namespace detray::utils {
+
+/// @brief Convenience class to statically concatenate two string views.
+struct string_view_concat2 {
+    std::string_view s1;
+    std::string_view s2;
+
+    explicit operator std::string() const {
+        return std::string(s1) + std::string(s2);
+    }
+};
+
+/// Split string @param input at every occurence of @param delim
+inline dvector<std::string> split_at_delim(const std::string &input,
+                                           const char delim) {
+    dvector<std::string> tokens{};
+
+    for (const auto char_range : std::views::split(input, delim)) {
+        std::string s{""};
+        // TODO: Remove when range constructor becomes available in c++23
+        for (const char c : char_range) {
+            s.push_back(c);
+        }
+        tokens.push_back(std::move(s));
+    }
+
+    return tokens;
+}
+
+}  // namespace detray::utils

core/include/detray/utils/string_view_concat.hpp

@@ -8,11 +8,11 @@
 #pragma once
 
 // Project include(s)
+#include "detray/utils/string_helpers.hpp"
 #include "detray/utils/tuple.hpp"
 #include "detray/utils/type_traits.hpp"
 
 // System include(s)
-#include <ranges>
 #include <string>
 #include <string_view>
 #include <type_traits>
@@ -162,23 +162,16 @@ std::string get_name(bool full = false) {
         return tp_str;
     }
 
-    // Remove the template argument list
-    dvector<std::string> tokens{};
-    for (const auto t : std::views::split(tp_str, '<')) {
-        // The std::string constructor does not work with std::sentinel_t
-        tokens.emplace_back(std::string_view(t.begin(), t.end()));
-    }
-
-    // Split a the first ocurrence of '<'
+    // Remove template parameter list by removing everything behind the first
+    // occurrence of '<'
+    auto tokens = detray::utils::split_at_delim(tp_str, '<');
     tp_str = tokens.front();
-    tokens.clear();
 
-    // Strip the namespaces and qualifiers
-    for (const auto t : std::views::split(tp_str, ':')) {
-        tokens.emplace_back(std::string_view(t.begin(), t.end()));
-    }
+    tokens.clear();
 
-    // Split at the last occurrence of ':'
+    // Strip the namespaces by removing everything before the last occurrence of
+    // ':'
+    tokens = detray::utils::split_at_delim(tp_str, ':');
     return tokens.back();
 }