Merge pull request #103 from elbeno/fix-ct-format-bug

🐛 Remove erroneous constraint on operator+ for ct_format
intel · May 22, 2024 · 0bd6078 · 0bd6078
2 parents 9cf702d + 4b8e1a2
commit 0bd6078
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/stdx/ct_format.hpp b/include/stdx/ct_format.hpp
@@ -112,7 +112,6 @@ CONSTEVAL auto operator+(format_result<T, U> r, S s) {
 }
 
 template <typename S, typename T, typename U>
-    requires(is_specialization_of<S, ct_string>().value)
 CONSTEVAL auto operator+(S s, format_result<T, U> r) {
     return format_result{s + r.str, r.args};
 }

diff --git a/test/ct_format.cpp b/test/ct_format.cpp
@@ -155,3 +155,14 @@ TEST_CASE("format a ct-formatted string with different type", "[ct_format]") {
         stdx::ct_format<"A{}D", string_constant>(CX_VALUE(cts)) ==
         string_constant<char, 'A', 'B', '2', '0', '2', '4', 'C', 'D'>{});
 }
+
+TEST_CASE("format multiple mixed arguments with different type",
+          "[ct_format]") {
+    using namespace std::string_view_literals;
+    static_assert(stdx::ct_format<"Hello {} {} {} {} world", string_constant>(
+                      42, CX_VALUE("A"sv), "B"sv, CX_VALUE(int)) ==
+                  stdx::format_result{
+                      stdx::ct_string_to_type<"Hello {} A {} int world"_cts,
+                                              string_constant>(),
+                      stdx::make_tuple(42, "B"sv)});
+}