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.

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

Formatting of function pointers, member function pointers, member object pointers... #2610

Merged
merged 6 commits into from
Nov 23, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
50 changes: 49 additions & 1 deletion include/fmt/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,9 @@ constexpr bool is_arithmetic_type(type t) {
struct unformattable {};
struct unformattable_char : unformattable {};
struct unformattable_const : unformattable {};
struct unformattable_function_pointer : unformattable {};
struct unformattable_member_function_pointer : unformattable {};
struct unformattable_member_object_pointer : unformattable {};
AlexGuteniev marked this conversation as resolved.
Show resolved Hide resolved
struct unformattable_pointer : unformattable {};

template <typename Char> struct string_value {
Expand Down Expand Up @@ -1228,6 +1231,9 @@ template <typename Context> class value {
value(unformattable_char);
value(unformattable_const);
value(unformattable_pointer);
value(unformattable_function_pointer);
value(unformattable_member_function_pointer);
value(unformattable_member_object_pointer);

private:
// Formats an argument of a custom type, such as a user-defined class.
Expand Down Expand Up @@ -1368,11 +1374,32 @@ template <typename Context> struct arg_mapper {
return val;
}

template <typename T,
FMT_ENABLE_IF(std::is_function<typename std::remove_pointer<
remove_cvref_t<T>>::type>::value)>
FMT_CONSTEXPR auto map(const T&) -> unformattable_function_pointer {
return {};
}

template <typename T, FMT_ENABLE_IF(std::is_member_object_pointer<T>::value)>
FMT_CONSTEXPR auto map(const T&) -> unformattable_member_object_pointer {
return {};
}

template <typename T,
FMT_ENABLE_IF(std::is_member_function_pointer<T>::value)>
FMT_CONSTEXPR auto map(const T&) -> unformattable_member_function_pointer {
return {};
}

// We use SFINAE instead of a const T* parameter to avoid conflicting with
// the C array overload.

template <
typename T,
FMT_ENABLE_IF(std::is_convertible<const T&, const void*>::value &&
FMT_ENABLE_IF(!std::is_function<typename std::remove_pointer<
remove_cvref_t<T>>::type>::value &&
std::is_convertible<const T&, const void*>::value &&
AlexGuteniev marked this conversation as resolved.
Show resolved Hide resolved
!std::is_convertible<const T&, const char_type*>::value)>
FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
return {};
Expand Down Expand Up @@ -1677,6 +1704,27 @@ FMT_CONSTEXPR FMT_INLINE auto make_arg(T&& val) -> value<Context> {
static_assert(formattable_pointer,
"Formatting of non-void pointers is disallowed.");

// Formatting of function pointers is disallowed.
constexpr bool formattable_function_pointer =
!std::is_same<decltype(arg),
const unformattable_function_pointer&>::value;
static_assert(formattable_function_pointer,
"Formatting of function pointers is disallowed.");

// Formatting of member function pointers is disallowed.
constexpr bool formattable_member_function_pointer =
!std::is_same<decltype(arg),
const unformattable_member_function_pointer&>::value;
static_assert(formattable_member_function_pointer,
"Formatting of member function pointers is disallowed.");

// Formatting of member object pointers is disallowed.
constexpr bool formattable_member_object_pointer =
!std::is_same<decltype(arg),
const unformattable_member_object_pointer&>::value;
static_assert(formattable_member_object_pointer,
"Formatting of member object pointers is disallowed.");

constexpr bool formattable =
!std::is_same<decltype(arg), const unformattable&>::value;
static_assert(
Expand Down
6 changes: 6 additions & 0 deletions test/compile-error-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ expect_compile_error("
fmt::format(\"{}\", S());
")

# Formatting a function
expect_compile_error("
void (*f)();
fmt::format(\"{}\", f);
")

# Make sure that compiler features detected in the header
# match the features detected in CMake.
if (SUPPORTS_USER_DEFINED_LITERALS)
Expand Down
7 changes: 7 additions & 0 deletions test/core-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,13 @@ TEST(core_test, is_formattable) {
static_assert(!fmt::is_formattable<unsigned char*, wchar_t>::value, "");
static_assert(!fmt::is_formattable<const signed char*, wchar_t>::value, "");
static_assert(!fmt::is_formattable<const unsigned char*, wchar_t>::value, "");

static_assert(!fmt::is_formattable<void (*)()>::value, "");

struct s;

static_assert(!fmt::is_formattable<int(s::*)>::value, "");
static_assert(!fmt::is_formattable<int (s::*)()>::value, "");
}

TEST(core_test, format) { EXPECT_EQ(fmt::format("{}", 42), "42"); }
Expand Down