From a44e11efc5250742f8dda34b981f9811e76ac282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rimas=20Misevi=C4=8Dius?= <rmisev3@gmail.com>
Date: Fri, 25 Oct 2024 22:03:31 +0300
Subject: [PATCH 1/3] Check in str_arg_char<StrT> if StrT has size() member

Before it was checked StrT has length() member.

This allows other containers (e.g. std::vector) to be used as input.
---
 include/upa/str_arg.h | 16 ++++++++--------
 test/test-str_arg.cpp |  6 ++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/upa/str_arg.h b/include/upa/str_arg.h
index 829b6fb..0868461 100644
--- a/include/upa/str_arg.h
+++ b/include/upa/str_arg.h
@@ -131,19 +131,19 @@ namespace detail {
     template<class>
     auto test_data(long) -> void;
 
-    // test class T has length() member
+    // test class T has size() member
     template<class T>
-    auto test_length(int) -> decltype(std::declval<T>().length());
+    auto test_size(int) -> decltype(std::declval<T>().size());
     template<class>
-    auto test_length(long) -> void;
+    auto test_size(long) -> void;
 
     // T::data() return type (void - if no such member)
     template<class T>
     using data_member_t = decltype(detail::test_data<T>(0));
 
-    // T::length() return type (void - if no such member)
+    // T::size() return type (void - if no such member)
     template<class T>
-    using length_member_t = decltype(detail::test_length<T>(0));
+    using size_member_t = decltype(detail::test_size<T>(0));
 } // namespace detail
 
 
@@ -162,16 +162,16 @@ struct str_arg_char<CharT*> : std::remove_cv<CharT> {
     }
 };
 
-// String that has data() and length() members
+// String that has data() and size() members
 template<class StrT>
 struct str_arg_char<StrT> : std::enable_if<
     std::is_pointer_v<detail::data_member_t<StrT>> &&
-    is_size_type_v<detail::length_member_t<StrT>>,
+    is_size_type_v<detail::size_member_t<StrT>>,
     remove_cvptr_t<detail::data_member_t<StrT>>> {
 
     template <class STR, typename T = typename STR::value_type>
     static str_arg<T> to_str_arg(const STR& str) {
-        return { str.data(), str.length() };
+        return { str.data(), str.size() };
     }
 };
 
diff --git a/test/test-str_arg.cpp b/test/test-str_arg.cpp
index 7c094d4..a5d603d 100644
--- a/test/test-str_arg.cpp
+++ b/test/test-str_arg.cpp
@@ -9,6 +9,8 @@
 
 #include "upa/str_arg.h"
 //#include "doctest-main.h"
+#include <array>
+#include <vector>
 
 
 // Function to test
