Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

<format>: Make formatter cast the argument to the correct type before constructing basic_format_arg #3723

Merged
merged 2 commits into from
May 31, 2023
+44 −9
Merged

<format>: Make formatter cast the argument to the correct type before constructing basic_format_arg #3723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336fd33
Cast the arg to the correct type before constructing `basic_format_arg`
cpplearner May 21, 2023
200d40c
Merge branch 'main' into format-arg
StephanTLavavej May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions stl/inc/format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,10 +695,6 @@ public:
: _Active_state(_Basic_format_arg_type::_Int_type), _Int_state(_Val) {}
explicit basic_format_arg(const unsigned int _Val) noexcept
: _Active_state(_Basic_format_arg_type::_UInt_type), _UInt_state(_Val) {}
explicit basic_format_arg(const long _Val) noexcept
: _Active_state(_Basic_format_arg_type::_Int_type), _Int_state(_Val) {}
explicit basic_format_arg(const unsigned long _Val) noexcept
: _Active_state(_Basic_format_arg_type::_UInt_type), _UInt_state(_Val) {}
explicit basic_format_arg(const long long _Val) noexcept
: _Active_state(_Basic_format_arg_type::_Long_long_type), _Long_long_state(_Val) {}
explicit basic_format_arg(const unsigned long long _Val) noexcept
Expand Down Expand Up @@ -3548,10 +3544,19 @@ struct _Formatter_base {
_FormatCtx.arg(static_cast<size_t>(_Specs._Dynamic_precision_index)));
}

return _STD visit_format_arg(
_Arg_formatter<typename _FormatContext::iterator, _CharT>{
._Ctx = _STD addressof(_FormatCtx), ._Specs = _STD addressof(_Format_specs)},
basic_format_arg<_FormatContext>{_Val});
using _Erased_type = _Format_arg_traits<_FormatContext>::template _Storage_type<_Ty>;

_Arg_formatter<typename _FormatContext::iterator, _CharT> _Visitor{
._Ctx = _STD addressof(_FormatCtx), ._Specs = _STD addressof(_Format_specs)};
#if !_HAS_CXX23
if constexpr (is_same_v<_Erased_type, basic_string_view<_CharT>>) {
return _STD visit_format_arg(
_Visitor, basic_format_arg<_FormatContext>{_Erased_type{_Val.data(), _Val.size()}});
} else
#endif // !_HAS_CXX23
{
return _STD visit_format_arg(_Visitor, basic_format_arg<_FormatContext>{static_cast<_Erased_type>(_Val)});
}
}

private:
Expand Down
32 changes: 31 additions & 1 deletion tests/std/tests/P0645R10_text_formatting_custom_formatting/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct std::formatter<custom_formattable_type<T>, charT> : std::formatter<T, cha
}
};

constexpr void test_disabled_formatter_is_disabled() {
constexpr void test_disabled_formatter_is_disabled() { // COMPILE-ONLY
using F = formatter<void, void>;

static_assert(!is_default_constructible_v<F>);
Expand Down Expand Up @@ -184,6 +184,21 @@ void test_custom_formattable_type() {
test_numeric_custom_formattable_type<float, charT>();
test_numeric_custom_formattable_type<double, charT>();
test_numeric_custom_formattable_type<long double, charT>();

test_custom_equiv_with_format<charT, charT>(STR("{}"), charT(' '));
test_custom_equiv_with_format<char, charT>(STR("{}"), ' ');

charT test_str[] = {charT(' '), charT()};
test_custom_equiv_with_format<charT*, charT>(STR("{}"), test_str);
test_custom_equiv_with_format<const charT*, charT>(STR("{}"), test_str);

struct traits : char_traits<charT> {};
test_custom_equiv_with_format<basic_string<charT, traits>, charT>(STR("{}"), test_str);
test_custom_equiv_with_format<basic_string_view<charT, traits>, charT>(STR("{}"), test_str);

test_custom_equiv_with_format<nullptr_t, charT>(STR("{}"), nullptr);
test_custom_equiv_with_format<void*, charT>(STR("{}"), nullptr);
test_custom_equiv_with_format<const void*, charT>(STR("{}"), nullptr);
}

template <class charT>
Expand All @@ -201,6 +216,21 @@ void test_mixed_custom_formattable_type() {
test_numeric_mixed_args_custom_formattable_type<float, charT>();
test_numeric_mixed_args_custom_formattable_type<double, charT>();
test_numeric_mixed_args_custom_formattable_type<long double, charT>();

test_custom_equiv_with_format_mixed<charT, charT>(STR("{}{}"), charT(' '));
test_custom_equiv_with_format_mixed<char, charT>(STR("{}{}"), ' ');

charT test_str[] = {charT(' '), charT()};
test_custom_equiv_with_format_mixed<charT*, charT>(STR("{}{}"), test_str);
test_custom_equiv_with_format_mixed<const charT*, charT>(STR("{}{}"), test_str);

struct traits : char_traits<charT> {};
test_custom_equiv_with_format_mixed<basic_string<charT, traits>, charT>(STR("{}{}"), test_str);
test_custom_equiv_with_format_mixed<basic_string_view<charT, traits>, charT>(STR("{}{}"), test_str);

test_custom_equiv_with_format_mixed<nullptr_t, charT>(STR("{}{}"), nullptr);
test_custom_equiv_with_format_mixed<void*, charT>(STR("{}{}"), nullptr);
test_custom_equiv_with_format_mixed<const void*, charT>(STR("{}{}"), nullptr);
}

int main() {
Expand Down