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

Moved range_length_limit to formatting_range.

Browse Source 
Added add_delimiter_spaces and add_prepostfix_space.
This commit is contained in:
Remotion 2018-05-13 18:50:04 +02:00
parent a7041e9652
commit a70b48023f
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/fmt/ranges.h
View File

@ -32,18 +32,22 @@ struct formatting_base {
template <typename Char, typename Enable = void>
struct formatting_range : formatting_base<Char> {
static FMT_CONSTEXPR_DECL const std::size_t range_length_limit =
FMT_RANGE_OUTPUT_LENGTH_LIMIT; // output only up to N items from the range.
Char prefix = '{';
Char delimiter = ',';
Char postfix = '}';
static FMT_CONSTEXPR_DECL const bool add_spaces = false;
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
};
template <typename Char, typename Enable = void>
struct formatting_tuple : formatting_base<Char> {
Char prefix = '[';
Char prefix = '(';
Char delimiter = ',';
Char postfix = ']';
static FMT_CONSTEXPR_DECL const bool add_spaces = false;
Char postfix = ')';
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
};
namespace internal {
@ -92,10 +96,11 @@ template <typename T, typename _ = void>
struct is_range_ : std::false_type {};
template <typename T>
struct is_range_<T, std::conditional_t<false,
conditional_helper<decltype(std::declval<T>().begin()),
decltype(std::declval<T>().end())>,
void>> : std::true_type {};
struct is_range_<T,typename std::conditional<
false,
conditional_helper<decltype(std::declval<T>().begin()),
decltype(std::declval<T>().end())>,
void>::type> : std::true_type {};
template <typename T>
struct is_range {
@ -162,16 +167,20 @@ struct formatter<TupleT, Char,
std::size_t i = 0;
internal::copy(formatting.prefix, out);
internal::for_each(values, [&](const auto &v) {
if (i++ > 0) {
if (i > 0) {
if (formatting.add_prepostfix_space) {
*out++ = ' ';
}
internal::copy(formatting.delimiter, out);
}
if (formatting.add_spaces) {
if (formatting.add_delimiter_spaces && i > 0) {
format_to(out, " {}", v);
} else {
format_to(out, "{}", v);
}
++i;
});
if (formatting.add_spaces) {
if (formatting.add_prepostfix_space) {
*out++ = ' ';
}
internal::copy(formatting.postfix, out);
@ -184,8 +193,6 @@ template <typename RangeT, typename Char>
struct formatter< RangeT, Char,
typename std::enable_if<fmt::internal::is_range<RangeT>::value>::type> {
static FMT_CONSTEXPR_DECL const std::size_t range_length_limit =
FMT_RANGE_OUTPUT_LENGTH_LIMIT; // output only up to N items from the range.
fmt::formatting_range<Char> formatting;
@ -201,19 +208,22 @@ struct formatter< RangeT, Char,
std::size_t i = 0;
for (const auto &it : values) {
if (i > 0) {
if (formatting.add_prepostfix_space) {
*out++ = ' ';
}
internal::copy(formatting.delimiter, out);
}
if (formatting.add_spaces) {
if (formatting.add_delimiter_spaces && i > 0) {
format_to(out, " {}", it);
} else {
format_to(out, "{}", it);
}
if (++i > range_length_limit) {
if (++i > formatting.range_length_limit) {
format_to(out, " ... <other elements>");
break;
}
}
if (formatting.add_spaces) {
if (formatting.add_prepostfix_space) {
*out++ = ' ';
}
internal::copy(formatting.postfix, out);

16
test/ranges-test.cc
View File

@ -9,10 +9,6 @@
// All Rights Reserved
// {fmt} support for ranges, containers and types tuple interface.
#ifdef WIN32
#define _CRT_SECURE_NO_WARNINGS
#endif
#include "fmt/ranges.h"
#include "gtest/gtest.h"
@ -36,20 +32,21 @@ TEST(RangesTest, FormatVector2) {
TEST(RangesTest, FormatMap) {
std::map<std::string, int32_t> simap{{"one", 1}, {"two", 2}};
EXPECT_EQ("{[one,1],[two,2]}", fmt::format("{}", simap));
EXPECT_EQ("{(one,1),(two,2)}", fmt::format("{}", simap));
}
TEST(RangesTest, FormatPair) {
std::pair<int64_t, float> pa1{42, 3.14159265358979f};
EXPECT_EQ("[42,3.14159]", fmt::format("{}", pa1));
EXPECT_EQ("(42,3.14159)", fmt::format("{}", pa1));
}
TEST(RangesTest, FormatTuple) {
std::tuple<int64_t, float, std::string> tu1{42, 3.14159265358979f,
"this is tuple"};
EXPECT_EQ("[42,3.14159,this is tuple]", fmt::format("{}", tu1));
EXPECT_EQ("(42,3.14159,this is tuple)", fmt::format("{}", tu1));
}
/// check if 'if constexpr' is supported.
#if (__cplusplus > 201402L) || \
(defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910)
@ -84,7 +81,8 @@ struct tuple_element<N, my_struct> {
TEST(RangesTest, FormatStruct) {
my_struct mst{13, "my struct"};
EXPECT_EQ("[13,my struct]", fmt::format("{}", mst));
EXPECT_EQ("(13, my struct)", fmt::format("{}", mst));
}
#endif // (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910)
#endif // (__cplusplus > 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >
// 201402L && _MSC_VER >= 1910)