@@ -86,6 +88,10 @@ inline void test_char() {
     procfn(upa::str_arg{ cptr, cptr + N });
     procfn(upa::str_arg{ vptr, vptr + N });
 
+    // has data() and size() members
+    procfn(std::array<CharT, N>{ '1', '2', '3'});
+    procfn(std::vector<CharT>{ '1', '2', '3'});
+
     // std::basic_string
     const std::basic_string<CharT> str{ arr };
     procfn(str);

From 020055721be742b49bdf0ecfab8dde4df759f997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rimas=20Misevi=C4=8Dius?= <rmisev3@gmail.com>
Date: Sat, 26 Oct 2024 22:55:31 +0300
Subject: [PATCH 2/3] Add support for strings convertible to
 std::basic_string_view

---
 include/upa/str_arg.h    | 139 +++++++++++++++++++++++++++++----------
 include/upa/url_for_qt.h |  11 +++-
 test/test-str_arg.cpp    |  17 ++++-
 3 files changed, 128 insertions(+), 39 deletions(-)

diff --git a/include/upa/str_arg.h b/include/upa/str_arg.h
index 0868461..5c19a3e 100644
--- a/include/upa/str_arg.h
+++ b/include/upa/str_arg.h
@@ -122,56 +122,123 @@ class str_arg {
 template<class T>
 using remove_cvptr_t = std::remove_cv_t<std::remove_pointer_t<T>>;
 
+template<class T>
+using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
+
 namespace detail {
-    // See: https://stackoverflow.com/a/9154394
-
-    // test class T has data() member
-    template<class T>
-    auto test_data(int) -> decltype(std::declval<T>().data());
-    template<class>
-    auto test_data(long) -> void;
-
-    // test class T has size() member
-    template<class T>
-    auto test_size(int) -> decltype(std::declval<T>().size());
-    template<class>
-    auto test_size(long) -> void;
-
-    // T::data() return type (void - if no such member)
-    template<class T>
-    using data_member_t = decltype(detail::test_data<T>(0));
-
-    // T::size() return type (void - if no such member)
-    template<class T>
-    using size_member_t = decltype(detail::test_size<T>(0));
+
+// See: https://stackoverflow.com/a/9154394
+
+// test class T has data() member
+template<class T>
+auto test_data(int) -> decltype(std::declval<T>().data());
+template<class>
+auto test_data(long) -> void;
+
+// test class T has size() member
+template<class T>
+auto test_size(int) -> decltype(std::declval<T>().size());
+template<class>
+auto test_size(long) -> void;
+
+// T::data() return type (void - if no such member)
+template<class T>
+using data_member_t = decltype(detail::test_data<T>(0));
+
+// T::size() return type (void - if no such member)
+template<class T>
+using size_member_t = decltype(detail::test_size<T>(0));
+
+// Check that StrT has data() and size() members of supported types
+
+template<class StrT>
+constexpr bool has_data_and_size_v =
+    std::is_pointer_v<detail::data_member_t<StrT>> &&
+    is_char_type_v<remove_cvptr_t<detail::data_member_t<StrT>>> &&
+    is_size_type_v<detail::size_member_t<StrT>>;
+
+// Check StrT is convertible to std::basic_string_view
+
+template<class StrT, typename CharT>
+constexpr bool convertible_to_string_view_v =
+    std::is_convertible_v<StrT, std::basic_string_view<CharT>> &&
+    !has_data_and_size_v<StrT> &&
+    !std::is_same_v<StrT, std::nullptr_t>;
+
+// Common class for converting input to str_arg
+
+template<typename CharT, class ArgT>
+struct str_arg_char_common {
+    using type = CharT;
+    static str_arg<CharT> to_str_arg(ArgT str) {
+        return { str.data(), str.size() };
+    }
+};
+
+// Default str_arg_char implementation
+
+template<class StrT, typename = void>
+struct str_arg_char_default {};
+
+// StrT has data() and size() members
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    has_data_and_size_v<StrT>>>
+    : str_arg_char_common<
+    remove_cvptr_t<detail::data_member_t<StrT>>,
+    remove_cvref_t<StrT> const&> {};
+
+// StrT is convertible to std::basic_string_view
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    convertible_to_string_view_v<StrT, char>>>
+    : str_arg_char_common<char, std::basic_string_view<char>> {};
+
+#ifdef __cpp_char8_t
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    convertible_to_string_view_v<StrT, char8_t>>>
+    : str_arg_char_common<char8_t, std::basic_string_view<char8_t>> {};
+#endif
+
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    convertible_to_string_view_v<StrT, char16_t>>>
+    : str_arg_char_common<char16_t, std::basic_string_view<char16_t>> {};
+
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    convertible_to_string_view_v<StrT, char32_t>>>
+    : str_arg_char_common<char32_t, std::basic_string_view<char32_t>> {};
+
+template<class StrT>
+struct str_arg_char_default<StrT, std::enable_if_t<
+    convertible_to_string_view_v<StrT, wchar_t>>>
+    : str_arg_char_common<wchar_t, std::basic_string_view<wchar_t>> {};
+
 } // namespace detail
 
 
 // Requirements for string arguments
 
 template<class StrT, typename = void>
-struct str_arg_char {};
+struct str_arg_char : detail::str_arg_char_default<StrT> {};
 
 // Null terminated string
 template<class CharT>
-struct str_arg_char<CharT*> : std::remove_cv<CharT> {
-
-    template <typename T>
-    static str_arg<T> to_str_arg(const T* s) {
+struct str_arg_char<CharT*, std::enable_if_t<is_char_type_v<remove_cvref_t<CharT>>>> {
+    using type = remove_cvref_t<CharT>;
+    static str_arg<type> to_str_arg(const type* s) {
         return s;
     }
 };
 
-// String that has data() and size() members
-template<class StrT>
-struct str_arg_char<StrT> : std::enable_if<
-    std::is_pointer_v<detail::data_member_t<StrT>> &&
-    is_size_type_v<detail::size_member_t<StrT>>,
-    remove_cvptr_t<detail::data_member_t<StrT>>> {
-
-    template <class STR, typename T = typename STR::value_type>
-    static str_arg<T> to_str_arg(const STR& str) {
-        return { str.data(), str.size() };
+// str_arg input
+template<class CharT>
+struct str_arg_char<str_arg<CharT>> {
+    using type = CharT;
+    static str_arg<type> to_str_arg(str_arg<type> s) {
+        return s;
     }
 };
 
diff --git a/include/upa/url_for_qt.h b/include/upa/url_for_qt.h
index f461252..4f5afba 100644
--- a/include/upa/url_for_qt.h
+++ b/include/upa/url_for_qt.h
@@ -10,12 +10,17 @@
 #define UPA_URL_FOR_QT_H
 
 #include "url.h" // IWYU pragma: export
-#include <QString>
 #if __has_include(<QtVersionChecks>)
 # include <QtVersionChecks>
 #else
 # include <QtGlobal>
 #endif
+
+// As of version 6.7, Qt string classes are convertible to
+// std::basic_string_view, and such strings are supported in the
+// str_arg.h file.
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+#include <QString>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 # include <QStringView>
 #endif
@@ -32,7 +37,7 @@ struct str_arg_char_for_qt {
     using type = CharT;
 
     static str_arg<type> to_str_arg(const StrT& str) {
-        return { reinterpret_cast<const type*>(str.data()), str.length() };
+        return { reinterpret_cast<const type*>(str.data()), str.size() };
     }
 };
 
@@ -54,4 +59,6 @@ struct str_arg_char<QUtf8StringView> :
 
 } // namespace upa
 
+#endif // QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
+
 #endif // UPA_URL_FOR_QT_H
diff --git a/test/test-str_arg.cpp b/test/test-str_arg.cpp
index a5d603d..3886c09 100644
--- a/test/test-str_arg.cpp
+++ b/test/test-str_arg.cpp
@@ -21,6 +21,20 @@ inline std::size_t procfn(StrT&& str) {
     return std::distance(inp.begin(), inp.end());
 }
 
+// Custom string class convertible to std::basic_string_view
+
+template <typename CharT>
+class ConvertibleString {
+public:
+    ConvertibleString(const CharT* data, std::size_t length)
+        : data_(data), length_(length) {}
+    operator std::basic_string_view<CharT>() const noexcept {
+        return { data_, length_ };
+    }
+private:
+    const CharT* data_ = nullptr;
+    std::size_t length_ = 0;
+};
 
 // Custom string class and it's specialization
 
@@ -97,7 +111,8 @@ inline void test_char() {
     procfn(str);
     procfn(std::basic_string<CharT>{ arr });
 
-    // custom string
+    // custom strings
+    procfn(ConvertibleString<CharT>{cptr, N});
     procfn(CustomString<CharT>{cptr, N});
 }
 

From a4b63b27a4c9f73c5abce77ba70e027a4c04b903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rimas=20Misevi=C4=8Dius?= <rmisev3@gmail.com>
Date: Sun, 27 Oct 2024 08:43:47 +0200
Subject: [PATCH 3/3] Improve ATL/MFC string input support for C++17

Add support for any strings derived from CSimpleStringT when using C++17
compilers.
---
 include/upa/str_arg.h     |  6 ++++++
 include/upa/url_for_atl.h | 21 +++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/upa/str_arg.h b/include/upa/str_arg.h
index 5c19a3e..509918f 100644
--- a/include/upa/str_arg.h
+++ b/include/upa/str_arg.h
@@ -49,6 +49,12 @@ constexpr bool is_size_type_v =
     std::is_convertible_v<SizeT, std::size_t> ||
     std::is_convertible_v<SizeT, std::ptrdiff_t>;
 
+// See: https://en.cppreference.com/w/cpp/concepts/derived_from
+template<class Derived, class Base>
+constexpr bool is_derived_from_v =
+    std::is_base_of_v<Base, Derived> &&
+    std::is_convertible_v<const volatile Derived*, const volatile Base*>;
+
 
 // string args helper class
 
diff --git a/include/upa/url_for_atl.h b/include/upa/url_for_atl.h
index 9b08dbf..03e6a42 100644
--- a/include/upa/url_for_atl.h
+++ b/include/upa/url_for_atl.h
@@ -14,7 +14,7 @@
 #ifdef UPA_CPP_20
 # include <concepts>
 #else
-# include <cstringt.h>
+# include <type_traits>
 #endif
 
 namespace upa {
@@ -43,17 +43,14 @@ struct str_arg_char<StrT> : public str_arg_char_for_atl<StrT> {};
 
 #else // UPA_CPP_20
 
-template<typename CharT, bool mfcdll>
-struct str_arg_char<ATL::CSimpleStringT<CharT, mfcdll>> :
-    public str_arg_char_for_atl<ATL::CSimpleStringT<CharT, mfcdll>> {};
-
-template<typename CharT, class StringTraits>
-struct str_arg_char<ATL::CStringT<CharT, StringTraits>> :
-    public str_arg_char_for_atl<ATL::CStringT<CharT, StringTraits>> {};
-
-template<class StrT, int nChars>
-struct str_arg_char<ATL::CFixedStringT<StrT, nChars>> :
-    public str_arg_char_for_atl<ATL::CFixedStringT<StrT, nChars>> {};
+// CStringT and CFixedStringT are derived from CSimpleStringT
+template<class StrT>
+struct str_arg_char<StrT, std::enable_if_t<
+    is_derived_from_v<StrT, ATL::CSimpleStringT<char, true>> ||
+    is_derived_from_v<StrT, ATL::CSimpleStringT<wchar_t, true>> ||
+    is_derived_from_v<StrT, ATL::CSimpleStringT<char, false>> ||
+    is_derived_from_v<StrT, ATL::CSimpleStringT<wchar_t, false>>
+    >> : public str_arg_char_for_atl<StrT> {};
 
 #endif // UPA_CPP_20