leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename BasicFormatter to BasicWriter.

Browse Source
This commit is contained in:
Victor Zverovich
2013-02-02 20:29:02 -08:00
parent 687301c516
commit 03dccc3c91
3 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
format_test.cc
+32 -33
View File
@@ -46,7 +46,7 @@ using std::size_t;
using std::sprintf;
using fmt::internal::Array;
using fmt::BasicFormatter;
using fmt::BasicWriter;
using fmt::Formatter;
using fmt::Format;
using fmt::FormatError;
@@ -863,8 +863,7 @@ class Date {
}
template <typename Char>
friend BasicFormatter<Char> &operator<<(
BasicFormatter<Char> &f, const Date &d) {
friend BasicWriter<Char> &operator<<(BasicWriter<Char> &f, const Date &d) {
return f << d.year_ << '-' << d.month_ << '-' << d.day_;
}
};
@@ -880,7 +879,7 @@ TEST(FormatterTest, FormatUsingIOStreams) {
class Answer {};
template <typename Char>
void Format(fmt::BasicFormatter<Char> &f, const fmt::FormatSpec &spec, Answer) {
void Format(BasicWriter<Char> &f, const fmt::FormatSpec &spec, Answer) {
f.Write("42", spec);
}
@@ -921,7 +920,7 @@ TEST(FormatterTest, FormatterAppend) {
TEST(FormatterTest, FormatterExamples) {
using fmt::hex;
EXPECT_EQ("0000cafe", str(BasicFormatter<char>() << pad(hex(0xcafe), 8, '0')));
EXPECT_EQ("0000cafe", str(BasicWriter<char>() << pad(hex(0xcafe), 8, '0')));
std::string message = str(Format("The answer is {}") << 42);
EXPECT_EQ("The answer is 42", message);
@@ -1071,11 +1070,11 @@ TEST(TempFormatterTest, Examples) {
TEST(StrTest, oct) {
using fmt::oct;
EXPECT_EQ("12", str(BasicFormatter<char>() << oct(static_cast<short>(012))));
EXPECT_EQ("12", str(BasicFormatter<char>() << oct(012)));
EXPECT_EQ("34", str(BasicFormatter<char>() << oct(034u)));
EXPECT_EQ("56", str(BasicFormatter<char>() << oct(056l)));
EXPECT_EQ("70", str(BasicFormatter<char>() << oct(070ul)));
EXPECT_EQ("12", str(BasicWriter<char>() << oct(static_cast<short>(012))));
EXPECT_EQ("12", str(BasicWriter<char>() << oct(012)));
EXPECT_EQ("34", str(BasicWriter<char>() << oct(034u)));
EXPECT_EQ("56", str(BasicWriter<char>() << oct(056l)));
EXPECT_EQ("70", str(BasicWriter<char>() << oct(070ul)));
}
TEST(StrTest, hex) {
@@ -1085,17 +1084,17 @@ TEST(StrTest, hex) {
// This shouldn't compile:
//fmt::IntFormatter<short, fmt::TypeSpec<'x'> > (*phex2)(short value) = hex;
EXPECT_EQ("cafe", str(BasicFormatter<char>() << hex(0xcafe)));
EXPECT_EQ("babe", str(BasicFormatter<char>() << hex(0xbabeu)));
EXPECT_EQ("dead", str(BasicFormatter<char>() << hex(0xdeadl)));
EXPECT_EQ("beef", str(BasicFormatter<char>() << hex(0xbeeful)));
EXPECT_EQ("cafe", str(BasicWriter<char>() << hex(0xcafe)));
EXPECT_EQ("babe", str(BasicWriter<char>() << hex(0xbabeu)));
EXPECT_EQ("dead", str(BasicWriter<char>() << hex(0xdeadl)));
EXPECT_EQ("beef", str(BasicWriter<char>() << hex(0xbeeful)));
}
TEST(StrTest, hexu) {
EXPECT_EQ("CAFE", str(BasicFormatter<char>() << hexu(0xcafe)));
EXPECT_EQ("BABE", str(BasicFormatter<char>() << hexu(0xbabeu)));
EXPECT_EQ("DEAD", str(BasicFormatter<char>() << hexu(0xdeadl)));
EXPECT_EQ("BEEF", str(BasicFormatter<char>() << hexu(0xbeeful)));
EXPECT_EQ("CAFE", str(BasicWriter<char>() << hexu(0xcafe)));
EXPECT_EQ("BABE", str(BasicWriter<char>() << hexu(0xbabeu)));
EXPECT_EQ("DEAD", str(BasicWriter<char>() << hexu(0xdeadl)));
EXPECT_EQ("BEEF", str(BasicWriter<char>() << hexu(0xbeeful)));
}
class ISO8601DateFormatter {
@@ -1105,8 +1104,8 @@ public:
ISO8601DateFormatter(const Date &d) : date_(&d) {}
template <typename Char>
friend BasicFormatter<Char> &operator<<(
BasicFormatter<Char> &f, const ISO8601DateFormatter &d) {
friend BasicWriter<Char> &operator<<(
BasicWriter<Char> &f, const ISO8601DateFormatter &d) {
return f << pad(d.date_->year(), 4, '0') << '-'
<< pad(d.date_->month(), 2, '0') << '-' << pad(d.date_->day(), 2, '0');
}
@@ -1116,17 +1115,17 @@ ISO8601DateFormatter iso8601(const Date &d) { return ISO8601DateFormatter(d); }
TEST(StrTest, pad) {
using fmt::hex;
EXPECT_EQ(" cafe", str(BasicFormatter<char>() << pad(hex(0xcafe), 8)));
EXPECT_EQ(" babe", str(BasicFormatter<char>() << pad(hex(0xbabeu), 8)));
EXPECT_EQ(" dead", str(BasicFormatter<char>() << pad(hex(0xdeadl), 8)));
EXPECT_EQ(" beef", str(BasicFormatter<char>() << pad(hex(0xbeeful), 8)));
EXPECT_EQ(" cafe", str(BasicWriter<char>() << pad(hex(0xcafe), 8)));
EXPECT_EQ(" babe", str(BasicWriter<char>() << pad(hex(0xbabeu), 8)));
EXPECT_EQ(" dead", str(BasicWriter<char>() << pad(hex(0xdeadl), 8)));
EXPECT_EQ(" beef", str(BasicWriter<char>() << pad(hex(0xbeeful), 8)));
EXPECT_EQ(" 11", str(BasicFormatter<char>() << pad(11, 7)));
EXPECT_EQ(" 22", str(BasicFormatter<char>() << pad(22u, 7)));
EXPECT_EQ(" 33", str(BasicFormatter<char>() << pad(33l, 7)));
EXPECT_EQ(" 44", str(BasicFormatter<char>() << pad(44lu, 7)));
EXPECT_EQ(" 11", str(BasicWriter<char>() << pad(11, 7)));
EXPECT_EQ(" 22", str(BasicWriter<char>() << pad(22u, 7)));
EXPECT_EQ(" 33", str(BasicWriter<char>() << pad(33l, 7)));
EXPECT_EQ(" 44", str(BasicWriter<char>() << pad(44lu, 7)));
BasicFormatter<char> f;
BasicWriter<char> f;
f.Clear();
f << pad(42, 5, '0');
EXPECT_EQ("00042", f.str());
@@ -1141,12 +1140,12 @@ TEST(StrTest, pad) {
TEST(StrTest, NoConflictWithIOManip) {
using namespace std;
using namespace fmt;
EXPECT_EQ("cafe", str(BasicFormatter<char>() << hex(0xcafe)));
EXPECT_EQ("12", str(BasicFormatter<char>() << oct(012)));
EXPECT_EQ("cafe", str(BasicWriter<char>() << hex(0xcafe)));
EXPECT_EQ("12", str(BasicWriter<char>() << oct(012)));
}
TEST(StrTest, BasicFormatterWChar) {
EXPECT_EQ(L"cafe", str(BasicFormatter<wchar_t>() << fmt::hex(0xcafe)));
TEST(StrTest, BasicWriterWChar) {
EXPECT_EQ(L"cafe", str(BasicWriter<wchar_t>() << fmt::hex(0xcafe)));
}
template <typename T>