diff options
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 49 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 25 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/chrono_io.h | 450 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/cow_string.h | 30 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/formatfwd.h | 71 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/ranges_uninitialized.h | 46 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/unicode.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/vector.tcc | 13 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/version.def | 22 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/version.h | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/version.tpl | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/flat_set | 20 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/format | 30 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/vector | 32 |
17 files changed, 477 insertions, 332 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 4dc771a..537774c 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -195,6 +195,7 @@ bits_headers = \ ${bits_srcdir}/cow_string.h \ ${bits_srcdir}/deque.tcc \ ${bits_srcdir}/erase_if.h \ + ${bits_srcdir}/formatfwd.h \ ${bits_srcdir}/forward_list.h \ ${bits_srcdir}/forward_list.tcc \ ${bits_srcdir}/fs_dir.h \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 0e3d09b..7b96b22 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -548,6 +548,7 @@ bits_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/cow_string.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/deque.tcc \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/erase_if.h \ +@GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/formatfwd.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/forward_list.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/forward_list.tcc \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/fs_dir.h \ diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index e3b484d..886e7e6 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -45,7 +45,9 @@ #include <initializer_list> #endif -#if __cplusplus >= 201703L +#include <bits/version.h> + +#ifdef __glibcxx_string_view // >= C++17 # include <string_view> #endif @@ -53,7 +55,6 @@ # include <charconv> #endif -#include <bits/version.h> #if ! _GLIBCXX_USE_CXX11_ABI # include "cow_string.h" @@ -146,7 +147,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 return __p; } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 // A helper type for avoiding boiler-plate. typedef basic_string_view<_CharT, _Traits> __sv_type; @@ -341,6 +342,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 void _M_construct(size_type __req, _CharT __c); + // Construct using block of memory of known size. + // If _Terminated is true assume that source is already 0 terminated. + template<bool _Terminated> + _GLIBCXX20_CONSTEXPR + void + _M_construct(const _CharT *__c, size_type __n); + _GLIBCXX20_CONSTEXPR allocator_type& _M_get_allocator() @@ -561,8 +569,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 : _M_dataplus(_M_local_data(), _Alloc_traits::_S_select_on_copy(__str._M_get_allocator())) { - _M_construct(__str._M_data(), __str._M_data() + __str.length(), - std::forward_iterator_tag()); + _M_construct<true>(__str._M_data(), __str.length()); } // _GLIBCXX_RESOLVE_LIB_DEFECTS @@ -782,7 +789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 #endif } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Construct string from a substring of a string_view. * @param __t Source object convertible to string view. @@ -938,7 +945,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Set value to string constructed from a string_view. * @param __svt An object convertible to string_view. @@ -1433,7 +1440,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { return this->append(__l.begin(), __l.size()); } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Append a string_view. * @param __svt An object convertible to string_view to be appended. @@ -1550,7 +1557,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 append(_InputIterator __first, _InputIterator __last) { return this->replace(end(), end(), __first, __last); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view /** * @brief Append a string_view. * @param __svt An object convertible to string_view to be appended. @@ -1803,7 +1810,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Set value from a string_view. * @param __svt The source object convertible to string_view. @@ -2084,7 +2091,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 return iterator(_M_data() + __pos); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Insert a string_view. * @param __pos Position in string to insert at. @@ -2536,7 +2543,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 { return this->replace(__i1, __i2, __l.begin(), __l.size()); } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Replace range of characters with string_view. * @param __pos The position to replace at. @@ -2735,7 +2742,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->find(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a string_view. * @param __svt The object convertible to string_view to locate. @@ -2801,7 +2808,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->rfind(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a string_view. * @param __svt The object convertible to string_view to locate. @@ -2885,7 +2892,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->find_first_of(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a character of a string_view. * @param __svt An object convertible to string_view containing @@ -2974,7 +2981,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->find_last_of(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a character of string. * @param __svt An object convertible to string_view containing @@ -3062,7 +3069,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->find_first_not_of(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a character not in a string_view. * @param __svt A object convertible to string_view containing @@ -3149,7 +3156,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_NOEXCEPT { return this->find_last_not_of(__str.data(), __pos, __str.size()); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a character not in a string_view. * @param __svt An object convertible to string_view containing @@ -3265,7 +3272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 return __r; } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Compare to a string_view. * @param __svt An object convertible to string_view to compare against. @@ -4599,7 +4606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 constexpr #endif inline wstring -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 __to_wstring_numeric(string_view __s) #else __to_wstring_numeric(const string& __s) @@ -4802,7 +4809,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } // inline namespace literals #endif // __glibcxx_string_udls -#if __cplusplus >= 201703L +#ifdef __glibcxx_variant // >= C++17 namespace __detail::__variant { template<typename> struct _Never_valueless_alt; // see <variant> diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 7c44753..02230ac 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -276,6 +276,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_set_length(__n); } + // Length of string constructed is easier to propagate inter-procedurally + // than difference between iterators. + template<typename _CharT, typename _Traits, typename _Alloc> + template<bool _Terminated> + _GLIBCXX20_CONSTEXPR + void + basic_string<_CharT, _Traits, _Alloc>:: + _M_construct(const _CharT* __str, size_type __n) + { + if (__n > size_type(_S_local_capacity)) + { + _M_data(_M_create(__n, size_type(0))); + _M_capacity(__n); + } + else + _M_init_local_buf(); + + if (__n || _Terminated) + this->_S_copy(_M_data(), __str, __n + _Terminated); + + _M_length(__n); + if (!_Terminated) + traits_type::assign(_M_data()[__n], _CharT()); + } + template<typename _CharT, typename _Traits, typename _Alloc> _GLIBCXX20_CONSTEXPR void diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index c55b651..d872109 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -905,7 +905,7 @@ namespace __format // time zone info available for the time in __tm. __tm.tm_isdst = -1; -#ifdef _GLIBCXX_HAVE_STRUCT_TM_TM_ZONE +#ifdef _GLIBCXX_USE_STRUCT_TM_TM_ZONE // POSIX.1-2024 adds tm.tm_zone which will be used for %Z. // BSD has had tm_zone since 1987 but as char* so cast away const. if constexpr (__is_time_point_v<_Tp>) @@ -1785,277 +1785,272 @@ namespace __format __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::day, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Day); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Day); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::day& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::day& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::month, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Month); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Month); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::month& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::month& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Year); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Year); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::year& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::year& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::weekday, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Weekday); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Weekday); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::weekday& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::weekday& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::weekday_indexed, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Weekday); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Weekday); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::weekday_indexed& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::weekday_indexed& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::weekday_last, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Weekday); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Weekday); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::weekday_last& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::weekday_last& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::month_day, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Month|__format::_Day); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Month|__format::_Day); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::month_day& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::month_day& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::month_day_last, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Month|__format::_Day); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Month|__format::_Day); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::month_day_last& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::month_day_last& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::month_weekday, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Month|__format::_Weekday); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Month|__format::_Weekday); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::month_weekday& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::month_weekday& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::month_weekday_last, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Month|__format::_Weekday); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Month|__format::_Weekday); } - template<typename _FormatContext> - typename _FormatContext::iterator + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator format(const chrono::month_weekday_last& __t, - _FormatContext& __fc) const + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year_month, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Year|__format::_Month); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Year|__format::_Month); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::year_month& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::year_month& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year_month_day, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Date); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Date); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::year_month_day& __t, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::year_month_day& __t, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year_month_day_last, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Date); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Date); } - template<typename _FormatContext> - typename _FormatContext::iterator + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator format(const chrono::year_month_day_last& __t, - _FormatContext& __fc) const + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year_month_weekday, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Date); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Date); } - template<typename _FormatContext> - typename _FormatContext::iterator + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator format(const chrono::year_month_weekday& __t, - _FormatContext& __fc) const + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::year_month_weekday_last, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_Date); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_Date); } - template<typename _FormatContext> - typename _FormatContext::iterator + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator format(const chrono::year_month_weekday_last& __t, - _FormatContext& __fc) const - { return _M_f._M_format(__t, __fc); } + basic_format_context<_Out, _CharT>& __fc) const + { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Rep, typename _Period, typename _CharT> + template<typename _Rep, typename _Period, __format::__char _CharT> struct formatter<chrono::hh_mm_ss<chrono::duration<_Rep, _Period>>, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_TimeOfDay); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_TimeOfDay); } - template<typename _FormatContext> - typename _FormatContext::iterator + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator format(const chrono::hh_mm_ss<chrono::duration<_Rep, _Period>>& __t, - _FormatContext& __fc) const + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__t, __fc); } private: @@ -2063,34 +2058,34 @@ namespace __format }; #if _GLIBCXX_USE_CXX11_ABI || ! _GLIBCXX_USE_DUAL_ABI - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::sys_info, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ChronoParts{}); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ChronoParts{}); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::sys_info& __i, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::sys_info& __i, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__i, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _CharT> + template<__format::__char _CharT> struct formatter<chrono::local_info, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ChronoParts{}); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ChronoParts{}); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::local_info& __i, _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::local_info& __i, + basic_format_context<_Out, _CharT>& __fc) const { return _M_f._M_format(__i, __fc); } private: @@ -2098,25 +2093,24 @@ namespace __format }; #endif - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::sys_time<_Duration>, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { - auto __next = _M_f._M_parse(__pc, __format::_ZonedDateTime); - if constexpr (!__stream_insertable) - if (_M_f._M_spec._M_chrono_specs.empty()) - __format::__invalid_chrono_spec(); // chrono-specs can't be empty - return __next; - } - - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::sys_time<_Duration>& __t, - _FormatContext& __fc) const - { return _M_f._M_format(__t, __fc); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { + auto __next = _M_f._M_parse(__pc, __format::_ZonedDateTime); + if constexpr (!__stream_insertable) + if (_M_f._M_spec._M_chrono_specs.empty()) + __format::__invalid_chrono_spec(); // chrono-specs can't be empty + return __next; + } + + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::sys_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const + { return _M_f._M_format(__t, __fc); } private: static constexpr bool __stream_insertable @@ -2126,19 +2120,18 @@ namespace __format __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::utc_time<_Duration>, _CharT> : __format::__formatter_chrono<_CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::utc_time<_Duration>& __t, - _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::utc_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const { // Adjust by removing leap seconds to get equivalent sys_time. // We can't just use clock_cast because we want to know if the time @@ -2161,19 +2154,18 @@ namespace __format __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::tai_time<_Duration>, _CharT> : __format::__formatter_chrono<_CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::tai_time<_Duration>& __t, - _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::tai_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const { // Convert to __local_time_fmt with abbrev "TAI" and offset 0s. // We use __local_time_fmt and not sys_time (as the standard implies) @@ -2193,19 +2185,18 @@ namespace __format __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::gps_time<_Duration>, _CharT> : __format::__formatter_chrono<_CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::gps_time<_Duration>& __t, - _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::gps_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const { // Convert to __local_time_fmt with abbrev "GPS" and offset 0s. // We use __local_time_fmt and not sys_time (as the standard implies) @@ -2225,72 +2216,69 @@ namespace __format __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::file_time<_Duration>, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::file_time<_Duration>& __t, - _FormatContext& __ctx) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::file_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const { using namespace chrono; - return _M_f._M_format(chrono::clock_cast<system_clock>(__t), __ctx); + return _M_f._M_format(chrono::clock_cast<system_clock>(__t), __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::local_time<_Duration>, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_DateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_DateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::local_time<_Duration>& __t, - _FormatContext& __ctx) const - { return _M_f._M_format(__t, __ctx); } + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::local_time<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const + { return _M_f._M_format(__t, __fc); } private: __format::__formatter_chrono<_CharT> _M_f; }; - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::__detail::__local_time_fmt<_Duration>, _CharT> { - template<typename _ParseContext> - constexpr typename _ParseContext::iterator - parse(_ParseContext& __pc) - { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f._M_parse(__pc, __format::_ZonedDateTime); } - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::__detail::__local_time_fmt<_Duration>& __t, - _FormatContext& __ctx) const - { return _M_f._M_format(__t, __ctx, /* use %Z for {} */ true); } + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::__detail::__local_time_fmt<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const + { return _M_f._M_format(__t, __fc, /* use %Z for {} */ true); } private: __format::__formatter_chrono<_CharT> _M_f; }; #if _GLIBCXX_USE_CXX11_ABI || ! _GLIBCXX_USE_DUAL_ABI - template<typename _Duration, typename _TimeZonePtr, typename _CharT> + template<typename _Duration, typename _TimeZonePtr, __format::__char _CharT> struct formatter<chrono::zoned_time<_Duration, _TimeZonePtr>, _CharT> : formatter<chrono::__detail::__local_time_fmt_for<_Duration>, _CharT> { - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::zoned_time<_Duration, _TimeZonePtr>& __tp, - _FormatContext& __ctx) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::zoned_time<_Duration, _TimeZonePtr>& __tp, + basic_format_context<_Out, _CharT>& __fc) const { using _Ltf = chrono::__detail::__local_time_fmt_for<_Duration>; using _Base = formatter<_Ltf, _CharT>; @@ -2298,20 +2286,20 @@ namespace __format const auto __lf = chrono::local_time_format(__tp.get_local_time(), &__info.abbrev, &__info.offset); - return _Base::format(__lf, __ctx); + return _Base::format(__lf, __fc); } }; #endif // Partial specialization needed for %c formatting of __utc_leap_second. - template<typename _Duration, typename _CharT> + template<typename _Duration, __format::__char _CharT> struct formatter<chrono::__detail::__utc_leap_second<_Duration>, _CharT> : formatter<chrono::utc_time<_Duration>, _CharT> { - template<typename _FormatContext> - typename _FormatContext::iterator - format(const chrono::__detail::__utc_leap_second<_Duration>& __t, - _FormatContext& __fc) const + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const chrono::__detail::__utc_leap_second<_Duration>& __t, + basic_format_context<_Out, _CharT>& __fc) const { return this->_M_f._M_format(__t, __fc); } }; diff --git a/libstdc++-v3/include/bits/cow_string.h b/libstdc++-v3/include/bits/cow_string.h index 740e046..d5b3979 100644 --- a/libstdc++-v3/include/bits/cow_string.h +++ b/libstdc++-v3/include/bits/cow_string.h @@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _S_empty_rep() _GLIBCXX_NOEXCEPT { return _Rep::_S_empty_rep(); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 // A helper type for avoiding boiler-plate. typedef basic_string_view<_CharT, _Traits> __sv_type; @@ -685,7 +685,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_dataplus(_S_construct(__beg, __end, __a), __a) { } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Construct string from a substring of a string_view. * @param __t Source object convertible to string view. @@ -775,7 +775,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Set value to string constructed from a string_view. * @param __svt An object convertible to string_view. @@ -1246,7 +1246,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return this->append(__l.begin(), __l.size()); } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Append a string_view. * @param __svt The object convertible to string_view to be appended. @@ -1338,7 +1338,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION append(_InputIterator __first, _InputIterator __last) { return this->replace(_M_iend(), _M_iend(), __first, __last); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Append a string_view. * @param __svt The object convertible to string_view to be appended. @@ -1496,7 +1496,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return this->assign(__l.begin(), __l.size()); } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Set value from a string_view. * @param __svt The source object convertible to string_view. @@ -1703,7 +1703,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return iterator(_M_data() + __pos); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Insert a string_view. * @param __pos Position in string to insert at. @@ -2092,7 +2092,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return this->replace(__i1, __i2, __l.begin(), __l.end()); } #endif // C++11 -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Replace range of characters with string_view. * @param __pos The position to replace at. @@ -2354,7 +2354,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION size_type find(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT; -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a string_view. * @param __svt The object convertible to string_view to locate. @@ -2432,7 +2432,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION size_type rfind(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT; -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a string_view. * @param __svt The object convertible to string_view to locate. @@ -2515,7 +2515,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION find_first_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT { return this->find(__c, __pos); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a character of a string_view. * @param __svt An object convertible to string_view containing @@ -2599,7 +2599,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION find_last_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT { return this->rfind(__c, __pos); } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a character of string. * @param __svt An object convertible to string_view containing @@ -2680,7 +2680,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION find_first_not_of(_CharT __c, size_type __pos = 0) const _GLIBCXX_NOEXCEPT; -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find position of a character not in a string_view. * @param __svt An object convertible to string_view containing @@ -2762,7 +2762,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION find_last_not_of(_CharT __c, size_type __pos = npos) const _GLIBCXX_NOEXCEPT; -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Find last position of a character not in a string_view. * @param __svt An object convertible to string_view containing @@ -2824,7 +2824,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __r; } -#if __cplusplus >= 201703L +#ifdef __glibcxx_string_view // >= C++17 /** * @brief Compare to a string_view. * @param __svt An object convertible to string_view to compare against. diff --git a/libstdc++-v3/include/bits/formatfwd.h b/libstdc++-v3/include/bits/formatfwd.h new file mode 100644 index 0000000..44922cb --- /dev/null +++ b/libstdc++-v3/include/bits/formatfwd.h @@ -0,0 +1,71 @@ +// <format> Formatting -*- C++ -*- + +// Copyright The GNU Toolchain Authors. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// <http://www.gnu.org/licenses/>. + +/** @file bits/formatfwd.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. @headername{format} + */ + +#ifndef _GLIBCXX_FORMAT_FWD_H +#define _GLIBCXX_FORMAT_FWD_H 1 + +#ifdef _GLIBCXX_SYSHDR +#pragma GCC system_header +#endif + +// <bits/version.h> must have been included before this header: +#ifdef __glibcxx_format // C++ >= 20 && HOSTED + +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + // [format.context], class template basic_format_context + template<typename _Out, typename _CharT> class basic_format_context; + + // [format.parse.ctx], class template basic_format_parse_context + template<typename _CharT> class basic_format_parse_context; + + // [format.formatter], formatter + template<typename _Tp, typename _CharT = char> struct formatter; + +namespace __format +{ +#ifdef _GLIBCXX_USE_WCHAR_T + template<typename _CharT> + concept __char = same_as<_CharT, char> || same_as<_CharT, wchar_t>; +#else + template<typename _CharT> + concept __char = same_as<_CharT, char>; +#endif + + template<__char _CharT> + struct __formatter_int; +} + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // __glibcxx_format +#pragma GCC diagnostic pop +#endif // _GLIBCXX_FORMAT_FWD_H diff --git a/libstdc++-v3/include/bits/ranges_uninitialized.h b/libstdc++-v3/include/bits/ranges_uninitialized.h index b558007..12a714b 100644 --- a/libstdc++-v3/include/bits/ranges_uninitialized.h +++ b/libstdc++-v3/include/bits/ranges_uninitialized.h @@ -263,26 +263,6 @@ namespace ranges inline constexpr __uninitialized_value_construct_n_fn uninitialized_value_construct_n; - namespace __detail - { - // This is only intended for finding smaller iterator differences below, - // not as a general purpose replacement for std::min. - struct __mindist_fn - { - template<typename _Dp1, typename _Dp2> - constexpr common_type_t<_Dp1, _Dp2> - operator()(_Dp1 __d1, _Dp2 __d2) const noexcept - { - // Every C++20 iterator I satisfies weakly_incrementable<I> which - // requires signed-integer-like<iter_difference_t<I>>. - static_assert(std::__detail::__is_signed_integer_like<_Dp1>); - static_assert(std::__detail::__is_signed_integer_like<_Dp2>); - return std::min<common_type_t<_Dp1, _Dp2>>(__d1, __d2); - } - }; - inline constexpr __mindist_fn __mindist{}; - } - template<typename _Iter, typename _Out> using uninitialized_copy_result = in_out_result<_Iter, _Out>; @@ -305,10 +285,10 @@ namespace ranges && is_trivially_assignable_v<_OutType&, iter_reference_t<_Iter>>) { - auto __d1 = __ilast - __ifirst; - auto __d2 = __olast - __ofirst; - return ranges::copy_n(std::move(__ifirst), - __detail::__mindist(__d1, __d2), __ofirst); + auto __d = __ilast - __ifirst; + if (auto __d2 = __olast - __ofirst; __d2 < __d) + __d = static_cast<iter_difference_t<_Iter>>(__d2); + return ranges::copy_n(std::move(__ifirst), __d, __ofirst); } else { @@ -356,9 +336,9 @@ namespace ranges && is_trivially_assignable_v<_OutType&, iter_reference_t<_Iter>>) { - auto __d = __olast - __ofirst; - return ranges::copy_n(std::move(__ifirst), - __detail::__mindist(__n, __d), __ofirst); + if (auto __d = __olast - __ofirst; __d < __n) + __n = static_cast<iter_difference_t<_Iter>>(__d); + return ranges::copy_n(std::move(__ifirst), __n, __ofirst); } else { @@ -397,11 +377,12 @@ namespace ranges && is_trivially_assignable_v<_OutType&, iter_rvalue_reference_t<_Iter>>) { - auto __d1 = __ilast - __ifirst; - auto __d2 = __olast - __ofirst; + auto __d = __ilast - __ifirst; + if (auto __d2 = __olast - __ofirst; __d2 < __d) + __d = static_cast<iter_difference_t<_Iter>>(__d2); auto [__in, __out] = ranges::copy_n(std::make_move_iterator(std::move(__ifirst)), - __detail::__mindist(__d1, __d2), __ofirst); + __d, __ofirst); return {std::move(__in).base(), __out}; } else @@ -452,10 +433,11 @@ namespace ranges && is_trivially_assignable_v<_OutType&, iter_rvalue_reference_t<_Iter>>) { - auto __d = __olast - __ofirst; + if (auto __d = __olast - __ofirst; __d < __n) + __n = static_cast<iter_difference_t<_Iter>>(__d); auto [__in, __out] = ranges::copy_n(std::make_move_iterator(std::move(__ifirst)), - __detail::__mindist(__n, __d), __ofirst); + __n, __ofirst); return {std::move(__in).base(), __out}; } else diff --git a/libstdc++-v3/include/bits/unicode.h b/libstdc++-v3/include/bits/unicode.h index 24b1ac3..99d972e 100644 --- a/libstdc++-v3/include/bits/unicode.h +++ b/libstdc++-v3/include/bits/unicode.h @@ -1039,6 +1039,8 @@ inline namespace __v16_0_0 string_view __s(__enc); if (__s.ends_with("//")) __s.remove_suffix(2); + if (__s.ends_with("LE") || __s.ends_with("BE")) + __s.remove_suffix(2); return __s == "16" || __s == "32"; } } diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc index f197278d..66d73b4 100644 --- a/libstdc++-v3/include/bits/vector.tcc +++ b/libstdc++-v3/include/bits/vector.tcc @@ -768,6 +768,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER if (__navail >= __n) { + if (!this->_M_impl._M_finish) + __builtin_unreachable(); + _GLIBCXX_ASAN_ANNOTATE_GROW(__n); this->_M_impl._M_finish = std::__uninitialized_default_n_a(this->_M_impl._M_finish, @@ -1106,9 +1109,12 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER vector<bool, _Alloc>:: _M_reallocate(size_type __n) { + const iterator __begin = begin(), __end = end(); + if (size_type(__end - __begin) > __n) + __builtin_unreachable(); _Bit_pointer __q = this->_M_allocate(__n); iterator __start(std::__addressof(*__q), 0); - iterator __finish(_M_copy_aligned(begin(), end(), __start)); + iterator __finish(_M_copy_aligned(__begin, __end, __start)); this->_M_deallocate(); this->_M_impl._M_start = __start; this->_M_impl._M_finish = __finish; @@ -1134,11 +1140,12 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { const size_type __len = _M_check_len(__n, "vector<bool>::_M_fill_insert"); + iterator __begin = begin(), __end = end(); _Bit_pointer __q = this->_M_allocate(__len); iterator __start(std::__addressof(*__q), 0); - iterator __i = _M_copy_aligned(begin(), __position, __start); + iterator __i = _M_copy_aligned(__begin, __position, __start); std::fill(__i, __i + difference_type(__n), __x); - iterator __finish = std::copy(__position, end(), + iterator __finish = std::copy(__position, __end, __i + difference_type(__n)); this->_M_deallocate(); this->_M_impl._M_end_of_storage = __q + _S_nword(__len); diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def index 1468c04..8f609b4 100644 --- a/libstdc++-v3/include/bits/version.def +++ b/libstdc++-v3/include/bits/version.def @@ -30,6 +30,7 @@ AutoGen Definitions version.tpl; // ftms = { // name = FTM NAME; // [stdname = FTM STANDARD MACRO NAME;] +// [no_stdname = true;] // values = { // v = VALUE FOR FTM IF MATCHING; // [extra_cond = STRING;] @@ -56,7 +57,8 @@ AutoGen Definitions version.tpl; // stdname configures the name of the *standard* macro emitted, i.e. it // replaces only the __cpp_lib_ macro in the emitted definition. Defaults to -// __cpp_lib_${name} +// __cpp_lib_${name}. If no_stdname exists (with any value), the stdname +// define is not emitted. // N.B This list needs to be in topological sort order, as later entries in // this list can and do use the earlier entries. @@ -1404,18 +1406,18 @@ ftms = { }; }; -// ftms = { - // name = format_ranges; +ftms = { + name = format_ranges; // 202207 P2286R8 Formatting Ranges // 202207 P2585R1 Improving default container formatting // LWG3750 Too many papers bump __cpp_lib_format - // TODO: #define __cpp_lib_format_ranges 202207L - // values = { - // v = 202207; - // cxxmin = 23; - // hosted = yes; - // }; -// }; + no_stdname = true; // TODO remove + values = { + v = 1; // TODO 202207 + cxxmin = 23; + hosted = yes; + }; +}; ftms = { name = freestanding_algorithm; diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h index f7c9849..f05c3fd 100644 --- a/libstdc++-v3/include/bits/version.h +++ b/libstdc++-v3/include/bits/version.h @@ -1555,6 +1555,15 @@ #endif /* !defined(__cpp_lib_expected) && defined(__glibcxx_want_expected) */ #undef __glibcxx_want_expected +#if !defined(__cpp_lib_format_ranges) +# if (__cplusplus >= 202100L) && _GLIBCXX_HOSTED +# define __glibcxx_format_ranges 1L +# if defined(__glibcxx_want_all) || defined(__glibcxx_want_format_ranges) +# endif +# endif +#endif /* !defined(__cpp_lib_format_ranges) && defined(__glibcxx_want_format_ranges) */ +#undef __glibcxx_want_format_ranges + #if !defined(__cpp_lib_freestanding_algorithm) # if (__cplusplus >= 202100L) # define __glibcxx_freestanding_algorithm 202311L diff --git a/libstdc++-v3/include/bits/version.tpl b/libstdc++-v3/include/bits/version.tpl index dd5f851..ccda71d 100644 --- a/libstdc++-v3/include/bits/version.tpl +++ b/libstdc++-v3/include/bits/version.tpl @@ -143,13 +143,15 @@ h }*/# /*{(unless (first-for?) "el")}*/if /*{(generate-cond)}*/ # define __glibcxx_/*{name}*/ /*{v}*/L -# if defined(__glibcxx_want_all) || defined(__glibcxx_want_/*{name}*/) +# if defined(__glibcxx_want_all) || defined(__glibcxx_want_/*{name}*/)/*{ + IF (not (exist? "no_stdname")) }*/ # define /*{ ;; Compute the name for this FTM based on stdname/name. (if (exist? "stdname") (get "stdname") (format #f "__cpp_lib_~a" (get "name"))) -}*/ /*{v}*/L +}*/ /*{v}*/L/*{ + ENDIF no_std_name }*/ # endif /*{ ENDFOR values }*/# endif diff --git a/libstdc++-v3/include/std/flat_set b/libstdc++-v3/include/std/flat_set index a7b0b8a..3e15d1a 100644 --- a/libstdc++-v3/include/std/flat_set +++ b/libstdc++-v3/include/std/flat_set @@ -350,12 +350,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return _M_cont.max_size(); } // modifiers - template<typename... _Args> + template<typename _Arg, typename... _Args> pair<iterator, bool> - _M_try_emplace(optional<const_iterator> __hint, _Args&&... __args) + _M_try_emplace(optional<const_iterator> __hint, _Arg&& __arg, _Args&&... __args) { // TODO: Simplify and audit the hint handling. - value_type __k(std::forward<_Args>(__args)...); + auto&& __k = [&] -> decltype(auto) { + if constexpr (sizeof...(_Args) == 0 + && same_as<remove_cvref_t<_Arg>, value_type>) + return std::forward<_Arg>(__arg); + else + return value_type(std::forward<_Arg>(__arg), + std::forward<_Args>(__args)...); + }(); typename container_type::iterator __it; int __r = -1, __s = -1; if (__hint.has_value() @@ -397,12 +404,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return {__it, false}; auto __guard = _M_make_clear_guard(); - __it = _M_cont.insert(__it, std::move(__k)); + __it = _M_cont.insert(__it, std::forward<decltype(__k)>(__k)); __guard._M_disable(); return {__it, true}; } template<typename... _Args> + pair<iterator, bool> + _M_try_emplace(optional<const_iterator> __hint) + { return _M_try_emplace(__hint, value_type()); } + + template<typename... _Args> requires is_constructible_v<value_type, _Args...> __emplace_result_t emplace(_Args&&... __args) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index c3327e1..01a5314 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -52,6 +52,7 @@ #include <string_view> #include <string> #include <bits/monostate.h> +#include <bits/formatfwd.h> #include <bits/ranges_base.h> // input_range, range_reference_t #include <bits/ranges_util.h> // subrange #include <bits/ranges_algobase.h> // ranges::copy @@ -73,9 +74,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - // [format.context], class template basic_format_context - template<typename _Out, typename _CharT> class basic_format_context; - // [format.fmt.string], class template basic_format_string template<typename _CharT, typename... _Args> struct basic_format_string; @@ -178,7 +176,7 @@ namespace __format // [format.formatter], formatter /// The primary template of std::formatter is disabled. - template<typename _Tp, typename _CharT = char> + template<typename _Tp, typename _CharT> struct formatter { formatter() = delete; // No std::formatter specialization for this type. @@ -923,14 +921,6 @@ namespace __format bool _M_hasval = false; }; -#ifdef _GLIBCXX_USE_WCHAR_T - template<typename _CharT> - concept __char = same_as<_CharT, char> || same_as<_CharT, wchar_t>; -#else - template<typename _CharT> - concept __char = same_as<_CharT, char>; -#endif - template<__char _CharT> struct __formatter_str { @@ -1277,12 +1267,26 @@ namespace __format _M_spec); } + [[__gnu__::__always_inline__]] + static size_t + _S_character_width(_CharT __c) + { + // N.B. single byte cannot encode charcter of width greater than 1 + if constexpr (sizeof(_CharT) > 1u && + __unicode::__literal_encoding_is_unicode<_CharT>()) + return __unicode::__field_width(__c); + else + return 1u; + } + template<typename _Out> typename basic_format_context<_Out, _CharT>::iterator _M_format_character(_CharT __c, basic_format_context<_Out, _CharT>& __fc) const { - return __format::__write_padded_as_spec({&__c, 1u}, 1, __fc, _M_spec); + return __format::__write_padded_as_spec({&__c, 1u}, + _S_character_width(__c), + __fc, _M_spec); } template<typename _Int> diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index d3deb7b..2e69af1 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -2534,7 +2534,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return [&]<size_t... _Inds>(index_sequence<_Inds...>) { // Fold == over the tuples until non-equal elements are found. - return ((std::get<_Inds>(__t) == std::get<_Inds>(__u)) && ...); + return (bool(std::get<_Inds>(__t) == std::get<_Inds>(__u)) && ...); }(index_sequence_for<_Tps...>{}); } diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector index 0f04334..8bb2543 100644 --- a/libstdc++-v3/include/std/vector +++ b/libstdc++-v3/include/std/vector @@ -157,4 +157,36 @@ _GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // __cpp_lib_erase_if +#ifdef __glibcxx_format_ranges // C++ >= 20 && HOSTED +#include <bits/formatfwd.h> + +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + // Standard does not constrain accepted _CharT and declares it as formatter + // of Tp that statisfies is-vector-bool-reference<T>, + template<__format::__char _CharT> + struct formatter<_GLIBCXX_STD_C::_Bit_reference, _CharT> + { + // Standard declares this as template accepting unconstrained + // ParseContext type. + constexpr typename basic_format_parse_context<_CharT>::iterator + parse(basic_format_parse_context<_CharT>& __pc) + { return _M_f.template _M_parse<bool>(__pc); } + + // Standard declares this as template accepting unconstrained + // FormatContext type. + template<typename _Out> + typename basic_format_context<_Out, _CharT>::iterator + format(const _GLIBCXX_STD_C::_Bit_reference& __u, + basic_format_context<_Out, _CharT>& __fc) const + { return _M_f.format(static_cast<bool>(__u), __fc); } + + private: + __format::__formatter_int<_CharT> _M_f; + }; +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // __glibcxx_format_ranges + #endif /* _GLIBCXX_VECTOR */ |