Add fmt::join to format ranges (#466)

This commit is contained in:
Victor Zverovich
2018-01-27 16:04:45 -08:00
parent 87eab90ea8
commit a980d3b46b
3 changed files with 83 additions and 1 deletions

View File

@@ -39,7 +39,7 @@
// Test that the library compiles if None is defined to 0 as done by xlib.h.
#define None 0
#include "fmt/core.h"
#include "fmt/format.h"
#include "util.h"
#include "mock-allocator.h"
@@ -1403,6 +1403,29 @@ TEST(FormatTest, Variadic) {
EXPECT_EQ(L"abc1", format(L"{}c{}", L"ab", 1));
}
TEST(FormatTest, JoinArg) {
using fmt::join;
int v1[3] = { 1, 2, 3 };
std::vector<float> v2;
v2.push_back(1.2f);
v2.push_back(3.4f);
EXPECT_EQ("(1, 2, 3)", format("({})", join(v1, v1 + 3, ", ")));
EXPECT_EQ("(1)", format("({})", join(v1, v1 + 1, ", ")));
EXPECT_EQ("()", format("({})", join(v1, v1, ", ")));
EXPECT_EQ("(001, 002, 003)", format("({:03})", join(v1, v1 + 3, ", ")));
EXPECT_EQ("(+01.20, +03.40)",
format("({:+06.2f})", join(v2.begin(), v2.end(), ", ")));
EXPECT_EQ(L"(1, 2, 3)", format(L"({})", join(v1, v1 + 3, L", ")));
EXPECT_EQ("1, 2, 3", format("{0:{1}}", join(v1, v1 + 3, ", "), 1));
#if FMT_HAS_GXX_CXX11
EXPECT_EQ("(1, 2, 3)", format("({})", join(v1, ", ")));
EXPECT_EQ("(+01.20, +03.40)", format("({:+06.2f})", join(v2, ", ")));
#endif
}
template <typename T>
std::string str(const T &value) {
return fmt::format("{}", value);