diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-22 17:39:43 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-22 17:45:46 +0000 |
| commit | dfc1ea414e0cebccfcffc771ebcefa3d24c9754c (patch) | |
| tree | 4f4c71e5bc3a9a76616a0c545f549998fc961186 | |
| parent | 6b859736bb1e707778627b2e58ef6088e475a54c (diff) | |
| download | gcc-dfc1ea414e0cebccfcffc771ebcefa3d24c9754c.zip gcc-dfc1ea414e0cebccfcffc771ebcefa3d24c9754c.tar.gz gcc-dfc1ea414e0cebccfcffc771ebcefa3d24c9754c.tar.bz2 | |
libstdc++: Replace std::isdigit and std::isxdigit in <format> [PR107817]
These functions aren't usable in constant expressions. Provide our own
implementations, based on __from_chars_alnum_to_val from <charconv>.
libstdc++-v3/ChangeLog:
PR libstdc++/107817
* include/std/charconv (__from_chars_alnum_to_val): Add
constexpr for C++20.
* include/std/format (__is_digit, __is_xdigit): New functions.
(_Spec::_S_parse_width_or_precision): Use __is_digit.
(__formatter_fp::parse): Use __is_xdigit.
| -rw-r--r-- | libstdc++-v3/include/std/charconv | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/format | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/charconv b/libstdc++-v3/include/std/charconv index 8f02395..8b2acc5 100644 --- a/libstdc++-v3/include/std/charconv +++ b/libstdc++-v3/include/std/charconv @@ -454,7 +454,7 @@ namespace __detail // If _DecOnly is false: if the character is an alphanumeric digit, then // return its corresponding base-36 value, otherwise return a value >= 127. template<bool _DecOnly = false> - _GLIBCXX23_CONSTEXPR unsigned char + _GLIBCXX20_CONSTEXPR unsigned char __from_chars_alnum_to_val(unsigned char __c) { if _GLIBCXX17_CONSTEXPR (_DecOnly) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 7ae58eb..23ffbda 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -358,6 +358,12 @@ namespace __format size_t __int_from_arg(const basic_format_arg<_Context>& __arg); + constexpr bool __is_digit(char __c) + { return std::__detail::__from_chars_alnum_to_val(__c) < 10; } + + constexpr bool __is_xdigit(char __c) + { return std::__detail::__from_chars_alnum_to_val(__c) < 16; } + template<typename _CharT> struct _Spec { @@ -469,7 +475,7 @@ namespace __format unsigned short& __val, bool& __arg_id, basic_format_parse_context<_CharT>& __pc) { - if (std::isdigit(*__first)) + if (__format::__is_digit(*__first)) { auto [__v, __ptr] = __format::__parse_integer(__first, __last); if (!__ptr) @@ -1537,7 +1543,7 @@ namespace __format if (__trailing_zeros) { - if (!std::isxdigit(__s[0])) + if (!__format::__is_xdigit(__s[0])) --__sigfigs; __z = __prec - __sigfigs; } @@ -1627,7 +1633,7 @@ namespace __format { __fill_char = _CharT('0'); // Write sign before zero filling. - if (!std::isxdigit(__narrow_str[0])) + if (!__format::__is_xdigit(__narrow_str[0])) { *__out++ = __str[0]; __str.remove_prefix(1); |