External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup macros

Browse Source
This commit is contained in:
Victor Zverovich 2022-05-29 17:00:09 -07:00
parent 1761e2666a
commit e927149f8e
7 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/compile.h
View File

@ -123,7 +123,7 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
# define FMT_COMPILE(s) FMT_STRING(s) # define FMT_COMPILE(s) FMT_STRING(s)
#endif #endif
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <typename Char, size_t N, template <typename Char, size_t N,
fmt::detail_exported::fixed_string<Char, N> Str> fmt::detail_exported::fixed_string<Char, N> Str>
struct udl_compiled_string : compiled_string { struct udl_compiled_string : compiled_string {
@ -586,7 +586,7 @@ void print(const S& format_str, const Args&... args) {
print(stdout, format_str, args...); print(stdout, format_str, args...);
} }
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
inline namespace literals { inline namespace literals {
template <detail_exported::fixed_string Str> constexpr auto operator""_cf() { template <detail_exported::fixed_string Str> constexpr auto operator""_cf() {
using char_t = remove_cvref_t<decltype(Str.data[0])>; using char_t = remove_cvref_t<decltype(Str.data[0])>;

47
include/fmt/core.h
View File

@ -133,7 +133,7 @@
// Check if exceptions are disabled. // Check if exceptions are disabled.
#ifndef FMT_EXCEPTIONS #ifndef FMT_EXCEPTIONS
# if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \ # if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \
FMT_MSC_VERSION && !_HAS_EXCEPTIONS (FMT_MSC_VERSION && !_HAS_EXCEPTIONS)
# define FMT_EXCEPTIONS 0 # define FMT_EXCEPTIONS 0
# else # else
# define FMT_EXCEPTIONS 1 # define FMT_EXCEPTIONS 1
@ -149,19 +149,13 @@
# define FMT_NORETURN # define FMT_NORETURN
#endif #endif
#if __cplusplus == 201103L || __cplusplus == 201402L #if FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
# if defined(__INTEL_COMPILER) || defined(__PGI)
# define FMT_FALLTHROUGH
# elif defined(__clang__)
# define FMT_FALLTHROUGH [[clang::fallthrough]]
# elif FMT_GCC_VERSION >= 700 && \
(!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
# define FMT_FALLTHROUGH [[gnu::fallthrough]]
# else
# define FMT_FALLTHROUGH
# endif
#elif FMT_HAS_CPP17_ATTRIBUTE(fallthrough)
# define FMT_FALLTHROUGH [[fallthrough]] # define FMT_FALLTHROUGH [[fallthrough]]
#elif defined(__clang__)
# define FMT_FALLTHROUGH [[clang::fallthrough]]
#elif FMT_GCC_VERSION >= 700 && \
(!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520)
# define FMT_FALLTHROUGH [[gnu::fallthrough]]
#else #else
# define FMT_FALLTHROUGH # define FMT_FALLTHROUGH
#endif #endif
@ -196,7 +190,7 @@
# define FMT_UNCHECKED_ITERATOR(It) \ # define FMT_UNCHECKED_ITERATOR(It) \
using _Unchecked_type = It // Mark iterator as checked. using _Unchecked_type = It // Mark iterator as checked.
#else #else
# define FMT_UNCHECKED_ITERATOR(It) using DummyTypeName = It # define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It
#endif #endif
#ifndef FMT_BEGIN_NAMESPACE #ifndef FMT_BEGIN_NAMESPACE
@ -250,9 +244,9 @@
#endif #endif
#ifndef FMT_CONSTEVAL #ifndef FMT_CONSTEVAL
# if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) && \ # if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) && \
__cplusplus >= 202002L && !defined(__apple_build_version__)) || \ __cplusplus >= 202002L && !defined(__apple_build_version__)) || \
(defined(__cpp_consteval) && \ (defined(__cpp_consteval) && \
(!FMT_MSC_VERSION || _MSC_FULL_VER >= 193030704)) (!FMT_MSC_VERSION || _MSC_FULL_VER >= 193030704))
// consteval is broken in MSVC before VS2022 and Apple clang 13. // consteval is broken in MSVC before VS2022 and Apple clang 13.
# define FMT_CONSTEVAL consteval # define FMT_CONSTEVAL consteval
@ -262,13 +256,13 @@
# endif # endif
#endif #endif
#ifndef FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #ifndef FMT_USE_NONTYPE_TEMPLATE_ARGS
# if defined(__cpp_nontype_template_args) && \ # if defined(__cpp_nontype_template_args) && \
((FMT_GCC_VERSION >= 903 && __cplusplus >= 201709L) || \ ((FMT_GCC_VERSION >= 903 && __cplusplus >= 201709L) || \
__cpp_nontype_template_args >= 201911L) __cpp_nontype_template_args >= 201911L)
# define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS 1 # define FMT_USE_NONTYPE_TEMPLATE_ARGS 1
# else # else
# define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS 0 # define FMT_USE_NONTYPE_TEMPLATE_ARGS 0
# endif # endif
#endif #endif
@ -313,7 +307,7 @@ struct monostate {
FMT_BEGIN_DETAIL_NAMESPACE FMT_BEGIN_DETAIL_NAMESPACE
// Suppress "unused variable" warnings with the method described in // Suppresses "unused variable" warnings with the method described in
// https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/. // https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/.
// (void)var does not work on many Intel compilers. // (void)var does not work on many Intel compilers.
template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {} template <typename... T> FMT_CONSTEXPR void ignore_unused(const T&...) {}
@ -328,7 +322,7 @@ constexpr FMT_INLINE auto is_constant_evaluated(
#endif #endif
} }
// A function to suppress "conditional expression is constant" warnings. // Suppresses "conditional expression is constant" warnings.
template <typename T> constexpr FMT_INLINE auto const_check(T value) -> T { template <typename T> constexpr FMT_INLINE auto const_check(T value) -> T {
return value; return value;
} }
@ -338,7 +332,7 @@ FMT_NORETURN FMT_API void assert_fail(const char* file, int line,
#ifndef FMT_ASSERT #ifndef FMT_ASSERT
# ifdef NDEBUG # ifdef NDEBUG
// FMT_ASSERT is not empty to avoid -Werror=empty-body. // FMT_ASSERT is not empty to avoid -Wempty-body.
# define FMT_ASSERT(condition, message) \ # define FMT_ASSERT(condition, message) \
::fmt::detail::ignore_unused((condition), (message)) ::fmt::detail::ignore_unused((condition), (message))
# else # else
@ -389,8 +383,7 @@ FMT_CONSTEXPR auto to_unsigned(Int value) ->
FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char micro[] = "\u00B5"; FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char micro[] = "\u00B5";
constexpr auto is_utf8() -> bool { constexpr auto is_utf8() -> bool {
// Avoid buggy sign extensions in MSVC's constant evaluation mode. // Avoid buggy sign extensions in MSVC's constant evaluation mode (#2297).
// https://developercommunity.visualstudio.com/t/C-difference-in-behavior-for-unsigned/1233612
using uchar = unsigned char; using uchar = unsigned char;
return FMT_UNICODE || (sizeof(micro) == 3 && uchar(micro[0]) == 0xC2 && return FMT_UNICODE || (sizeof(micro) == 3 && uchar(micro[0]) == 0xC2 &&
uchar(micro[1]) == 0xB5); uchar(micro[1]) == 0xB5);
@ -2855,7 +2848,7 @@ template <typename Handler> class specs_checker : public Handler {
constexpr int invalid_arg_index = -1; constexpr int invalid_arg_index = -1;
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <int N, typename T, typename... Args, typename Char> template <int N, typename T, typename... Args, typename Char>
constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int { constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
if constexpr (detail::is_statically_named_arg<T>()) { if constexpr (detail::is_statically_named_arg<T>()) {
@ -2870,7 +2863,7 @@ constexpr auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
template <typename... Args, typename Char> template <typename... Args, typename Char>
FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int { FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view<Char> name) -> int {
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
if constexpr (sizeof...(Args) > 0) if constexpr (sizeof...(Args) > 0)
return get_arg_index_by_name<0, Args...>(name); return get_arg_index_by_name<0, Args...>(name);
#endif #endif
@ -2903,7 +2896,7 @@ class format_string_checker {
return context_.check_arg_id(id), id; return context_.check_arg_id(id), id;
} }
FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int { FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
auto index = get_arg_index_by_name<Args...>(id); auto index = get_arg_index_by_name<Args...>(id);
if (index == invalid_arg_index) on_error("named argument is not found"); if (index == invalid_arg_index) on_error("named argument is not found");
return context_.check_arg_id(index), index; return context_.check_arg_id(index), index;

6
include/fmt/format.h
View File

@ -948,7 +948,7 @@ class FMT_API format_error : public std::runtime_error {
}; };
namespace detail_exported { namespace detail_exported {
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <typename Char, size_t N> struct fixed_string { template <typename Char, size_t N> struct fixed_string {
constexpr fixed_string(const Char (&str)[N]) { constexpr fixed_string(const Char (&str)[N]) {
detail::copy_str<Char, const Char*, Char*>(static_cast<const Char*>(str), detail::copy_str<Char, const Char*, Char*>(static_cast<const Char*>(str),
@ -3532,7 +3532,7 @@ template <typename Char> struct udl_formatter {
} }
}; };
# if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS # if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <typename T, typename Char, size_t N, template <typename T, typename Char, size_t N,
fmt::detail_exported::fixed_string<Char, N> Str> fmt::detail_exported::fixed_string<Char, N> Str>
struct statically_named_arg : view { struct statically_named_arg : view {
@ -4148,7 +4148,7 @@ inline namespace literals {
fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23); fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
\endrst \endrst
*/ */
# if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS # if FMT_USE_NONTYPE_TEMPLATE_ARGS
template <detail_exported::fixed_string Str> constexpr auto operator""_a() { template <detail_exported::fixed_string Str> constexpr auto operator""_a() {
using char_t = remove_cvref_t<decltype(Str.data[0])>; using char_t = remove_cvref_t<decltype(Str.data[0])>;
return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>(); return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>();

2
include/fmt/xchar.h
View File

@ -52,7 +52,7 @@ constexpr auto operator"" _format(const wchar_t* s, size_t n)
return {{s, n}}; return {{s, n}};
} }
#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
constexpr detail::udl_arg<wchar_t> operator"" _a(const wchar_t* s, size_t) { constexpr detail::udl_arg<wchar_t> operator"" _a(const wchar_t* s, size_t) {
return {s}; return {s};
} }

4
test/compile-error-test/CMakeLists.txt
View File

@ -222,13 +222,13 @@ if (CMAKE_CXX_STANDARD GREATER_EQUAL 20)
# Compile-time argument name check # Compile-time argument name check
expect_compile(format-string-name " expect_compile(format-string-name "
#if defined(FMT_HAS_CONSTEVAL) && FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if defined(FMT_HAS_CONSTEVAL) && FMT_USE_NONTYPE_TEMPLATE_ARGS
using namespace fmt::literals; using namespace fmt::literals;
fmt::print(\"{foo}\", \"foo\"_a=42); fmt::print(\"{foo}\", \"foo\"_a=42);
#endif #endif
") ")
expect_compile(format-string-name-error " expect_compile(format-string-name-error "
#if defined(FMT_HAS_CONSTEVAL) && FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if defined(FMT_HAS_CONSTEVAL) && FMT_USE_NONTYPE_TEMPLATE_ARGS
using namespace fmt::literals; using namespace fmt::literals;
fmt::print(\"{foo}\", \"bar\"_a=42); fmt::print(\"{foo}\", \"bar\"_a=42);
#else #else

4
test/compile-test.cc
View File

@ -187,7 +187,7 @@ TEST(compile_test, named) {
EXPECT_THROW(fmt::format(FMT_COMPILE("{invalid}"), fmt::arg("valid", 42)), EXPECT_THROW(fmt::format(FMT_COMPILE("{invalid}"), fmt::arg("valid", 42)),
fmt::format_error); fmt::format_error);
# if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS # if FMT_USE_NONTYPE_TEMPLATE_ARGS
using namespace fmt::literals; using namespace fmt::literals;
auto statically_named_field_compiled = auto statically_named_field_compiled =
fmt::detail::compile<decltype("arg"_a = 42)>(FMT_COMPILE("{arg}")); fmt::detail::compile<decltype("arg"_a = 42)>(FMT_COMPILE("{arg}"));
@ -285,7 +285,7 @@ TEST(compile_test, print) {
} }
#endif #endif
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
TEST(compile_test, compile_format_string_literal) { TEST(compile_test, compile_format_string_literal) {
using namespace fmt::literals; using namespace fmt::literals;
EXPECT_EQ("", fmt::format(""_cf)); EXPECT_EQ("", fmt::format(""_cf));

4
test/format-test.cc
View File

@ -1837,7 +1837,7 @@ TEST(format_test, compile_time_string) {
EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42)); EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42));
EXPECT_EQ("foo", fmt::format(FMT_STRING("{}"), string_like())); EXPECT_EQ("foo", fmt::format(FMT_STRING("{}"), string_like()));
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_ARGS
using namespace fmt::literals; using namespace fmt::literals;
EXPECT_EQ("foobar", fmt::format(FMT_STRING("{foo}{bar}"), "bar"_a = "bar", EXPECT_EQ("foobar", fmt::format(FMT_STRING("{foo}{bar}"), "bar"_a = "bar",
"foo"_a = "foo")); "foo"_a = "foo"));
@ -2182,7 +2182,7 @@ TEST(format_test, format_string_errors) {
# else # else
fmt::print("warning: constexpr is broken in this version of MSVC\n"); fmt::print("warning: constexpr is broken in this version of MSVC\n");
# endif # endif
# if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS # if FMT_USE_NONTYPE_TEMPLATE_ARGS
using namespace fmt::literals; using namespace fmt::literals;
EXPECT_ERROR("{foo}", "named argument is not found", decltype("bar"_a = 42)); EXPECT_ERROR("{foo}", "named argument is not found", decltype("bar"_a = 42));
EXPECT_ERROR("{foo}", "named argument is not found", EXPECT_ERROR("{foo}", "named argument is not found",